mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-24 01:08:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow launched background process to work with --allow-remote-control

Browse Source 
Use a dedicated socketpair for such processes. Fixes #6712
This commit is contained in:
Kovid Goyal
2023-10-18 19:56:07 +05:30
parent a9b412baba
commit 314fe4fe4a
11 changed files with 275 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,14 +55,6 @@ func escape_list_of_strings(args []string) []escaped_string {
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()
@@ -143,16 +135,6 @@ func simple_serializer(rc *utils.RemoteControlCmd) (ans []byte, err error) {
type serializer_func func(rc *utils.RemoteControlCmd) ([]byte, error)
func debug_to_log(args ...any) {
f, err := os.OpenFile("/tmp/kdlog", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
if err == nil {
fmt.Fprintln(f, args...)
f.Close()
}
}
var serializer serializer_func = simple_serializer
func create_serializer(password string, encoded_pubkey string, io_data *rc_io_data) (err error) {
io_data.serializer = simple_serializer
if password != "" {
@@ -240,7 +222,7 @@ func get_response(do_io func(io_data *rc_io_data) ([]byte, error), io_data *rc_i
io_data.multiple_payload_generator = nil
io_data.rc.NoResponse = true
io_data.chunks_done = false
do_io(io_data)
_, _ = do_io(io_data)
err = fmt.Errorf("Timed out waiting for a response from kitty")
}
return

22
tools/cmd/at/socket_io.go
View File

@@ -8,6 +8,8 @@ import (
"fmt"
"io"
"net"
"os"
"strconv"
"time"
"kitty/tools/tui/loop"
@@ -151,9 +153,23 @@ func simple_socket_io(conn *net.Conn, io_data *rc_io_data) (serialized_response
}
func do_socket_io(io_data *rc_io_data) (serialized_response []byte, err error) {
conn, err := net.Dial(global_options.to_network, global_options.to_address)
if err != nil {
return
var conn net.Conn
if global_options.to_network == "fd" {
fd, _ := strconv.Atoi(global_options.to_address)
if err != nil {
return nil, err
}
f := os.NewFile(uintptr(fd), "fd:"+global_options.to_address)
conn, err = net.FileConn(f)
if err != nil {
return nil, err
}
defer f.Close()
} else {
conn, err = net.Dial(global_options.to_network, global_options.to_address)
if err != nil {
return
}
}
defer conn.Close()
return simple_socket_io(&conn, io_data)