standalone: fix quotation problems in generated XML / shell files

Change-Id: I5d8e563089977cb431f27d4ecc4d8519fe5b24ba
storj · Aug 29, 2023 · 4783cf8 · 4783cf8
1 parent ef49d98
commit 4783cf8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/pkg/runtime/standalone/intellij.xml b/pkg/runtime/standalone/intellij.xml
@@ -3,10 +3,10 @@
                    factoryName="Go Application">
         <module name="{{ .Package }}"/>
         <working_directory value="$PROJECT_DIR$/.run"/>
-        <parameters value="{{ Join (Tail .Service.Command) " "}}"/>
+        <parameters value="{{ Safe (Join (Tail .Service.Command) " ")}}"/>
         <envs>
             {{ range $k, $v := .Service.Environment}}
-            <env name="{{$k}}" value="{{$v}}"/>{{end}}
+            <env name="{{$k}}" value="{{Safe $v}}"/>{{end}}
         </envs>
         <kind value="PACKAGE"/>
         <package value="storj.io/{{ .Package }}/cmd/{{ .Executable }}"/>

diff --git a/pkg/runtime/standalone/start.sh b/pkg/runtime/standalone/start.sh
@@ -10,7 +10,7 @@ cleanup(){
 trap cleanup EXIT
 
 {{ range $k,$v := .Service.Environment}}
-export {{$k}}="{{$v}}"{{end}}
+export {{$k}}="{{Safe $v}}"{{end}}
 mkdir -p ./{{.Service.ID.Name}}/{{.Service.ID.Instance}}
 
 #RUN

diff --git a/pkg/runtime/standalone/write.go b/pkg/runtime/standalone/write.go
@@ -95,6 +95,16 @@ func (c *Standalone) writeService(s *service) error {
 	t, err := template.New("start.sh").
 		Funcs(map[string]interface{}{
 			"HasPrefix": strings.HasPrefix,
+			"Safe": func(p string) string {
+				out := ""
+				for i := 0; i < len(p); i++ {
+					if i > 0 && p[i] == '"' && p[i-1] != '\\' {
+						out += "\\"
+					}
+					out += string(p[i])
+				}
+				return out
+			},
 		}).
 		Parse(string(startTemplate))
 	if err != nil {
@@ -142,6 +152,9 @@ func (c *Standalone) writeIntelliJRunner(s *service) error {
 				return a
 			},
 			"Join": strings.Join,
+			"Safe": func(p string) string {
+				return strings.ReplaceAll(p, "\"", "&quot;")
+			},
 		}).
 		Parse(string(intelliJTemplate))
 	if err != nil {