summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-02-08 14:27:25 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 22:53:31 +0000
commit795b1ea370b8a1d9152c171a50e80bd0b4b8dc60 (patch)
treeb8597ec10ba9487b49ce05549453ef9a13472042
parent62867f56da0e0904f0108f113324c2432659fbac (diff)
downloadopenembedded-core-795b1ea370b8a1d9152c171a50e80bd0b4b8dc60.tar.gz
openembedded-core-795b1ea370b8a1d9152c171a50e80bd0b4b8dc60.tar.bz2
openembedded-core-795b1ea370b8a1d9152c171a50e80bd0b4b8dc60.zip
oe-git-proxy: Use socat instead of BSD nc
BSD nc was commonly available on the current distros until Fedora 18 appears to have dropped it. socat appears to be a reasonable replacement with availability on Fedora and Ubuntu and going back some time as well. Update the script to use the socat syntax. Simplify the logic a bit by using exec for the no-proxy-needed cases. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/oe-git-proxy59
1 files changed, 27 insertions, 32 deletions
diff --git a/scripts/oe-git-proxy b/scripts/oe-git-proxy
index 4c2f17903b..98191faadd 100755
--- a/scripts/oe-git-proxy
+++ b/scripts/oe-git-proxy
@@ -1,13 +1,11 @@
#!/bin/bash
-# oe-git-proxy is a simple tool to be via GIT_PROXY_COMMAND. It uses BSD netcat
+# oe-git-proxy is a simple tool to be via GIT_PROXY_COMMAND. It uses socat
# to make SOCKS5 or HTTPS proxy connections. It uses ALL_PROXY to determine the
# proxy server, protocol, and port. It uses NO_PROXY to skip using the proxy for
# a comma delimited list of hosts, host globs (*.example.com), IPs, or CIDR
# masks (192.168.1.0/24). It is known to work with both bash and dash shells.
#
-# BSD netcat is provided by netcat-openbsd on Ubuntu and nc on Fedora.
-#
# Example ALL_PROXY values:
# ALL_PROXY=socks://socks.example.com:1080
# ALL_PROXY=https://proxy.example.com:8080
@@ -15,27 +13,13 @@
# Copyright (c) 2013, Intel Corporation.
# All rights reserved.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
# AUTHORS
# Darren Hart <dvhart@linux.intel.com>
# Locate the netcat binary
-NC=$(which nc 2>/dev/null)
+SOCAT=$(which socat 2>/dev/null)
if [ $? -ne 0 ]; then
- echo "ERROR: nc binary not in PATH"
+ echo "ERROR: socat binary not in PATH"
exit 1
fi
METHOD=""
@@ -111,28 +95,39 @@ match_host() {
return 1
}
-# If no proxy is set, just connect directly
+# If no proxy is set or needed, just connect directly
+METHOD="TCP:$1:$2"
+
if [ -z "$ALL_PROXY" ]; then
- exec $NC -X connect "$@"
+ exec $SOCAT STDIO $METHOD
fi
# Connect directly to hosts in NO_PROXY
for H in ${NO_PROXY//,/ }; do
if match_host $1 $H; then
- METHOD="-X connect"
- break
+ exec $SOCAT STDIO $METHOD
fi
done
-if [ -z "$METHOD" ]; then
- # strip the protocol and the trailing slash
- PROTO=$(echo $ALL_PROXY | sed -e 's/\([^:]*\):\/\/.*/\1/')
- PROXY=$(echo $ALL_PROXY | sed -e 's/.*:\/\/\([^:]*:[0-9]*\).*/\1/')
- if [ "$PROTO" = "socks" ]; then
- METHOD="-X 5 -x $PROXY"
- elif [ "$PROTO" = "https" ]; then
- METHOD="-X connect -x $PROXY"
+# Proxy is necessary, determine protocol, server, and port
+PROTO=$(echo $ALL_PROXY | sed -e 's/\([^:]*\):\/\/.*/\1/')
+PROXY=$(echo $ALL_PROXY | sed -e 's/.*:\/\/\([^:]*\).*/\1/')
+PORT=$(echo $ALL_PROXY | sed -e 's/.*:\([0-9]*\)\/?$/\1/')
+if [ "$PORT" = "$ALL_PROXY" ]; then
+ PORT=""
+fi
+
+if [ "$PROTO" = "socks" ]; then
+ if [ -z "$PORT" ]; then
+ PORT="1080"
+ fi
+ METHOD="SOCKS4:$PROXY:$1:$2,socksport=$PORT"
+else
+ # Assume PROXY (http, https, etc)
+ if [ -z "$PORT" ]; then
+ PORT="8080"
fi
+ METHOD="PROXY:$PROXY:$1:$2,proxyport=$PORT"
fi
-exec $NC $METHOD "$@"
+exec $SOCAT STDIO $METHOD