Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 10:51:57 +00:00
Code Releases Activity

fix(shell-proxy): make ssh-proxy compatible with macOS (#10640)

Browse source
This commit is contained in:
septs 2022-04-12 19:26:22 +08:00 committed by GitHub
parent 846f417eb8
commit 9fa3f46122
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/shell-proxy/.editorconfig Normal file
View file

@ -0,0 +1,3 @@
[*.py]
indent_size = 4
indent_style = space

23
plugins/shell-proxy/ssh-proxy.py
View file

@ -20,14 +20,17 @@ proxy_protocols = {
if parsed.scheme not in proxy_protocols: if parsed.scheme not in proxy_protocols:
raise TypeError('unsupported proxy protocol: "{}"'.format(parsed.scheme)) raise TypeError('unsupported proxy protocol: "{}"'.format(parsed.scheme))
argv = [ def make_argv():
"nc", yield "nc"
"-X", if sys.platform == 'linux':
proxy_protocols[parsed.scheme], # Supported protocols are 4 (SOCKS v4), 5 (SOCKS v5) and connect (HTTP proxy). Default SOCKS v5 is used. # caveats: macOS built-in netcat command not supported proxy-type
"-x", yield "-X" # --proxy-type
parsed.netloc, # proxy-host:proxy-port # Supported protocols are 4 (SOCKS v4), 5 (SOCKS v5) and connect (HTTP proxy).
sys.argv[1], # host # Default SOCKS v5 is used.
sys.argv[2], # port yield proxy_protocols[parsed.scheme]
] yield "-x" # --proxy
yield parsed.netloc # proxy-host:proxy-port
yield sys.argv[1] # host
yield sys.argv[2] # port
subprocess.call(argv) subprocess.call(make_argv())