From 902373ed2090e64544f3cbd4acf9ccdfc071867d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Dec 2022 19:24:44 +0530
Subject: [PATCH] Also make lists and dicts of strings escape code safe

---
 gen-go-code.py       |  6 +++++-
 kitty/rc/base.py     |  4 ++--
 tools/cmd/at/env.go  |  8 ++++----
 tools/cmd/at/main.go | 16 ++++++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/gen-go-code.py b/gen-go-code.py
index a8096dbb6..234f71595 100755
--- a/gen-go-code.py
+++ b/gen-go-code.py
@@ -167,7 +167,7 @@ def generate_completions_for_kitty() -> None:
 
 # rc command wrappers {{{
 json_field_types: Dict[str, str] = {
-    'bool': 'bool', 'str': 'escaped_string', 'list.str': '[]string', 'dict.str': 'map[string]string', 'float': 'float64', 'int': 'int',
+    'bool': 'bool', 'str': 'escaped_string', 'list.str': '[]escaped_string', 'dict.str': 'map[escaped_string]escaped_string', 'float': 'float64', 'int': 'int',
     'scroll_amount': 'any', 'spacing': 'any', 'colors': 'any',
 }
 
@@ -239,6 +239,10 @@ def go_code_for_remote_command(name: str, cmd: RemoteCommand, template: str) ->
             used_options.add(oq)
             if field.field_type == 'str':
                 jc.append(f'payload.{field.struct_field_name} = escaped_string(options_{name}.{o.go_var_name})')
+            elif field.field_type == 'list.str':
+                jc.append(f'payload.{field.struct_field_name} = escape_list_of_strings(options_{name}.{o.go_var_name})')
+            elif field.field_type == 'dict.str':
+                jc.append(f'payload.{field.struct_field_name} = escape_dict_of_strings(options_{name}.{o.go_var_name})')
             else:
                 jc.append(f'payload.{field.struct_field_name} = options_{name}.{o.go_var_name}')
         elif field.field in handled_fields:
diff --git a/kitty/rc/base.py b/kitty/rc/base.py
index 662742f15..07b678b60 100644
--- a/kitty/rc/base.py
+++ b/kitty/rc/base.py
@@ -233,7 +233,7 @@ class ArgsHandling:
             jt = field_types[jf]
             if self.first_rest:
                 yield f'payload.{self.first_rest[0].capitalize()} = escaped_string(args[0])'
-                yield f'payload.{self.first_rest[1].capitalize()} = args[1:]'
+                yield f'payload.{self.first_rest[1].capitalize()} = escape_list_of_strings(args[1:])'
                 handled_fields.add(self.first_rest[0])
                 handled_fields.add(self.first_rest[1])
                 return
@@ -250,7 +250,7 @@ class ArgsHandling:
                 yield 'if err != nil { return err }'
                 return
             if jt == 'list.str':
-                yield f'{dest} = args'
+                yield f'{dest} = escape_list_of_strings(args)'
                 return
             if jt == 'str':
                 if c == 1:
diff --git a/tools/cmd/at/env.go b/tools/cmd/at/env.go
index 28d9c9a67..33ab77a78 100644
--- a/tools/cmd/at/env.go
+++ b/tools/cmd/at/env.go
@@ -6,14 +6,14 @@ import (
 	"kitty/tools/utils"
 )
 
-func parse_key_val_args(args []string) map[string]string {
-	ans := make(map[string]string, len(args))
+func parse_key_val_args(args []string) map[escaped_string]escaped_string {
+	ans := make(map[escaped_string]escaped_string, len(args))
 	for _, arg := range args {
 		key, value, found := utils.Cut(arg, "=")
 		if found {
-			ans[key] = value
+			ans[escaped_string(key)] = escaped_string(value)
 		} else {
-			ans[key+"="] = ""
+			ans[escaped_string(key+"=")] = ""
 		}
 	}
 	return ans
diff --git a/tools/cmd/at/main.go b/tools/cmd/at/main.go
index a08a1c2e4..5ab7cf08d 100644
--- a/tools/cmd/at/main.go
+++ b/tools/cmd/at/main.go
@@ -46,6 +46,22 @@ func expand_ansi_c_escapes_in_args(args ...string) (escaped_string, error) {
 	return escaped_string(strings.Join(args, " ")), nil
 }
 
+func escape_list_of_strings(args []string) []escaped_string {
+	ans := make([]escaped_string, len(args))
+	for i, x := range args {
+		ans[i] = escaped_string(x)
+	}
+	return ans
+}
+
+func escape_dict_of_strings(args map[string]string) map[escaped_string]escaped_string {
+	ans := make(map[escaped_string]escaped_string, len(args))
+	for k, v := range args {
+		ans[escaped_string(k)] = escaped_string(v)
+	}
+	return ans
+}
+
 func set_payload_string_field(io_data *rc_io_data, field, data string) {
 	payload_interface := reflect.ValueOf(&io_data.rc.Payload).Elem()
 	struct_in_interface := reflect.New(payload_interface.Elem().Type()).Elem()