Merge pull request #195 from golemfactory/fix-cert-path-with-spaces

Fix issues related to cert path containing spaces
golemfactory · Aug 8, 2024 · 377eeb6 · 377eeb6
2 parents b2b80c0 + f140df4
commit 377eeb6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Golem/Yagna/ProcessFactory.cs b/Golem/Yagna/ProcessFactory.cs
@@ -183,10 +183,14 @@ public string ExecToText(IEnumerable<object> args)
             catch (Exception e)
             {
                 Logger?.LogError(e, "Failed to execute cmd. Args: {0}", args);
-                throw new GolemProcessException(string.Format("Failed to execute command: {0} {1}", Executable, e.Message));
+                throw new GolemProcessException(string.Format("Failed to execute command: {0} {1}, {2}", Executable, String.Join(" ", args.ToArray()), e.Message));
             }
-            if (process.HasExited && process.ExitCode!=0)
-                throw new GolemProcessException(string.Format("Failed to execute command: {0}, error code: {1}, stderr: {2}", Executable, process.ExitCode, stdError));
+            if (process.HasExited && process.ExitCode != 0)
+            {
+                throw new GolemProcessException(string.Format("Failed to execute command: {0} {1}, error code: {2}, stderr: {3}", Executable, String.Join(" ", args.ToArray()), process.ExitCode, stdError));
+            }
+
+
             return stdOutput;
         }
 

diff --git a/Golem/Yagna/ProviderRulesService.cs b/Golem/Yagna/ProviderRulesService.cs
@@ -72,7 +72,9 @@ public List<string> Certificates
 
         public string AddCertificate(string certPath)
         {
-            var args = $"rule add {GetRuleCommand()} certified import-cert {certPath}".Split().ToList();
+            var args = $"rule add {GetRuleCommand()} certified import-cert".Split().ToList();
+            // Path can contains spaces, so we need to add it as separate argument.
+            args.Add(certPath);
             return _provider.ExecToText(args);
         }