Compare commits
No commits in common. "dedicated-pseudoterminal" and "master" have entirely different histories.
dedicated-
...
master
|
@ -1,4 +1,2 @@
|
|||
#!/usr/bin/env bash
|
||||
stty raw -echo -icanon isig
|
||||
/usr/bin/github-fast-env --interactive /usr/lib/ghe-fast-tools/ghe-fast-console.rb
|
||||
stty sane
|
||||
|
|
|
@ -1,6 +1,2 @@
|
|||
#/usr/bin/env bash
|
||||
if [[ "$USER" == "git" ]] ; then
|
||||
/usr/lib/github-fast-env/github-fast-env.rb "$@"
|
||||
else
|
||||
sudo -u git /usr/lib/github-fast-env/github-fast-env.rb "$@"
|
||||
fi
|
||||
sudo /usr/lib/github-fast-env/github-fast-env.rb "$@"
|
||||
|
|
|
@ -133,16 +133,13 @@ def clean_up_named_pipes(control_socket, connection_id)
|
|||
end
|
||||
|
||||
def set_up_pseudoterminal(control_socket, pseudoterminal_path)
|
||||
$pseudoterminal_io = File.open(pseudoterminal_path, File::RDWR | File::NOCTTY)
|
||||
$pseudoterminal_io.sync = true
|
||||
#$pseudoterminal_io.raw!
|
||||
$pseudoterminal_io.cooked!
|
||||
pseudoterminal_io = File.open(pseudoterminal_path, File::RDWR | File::NOCTTY)
|
||||
|
||||
$original_stderr.puts " connecting to pseudoterminal #{pseudoterminal_path}"
|
||||
|
||||
$stdin.reopen($pseudoterminal_io)
|
||||
$stdout.reopen($pseudoterminal_io)
|
||||
$stderr.reopen($pseudoterminal_io)
|
||||
$stdin.reopen(pseudoterminal_io)
|
||||
$stdout.reopen(pseudoterminal_io)
|
||||
$stderr.reopen(pseudoterminal_io)
|
||||
|
||||
$original_stderr.puts " connected to pseudoterminal #{pseudoterminal_path}"
|
||||
|
||||
|
@ -210,18 +207,18 @@ while true
|
|||
set_up_pseudoterminal(control_socket, pseudoterminal_path)
|
||||
end
|
||||
|
||||
Process.gid = Process.egid = "git"
|
||||
Process.uid = Process.euid = "git"
|
||||
|
||||
$original_stderr.puts " executing script #{script_path} (#{process_id})"
|
||||
|
||||
begin
|
||||
begin
|
||||
load script_path, true
|
||||
$original_stderr.puts " finished executing script"
|
||||
rescue SystemExit => error
|
||||
$original_stderr.puts " exit code: #{error.status}"
|
||||
exit_code = error.status
|
||||
rescue StandardError => error
|
||||
$original_stderr.puts " error executing script"
|
||||
|
||||
$stdin = $original_stdin
|
||||
$stdout = $original_stdout
|
||||
$stderr = $original_stderr
|
||||
|
@ -250,11 +247,9 @@ while true
|
|||
end
|
||||
|
||||
begin
|
||||
# TODO: submit correct exit code upon Ctrl + C
|
||||
control_socket.puts "done #{exit_code}"
|
||||
rescue
|
||||
end
|
||||
|
||||
control_socket.close
|
||||
|
||||
if mode == "named-pipes"
|
||||
|
@ -262,10 +257,6 @@ while true
|
|||
end
|
||||
|
||||
$original_stderr.puts " finished handling request (#{process_id})"
|
||||
|
||||
if $pseudoterminal_io
|
||||
$pseudoterminal_io.close
|
||||
end
|
||||
end
|
||||
}
|
||||
|
||||
|
|
|
@ -31,11 +31,7 @@ if ARGV.length > 1
|
|||
end
|
||||
|
||||
# TODO: support arguments
|
||||
begin
|
||||
script_path = File.realpath(ARGV[0])
|
||||
rescue StandardError => error
|
||||
log "error", "could not access #{ARGV[0]}"
|
||||
end
|
||||
script_path = File.realpath(ARGV[0])
|
||||
|
||||
control_socket_path = "/run/github-fast-env/github-fast-envd.sock"
|
||||
|
||||
|
@ -112,16 +108,6 @@ Signal.trap("CONT") do
|
|||
Process.kill("CONT", 0)
|
||||
end
|
||||
|
||||
Signal.trap("WINCH") do
|
||||
if $pseudoterminal_master
|
||||
$pseudoterminal_master.winsize = $stdout.winsize
|
||||
end
|
||||
|
||||
if $remote_process_id
|
||||
Process.kill("WINCH", $remote_process_id)
|
||||
end
|
||||
end
|
||||
|
||||
def read_command
|
||||
ready_ios = IO.select([$control_socket], [], [], 10)
|
||||
|
||||
|
@ -176,24 +162,10 @@ encoded_script_path = Base64.encode64(script_path).delete("\n")
|
|||
read_ios = [$control_socket]
|
||||
|
||||
if $options[:interactive]
|
||||
#pseudoterminal_path = File.readlink("/proc/self/fd/0")
|
||||
#encoded_pseudoterminal_path = Base64.encode64(pseudoterminal_path).delete("\n")
|
||||
require "pty"
|
||||
pseudoterminal_path = File.readlink("/proc/self/fd/0")
|
||||
encoded_pseudoterminal_path = Base64.encode64(pseudoterminal_path).delete("\n")
|
||||
|
||||
$pseudoterminal_master, pseudoterminal_client = PTY.open
|
||||
#$pseudoterminal_master.raw!
|
||||
$pseudoterminal_master.echo = false
|
||||
$pseudoterminal_master.sync = true
|
||||
$pseudoterminal_master.winsize = $stdout.winsize
|
||||
|
||||
log "info", "opened pseudoterminal at #{pseudoterminal_client.path}"
|
||||
|
||||
encoded_pseudoterminal_client_path = Base64.encode64(pseudoterminal_client.path).delete("\n")
|
||||
pseudoterminal_client.close
|
||||
|
||||
read_ios += [$stdin, $pseudoterminal_master]
|
||||
|
||||
$control_socket.puts "new v1 pseudoterminal #{encoded_pseudoterminal_client_path} #{working_directory} #{encoded_script_path}"
|
||||
$control_socket.puts "new v1 pseudoterminal #{encoded_pseudoterminal_path} #{working_directory} #{encoded_script_path}"
|
||||
else
|
||||
$control_socket.puts "new v1 named-pipes #{working_directory} #{encoded_script_path}"
|
||||
end
|
||||
|
@ -244,9 +216,7 @@ end
|
|||
|
||||
exit_code = "unknown"
|
||||
|
||||
pseudoterminal_master_closed = false
|
||||
|
||||
while read_ios.include?($control_socket) or read_ios.include?($pseudoterminal_master) or read_ios.include?(pipes["stdout"]) or read_ios.include?(pipes["stderr"])
|
||||
while read_ios.include?($control_socket) or read_ios.include?(pipes["stdout"]) or read_ios.include?(pipes["stderr"])
|
||||
log "trace", read_ios.inspect
|
||||
|
||||
ready_read_ios, _, _ = IO.select(read_ios, [], [])
|
||||
|
@ -257,23 +227,13 @@ while read_ios.include?($control_socket) or read_ios.include?($pseudoterminal_ma
|
|||
begin
|
||||
if ready_read_io.equal? $stdin
|
||||
log "trace", "writing to stdin"
|
||||
chunk = ready_read_io.readpartial(4096)
|
||||
if $options[:interactive]
|
||||
if not pseudoterminal_master_closed
|
||||
$pseudoterminal_master.write chunk
|
||||
end
|
||||
else
|
||||
pipes["stdin"].write chunk
|
||||
end
|
||||
pipes["stdin"].write ready_read_io.readpartial(4096)
|
||||
elsif ready_read_io.equal? pipes["stdout"]
|
||||
log "trace", "reading from stdout"
|
||||
$stdout.write ready_read_io.readpartial(4096)
|
||||
elsif ready_read_io.equal? pipes["stderr"]
|
||||
log "trace", "reading from stderr"
|
||||
$stderr.write ready_read_io.readpartial(4096)
|
||||
elsif ready_read_io.equal? $pseudoterminal_master
|
||||
log "trace", "reading from pseudoterminal client"
|
||||
$stdout.write ready_read_io.readpartial(4096)
|
||||
elsif ready_read_io.equal? $control_socket
|
||||
log "trace", "reading from control socket"
|
||||
command, arguments = read_command
|
||||
|
@ -289,11 +249,6 @@ while read_ios.include?($control_socket) or read_ios.include?($pseudoterminal_ma
|
|||
log "warn", "received input from unknown stream"
|
||||
end
|
||||
rescue EOFError
|
||||
if ready_read_io == $control_socket and $pseudoterminal_master
|
||||
$pseudoterminal_master.close_write
|
||||
pseudoterminal_master_closed = true
|
||||
end
|
||||
|
||||
log "trace", "closing stream #{ready_read_io}"
|
||||
ready_read_io.close
|
||||
end
|
||||
|
@ -307,5 +262,3 @@ exit_code_is_numeric = Integer(exit_code) != nil rescue false
|
|||
if exit_code_is_numeric
|
||||
exit Integer(exit_code)
|
||||
end
|
||||
|
||||
exit 1
|
||||
|
|
|
@ -4,8 +4,6 @@ After=github-enterprise.target
|
|||
Wants=github-enterprise.target
|
||||
|
||||
[Service]
|
||||
User=git
|
||||
Group=git
|
||||
RuntimeDirectory=github-fast-env
|
||||
RuntimeDirectoryMode=0700
|
||||
Type=simple
|
||||
|
|
Loading…
Reference in New Issue