KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also make lists and dicts of strings escape code safe

Browse Source
This commit is contained in:
Kovid Goyal 2022-12-12 19:24:44 +05:30
parent aac57550c9
commit 902373ed20
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gen-go-code.py
View File

@ -167,7 +167,7 @@ def generate_completions_for_kitty() -> None:
# rc command wrappers {{{ # rc command wrappers {{{
json_field_types: Dict[str, str] = { 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', '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) used_options.add(oq)
if field.field_type == 'str': if field.field_type == 'str':
jc.append(f'payload.{field.struct_field_name} = escaped_string(options_{name}.{o.go_var_name})') 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: else:
jc.append(f'payload.{field.struct_field_name} = options_{name}.{o.go_var_name}') jc.append(f'payload.{field.struct_field_name} = options_{name}.{o.go_var_name}')
elif field.field in handled_fields: elif field.field in handled_fields:

4
kitty/rc/base.py
View File

@ -233,7 +233,7 @@ class ArgsHandling:
jt = field_types[jf] jt = field_types[jf]
if self.first_rest: if self.first_rest:
yield f'payload.{self.first_rest[0].capitalize()} = escaped_string(args[0])' 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[0])
handled_fields.add(self.first_rest[1]) handled_fields.add(self.first_rest[1])
return return
@ -250,7 +250,7 @@ class ArgsHandling:
yield 'if err != nil { return err }' yield 'if err != nil { return err }'
return return
if jt == 'list.str': if jt == 'list.str':
yield f'{dest} = args' yield f'{dest} = escape_list_of_strings(args)'
return return
if jt == 'str': if jt == 'str':
if c == 1: if c == 1:

8
tools/cmd/at/env.go
View File

@ -6,14 +6,14 @@ import (
"kitty/tools/utils" "kitty/tools/utils"
) )
func parse_key_val_args(args []string) map[string]string { func parse_key_val_args(args []string) map[escaped_string]escaped_string {
ans := make(map[string]string, len(args)) ans := make(map[escaped_string]escaped_string, len(args))
for _, arg := range args { for _, arg := range args {
key, value, found := utils.Cut(arg, "=") key, value, found := utils.Cut(arg, "=")
if found { if found {
ans[key] = value ans[escaped_string(key)] = escaped_string(value)
} else { } else {
ans[key+"="] = "" ans[escaped_string(key+"=")] = ""
} }
} }
return ans return ans

16
tools/cmd/at/main.go
View File

@ -46,6 +46,22 @@ func expand_ansi_c_escapes_in_args(args ...string) (escaped_string, error) {
return escaped_string(strings.Join(args, " ")), nil 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) { func set_payload_string_field(io_data *rc_io_data, field, data string) {
payload_interface := reflect.ValueOf(&io_data.rc.Payload).Elem() payload_interface := reflect.ValueOf(&io_data.rc.Payload).Elem()
struct_in_interface := reflect.New(payload_interface.Elem().Type()).Elem() struct_in_interface := reflect.New(payload_interface.Elem().Type()).Elem()