From 3939c188b0f9d594ed7e1e6e3707a2f594c42a55 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Mon, 19 Nov 2018 17:12:18 +0100
Subject: [PATCH] ADD SocksiPy modules
---
setup.py | 2 +-
src/caosdb/connection/BUGS | 25 ++
src/caosdb/connection/LICENSE | 22 ++
src/caosdb/connection/README | 201 +++++++++++++
src/caosdb/connection/SocksiPy.zip | Bin 0 -> 9266 bytes
src/caosdb/connection/connection.py | 7 +-
src/caosdb/connection/socks.py | 387 +++++++++++++++++++++++++
src/caosdb/connection/streaminghttp.py | 16 +-
8 files changed, 656 insertions(+), 4 deletions(-)
create mode 100644 src/caosdb/connection/BUGS
create mode 100644 src/caosdb/connection/LICENSE
create mode 100644 src/caosdb/connection/README
create mode 100644 src/caosdb/connection/SocksiPy.zip
create mode 100644 src/caosdb/connection/socks.py
diff --git a/setup.py b/setup.py
index f80c6195..6adefd59 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@
from setuptools import setup, find_packages
setup(name='PyCaosDB',
- version='0.1.0',
+ version='0.2.0',
description='Python Interface for CaosDB',
author='Timm Fitschen',
author_email='timm.fitschen@ds.mpg.de',
diff --git a/src/caosdb/connection/BUGS b/src/caosdb/connection/BUGS
new file mode 100644
index 00000000..2412351a
--- /dev/null
+++ b/src/caosdb/connection/BUGS
@@ -0,0 +1,25 @@
+SocksiPy version 1.00
+A Python SOCKS module.
+(C) 2006 Dan-Haim. All rights reserved.
+See LICENSE file for details.
+
+
+KNOWN BUGS AND ISSUES
+----------------------
+
+There are no currently known bugs in this module.
+There are some limits though:
+
+1) Only outgoing connections are supported - This module currently only supports
+outgoing TCP connections, though some servers may support incoming connections
+as well. UDP is not supported either.
+
+2) GSSAPI Socks5 authenticaion is not supported.
+
+
+If you find any new bugs, please contact the author at:
+
+negativeiq@users.sourceforge.net
+
+
+Thank you!
diff --git a/src/caosdb/connection/LICENSE b/src/caosdb/connection/LICENSE
new file mode 100644
index 00000000..fc330787
--- /dev/null
+++ b/src/caosdb/connection/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2006 Dan-Haim. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+3. Neither the name of Dan Haim nor the names of his contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL DAN HAIM OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE.
diff --git a/src/caosdb/connection/README b/src/caosdb/connection/README
new file mode 100644
index 00000000..deae6f6d
--- /dev/null
+++ b/src/caosdb/connection/README
@@ -0,0 +1,201 @@
+SocksiPy version 1.00
+A Python SOCKS module.
+(C) 2006 Dan-Haim. All rights reserved.
+See LICENSE file for details.
+
+
+WHAT IS A SOCKS PROXY?
+A SOCKS proxy is a proxy server at the TCP level. In other words, it acts as
+a tunnel, relaying all traffic going through it without modifying it.
+SOCKS proxies can be used to relay traffic using any network protocol that
+uses TCP.
+
+WHAT IS SOCKSIPY?
+This Python module allows you to create TCP connections through a SOCKS
+proxy without any special effort.
+
+PROXY COMPATIBILITY
+SocksiPy is compatible with three different types of proxies:
+1. SOCKS Version 4 (Socks4), including the Socks4a extension.
+2. SOCKS Version 5 (Socks5).
+3. HTTP Proxies which support tunneling using the CONNECT method.
+
+SYSTEM REQUIREMENTS
+Being written in Python, SocksiPy can run on any platform that has a Python
+interpreter and TCP/IP support.
+This module has been tested with Python 2.3 and should work with greater versions
+just as well.
+
+
+INSTALLATION
+-------------
+
+Simply copy the file "socks.py" to your Python's lib/site-packages directory,
+and you're ready to go.
+
+
+USAGE
+------
+
+First load the socks module with the command:
+
+>>> import socks
+>>>
+
+The socks module provides a class called "socksocket", which is the base to
+all of the module's functionality.
+The socksocket object has the same initialization parameters as the normal socket
+object to ensure maximal compatibility, however it should be noted that socksocket
+will only function with family being AF_INET and type being SOCK_STREAM.
+Generally, it is best to initialize the socksocket object with no parameters
+
+>>> s = socks.socksocket()
+>>>
+
+The socksocket object has an interface which is very similiar to socket's (in fact
+the socksocket class is derived from socket) with a few extra methods.
+To select the proxy server you would like to use, use the setproxy method, whose
+syntax is:
+
+setproxy(proxytype, addr[, port[, rdns[, username[, password]]]])
+
+Explaination of the parameters:
+
+proxytype - The type of the proxy server. This can be one of three possible
+choices: PROXY_TYPE_SOCKS4, PROXY_TYPE_SOCKS5 and PROXY_TYPE_HTTP for Socks4,
+Socks5 and HTTP servers respectively.
+
+addr - The IP address or DNS name of the proxy server.
+
+port - The port of the proxy server. Defaults to 1080 for socks and 8080 for http.
+
+rdns - This is a boolean flag than modifies the behavior regarding DNS resolving.
+If it is set to True, DNS resolving will be preformed remotely, on the server.
+If it is set to False, DNS resolving will be preformed locally. Please note that
+setting this to True with Socks4 servers actually use an extension to the protocol,
+called Socks4a, which may not be supported on all servers (Socks5 and http servers
+always support DNS). The default is True.
+
+username - For Socks5 servers, this allows simple username / password authentication
+with the server. For Socks4 servers, this parameter will be sent as the userid.
+This parameter is ignored if an HTTP server is being used. If it is not provided,
+authentication will not be used (servers may accept unauthentication requests).
+
+password - This parameter is valid only for Socks5 servers and specifies the
+respective password for the username provided.
+
+Example of usage:
+
+>>> s.setproxy(socks.PROXY_TYPE_SOCKS5,"socks.example.com")
+>>>
+
+After the setproxy method has been called, simply call the connect method with the
+traditional parameters to establish a connection through the proxy:
+
+>>> s.connect(("www.sourceforge.net",80))
+>>>
+
+Connection will take a bit longer to allow negotiation with the proxy server.
+Please note that calling connect without calling setproxy earlier will connect
+without a proxy (just like a regular socket).
+
+Errors: Any errors in the connection process will trigger exceptions. The exception
+may either be generated by the underlying socket layer or may be custom module
+exceptions, whose details follow:
+
+class ProxyError - This is a base exception class. It is not raised directly but
+rather all other exception classes raised by this module are derived from it.
+This allows an easy way to catch all proxy-related errors.
+
+class GeneralProxyError - When thrown, it indicates a problem which does not fall
+into another category. The parameter is a tuple containing an error code and a
+description of the error, from the following list:
+1 - invalid data - This error means that unexpected data has been received from
+the server. The most common reason is that the server specified as the proxy is
+not really a Socks4/Socks5/HTTP proxy, or maybe the proxy type specified is wrong.
+4 - bad proxy type - This will be raised if the type of the proxy supplied to the
+setproxy function was not PROXY_TYPE_SOCKS4/PROXY_TYPE_SOCKS5/PROXY_TYPE_HTTP.
+5 - bad input - This will be raised if the connect method is called with bad input
+parameters.
+
+class Socks5AuthError - This indicates that the connection through a Socks5 server
+failed due to an authentication problem. The parameter is a tuple containing a
+code and a description message according to the following list:
+
+1 - authentication is required - This will happen if you use a Socks5 server which
+requires authentication without providing a username / password at all.
+2 - all offered authentication methods were rejected - This will happen if the proxy
+requires a special authentication method which is not supported by this module.
+3 - unknown username or invalid password - Self descriptive.
+
+class Socks5Error - This will be raised for Socks5 errors which are not related to
+authentication. The parameter is a tuple containing a code and a description of the
+error, as given by the server. The possible errors, according to the RFC are:
+
+1 - General SOCKS server failure - If for any reason the proxy server is unable to
+fulfill your request (internal server error).
+2 - connection not allowed by ruleset - If the address you're trying to connect to
+is blacklisted on the server or requires authentication.
+3 - Network unreachable - The target could not be contacted. A router on the network
+had replied with a destination net unreachable error.
+4 - Host unreachable - The target could not be contacted. A router on the network
+had replied with a destination host unreachable error.
+5 - Connection refused - The target server has actively refused the connection
+(the requested port is closed).
+6 - TTL expired - The TTL value of the SYN packet from the proxy to the target server
+has expired. This usually means that there are network problems causing the packet
+to be caught in a router-to-router "ping-pong".
+7 - Command not supported - The client has issued an invalid command. When using this
+module, this error should not occur.
+8 - Address type not supported - The client has provided an invalid address type.
+When using this module, this error should not occur.
+
+class Socks4Error - This will be raised for Socks4 errors. The parameter is a tuple
+containing a code and a description of the error, as given by the server. The
+possible error, according to the specification are:
+
+1 - Request rejected or failed - Will be raised in the event of an failure for any
+reason other then the two mentioned next.
+2 - request rejected because SOCKS server cannot connect to identd on the client -
+The Socks server had tried an ident lookup on your computer and has failed. In this
+case you should run an identd server and/or configure your firewall to allow incoming
+connections to local port 113 from the remote server.
+3 - request rejected because the client program and identd report different user-ids -
+The Socks server had performed an ident lookup on your computer and has received a
+different userid than the one you have provided. Change your userid (through the
+username parameter of the setproxy method) to match and try again.
+
+class HTTPError - This will be raised for HTTP errors. The parameter is a tuple
+containing the HTTP status code and the description of the server.
+
+
+After establishing the connection, the object behaves like a standard socket.
+Call the close method to close the connection.
+
+In addition to the socksocket class, an additional function worth mentioning is the
+setdefaultproxy function. The parameters are the same as the setproxy method.
+This function will set default proxy settings for newly created socksocket objects,
+in which the proxy settings haven't been changed via the setproxy method.
+This is quite useful if you wish to force 3rd party modules to use a socks proxy,
+by overriding the socket object.
+For example:
+
+>>> socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5,"socks.example.com")
+>>> socket.socket = socks.socksocket
+>>> urllib.urlopen("http://www.sourceforge.net/")
+
+
+PROBLEMS
+---------
+
+If you have any problems using this module, please first refer to the BUGS file
+(containing current bugs and issues). If your problem is not mentioned you may
+contact the author at the following E-Mail address:
+
+negativeiq@users.sourceforge.net
+
+Please allow some time for your question to be received and handled.
+
+
+Dan-Haim,
+Author.
diff --git a/src/caosdb/connection/SocksiPy.zip b/src/caosdb/connection/SocksiPy.zip
new file mode 100644
index 0000000000000000000000000000000000000000..e81f1f9393c766a3acd41b44245f9e17f090cbe5
GIT binary patch
literal 9266
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
S^nVzKFM!#9sx0NdZvPL#;C80~
literal 0
HcmV?d00001
diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py
index 10674e71..d7a98b6f 100644
--- a/src/caosdb/connection/connection.py
+++ b/src/caosdb/connection/connection.py
@@ -112,10 +112,15 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
"No connection url specified. Please "
"do so via caosdb.configure_connection(...) or in a config "
"file.")
+
+ socket_proxy = None
+ if "socket_proxy" in config:
+ socket_proxy = config["socket_proxy"]
self._http_con = StreamingHTTPSConnection(
host=host,
timeout=int(config.get("timeout")),
- context=context)
+ context=context,
+ socket_proxy=socket_proxy)
def _make_conf(*conf):
diff --git a/src/caosdb/connection/socks.py b/src/caosdb/connection/socks.py
new file mode 100644
index 00000000..c41b1ec9
--- /dev/null
+++ b/src/caosdb/connection/socks.py
@@ -0,0 +1,387 @@
+"""SocksiPy - Python SOCKS module.
+Version 1.00
+
+Copyright 2006 Dan-Haim. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+3. Neither the name of Dan Haim nor the names of his contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL DAN HAIM OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE.
+
+
+This module provides a standard socket-like interface for Python
+for tunneling connections through SOCKS proxies.
+
+"""
+
+import socket
+import struct
+
+PROXY_TYPE_SOCKS4 = 1
+PROXY_TYPE_SOCKS5 = 2
+PROXY_TYPE_HTTP = 3
+
+_defaultproxy = None
+_orgsocket = socket.socket
+
+class ProxyError(Exception):
+ def __init__(self, value):
+ self.value = value
+ def __str__(self):
+ return repr(self.value)
+
+class GeneralProxyError(ProxyError):
+ def __init__(self, value):
+ self.value = value
+ def __str__(self):
+ return repr(self.value)
+
+class Socks5AuthError(ProxyError):
+ def __init__(self, value):
+ self.value = value
+ def __str__(self):
+ return repr(self.value)
+
+class Socks5Error(ProxyError):
+ def __init__(self, value):
+ self.value = value
+ def __str__(self):
+ return repr(self.value)
+
+class Socks4Error(ProxyError):
+ def __init__(self, value):
+ self.value = value
+ def __str__(self):
+ return repr(self.value)
+
+class HTTPError(ProxyError):
+ def __init__(self, value):
+ self.value = value
+ def __str__(self):
+ return repr(self.value)
+
+_generalerrors = ("success",
+ "invalid data",
+ "not connected",
+ "not available",
+ "bad proxy type",
+ "bad input")
+
+_socks5errors = ("succeeded",
+ "general SOCKS server failure",
+ "connection not allowed by ruleset",
+ "Network unreachable",
+ "Host unreachable",
+ "Connection refused",
+ "TTL expired",
+ "Command not supported",
+ "Address type not supported",
+ "Unknown error")
+
+_socks5autherrors = ("succeeded",
+ "authentication is required",
+ "all offered authentication methods were rejected",
+ "unknown username or invalid password",
+ "unknown error")
+
+_socks4errors = ("request granted",
+ "request rejected or failed",
+ "request rejected because SOCKS server cannot connect to identd on the client",
+ "request rejected because the client program and identd report different user-ids",
+ "unknown error")
+
+def setdefaultproxy(proxytype=None,addr=None,port=None,rdns=True,username=None,password=None):
+ """setdefaultproxy(proxytype, addr[, port[, rdns[, username[, password]]]])
+ Sets a default proxy which all further socksocket objects will use,
+ unless explicitly changed.
+ """
+ global _defaultproxy
+ _defaultproxy = (proxytype,addr,port,rdns,username,password)
+
+class socksocket(socket.socket):
+ """socksocket([family[, type[, proto]]]) -> socket object
+
+ Open a SOCKS enabled socket. The parameters are the same as
+ those of the standard socket init. In order for SOCKS to work,
+ you must specify family=AF_INET, type=SOCK_STREAM and proto=0.
+ """
+
+ def __init__(self, family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0, _sock=None):
+ _orgsocket.__init__(self,family,type,proto,_sock)
+ if _defaultproxy != None:
+ self.__proxy = _defaultproxy
+ else:
+ self.__proxy = (None, None, None, None, None, None)
+ self.__proxysockname = None
+ self.__proxypeername = None
+
+ def __recvall(self, bytes):
+ """__recvall(bytes) -> data
+ Receive EXACTLY the number of bytes requested from the socket.
+ Blocks until the required number of bytes have been received.
+ """
+ data = ""
+ while len(data) < bytes:
+ data = data + self.recv(bytes-len(data))
+ return data
+
+ def setproxy(self,proxytype=None,addr=None,port=None,rdns=True,username=None,password=None):
+ """setproxy(proxytype, addr[, port[, rdns[, username[, password]]]])
+ Sets the proxy to be used.
+ proxytype - The type of the proxy to be used. Three types
+ are supported: PROXY_TYPE_SOCKS4 (including socks4a),
+ PROXY_TYPE_SOCKS5 and PROXY_TYPE_HTTP
+ addr - The address of the server (IP or DNS).
+ port - The port of the server. Defaults to 1080 for SOCKS
+ servers and 8080 for HTTP proxy servers.
+ rdns - Should DNS queries be preformed on the remote side
+ (rather than the local side). The default is True.
+ Note: This has no effect with SOCKS4 servers.
+ username - Username to authenticate with to the server.
+ The default is no authentication.
+ password - Password to authenticate with to the server.
+ Only relevant when username is also provided.
+ """
+ self.__proxy = (proxytype,addr,port,rdns,username,password)
+
+ def __negotiatesocks5(self,destaddr,destport):
+ """__negotiatesocks5(self,destaddr,destport)
+ Negotiates a connection through a SOCKS5 server.
+ """
+ # First we'll send the authentication packages we support.
+ if (self.__proxy[4]!=None) and (self.__proxy[5]!=None):
+ # The username/password details were supplied to the
+ # setproxy method so we support the USERNAME/PASSWORD
+ # authentication (in addition to the standard none).
+ self.sendall("\x05\x02\x00\x02")
+ else:
+ # No username/password were entered, therefore we
+ # only support connections with no authentication.
+ self.sendall("\x05\x01\x00")
+ # We'll receive the server's response to determine which
+ # method was selected
+ chosenauth = self.__recvall(2)
+ if chosenauth[0] != "\x05":
+ self.close()
+ raise GeneralProxyError((1,_generalerrors[1]))
+ # Check the chosen authentication method
+ if chosenauth[1] == "\x00":
+ # No authentication is required
+ pass
+ elif chosenauth[1] == "\x02":
+ # Okay, we need to perform a basic username/password
+ # authentication.
+ self.sendall("\x01" + chr(len(self.__proxy[4])) + self.__proxy[4] + chr(len(self.proxy[5])) + self.__proxy[5])
+ authstat = self.__recvall(2)
+ if authstat[0] != "\x01":
+ # Bad response
+ self.close()
+ raise GeneralProxyError((1,_generalerrors[1]))
+ if authstat[1] != "\x00":
+ # Authentication failed
+ self.close()
+ raise Socks5AuthError((3,_socks5autherrors[3]))
+ # Authentication succeeded
+ else:
+ # Reaching here is always bad
+ self.close()
+ if chosenauth[1] == "\xFF":
+ raise Socks5AuthError((2,_socks5autherrors[2]))
+ else:
+ raise GeneralProxyError((1,_generalerrors[1]))
+ # Now we can request the actual connection
+ req = "\x05\x01\x00"
+ # If the given destination address is an IP address, we'll
+ # use the IPv4 address request even if remote resolving was specified.
+ try:
+ ipaddr = socket.inet_aton(destaddr)
+ req = req + "\x01" + ipaddr
+ except socket.error:
+ # Well it's not an IP number, so it's probably a DNS name.
+ if self.__proxy[3]==True:
+ # Resolve remotely
+ ipaddr = None
+ req = req + "\x03" + chr(len(destaddr)) + destaddr
+ else:
+ # Resolve locally
+ ipaddr = socket.inet_aton(socket.gethostbyname(destaddr))
+ req = req + "\x01" + ipaddr
+ req = req + struct.pack(">H",destport)
+ self.sendall(req)
+ # Get the response
+ resp = self.__recvall(4)
+ if resp[0] != "\x05":
+ self.close()
+ raise GeneralProxyError((1,_generalerrors[1]))
+ elif resp[1] != "\x00":
+ # Connection failed
+ self.close()
+ if ord(resp[1])<=8:
+ raise Socks5Error(ord(resp[1]),_generalerrors[ord(resp[1])])
+ else:
+ raise Socks5Error(9,_generalerrors[9])
+ # Get the bound address/port
+ elif resp[3] == "\x01":
+ boundaddr = self.__recvall(4)
+ elif resp[3] == "\x03":
+ resp = resp + self.recv(1)
+ boundaddr = self.__recvall(resp[4])
+ else:
+ self.close()
+ raise GeneralProxyError((1,_generalerrors[1]))
+ boundport = struct.unpack(">H",self.__recvall(2))[0]
+ self.__proxysockname = (boundaddr,boundport)
+ if ipaddr != None:
+ self.__proxypeername = (socket.inet_ntoa(ipaddr),destport)
+ else:
+ self.__proxypeername = (destaddr,destport)
+
+ def getproxysockname(self):
+ """getsockname() -> address info
+ Returns the bound IP address and port number at the proxy.
+ """
+ return self.__proxysockname
+
+ def getproxypeername(self):
+ """getproxypeername() -> address info
+ Returns the IP and port number of the proxy.
+ """
+ return _orgsocket.getpeername(self)
+
+ def getpeername(self):
+ """getpeername() -> address info
+ Returns the IP address and port number of the destination
+ machine (note: getproxypeername returns the proxy)
+ """
+ return self.__proxypeername
+
+ def __negotiatesocks4(self,destaddr,destport):
+ """__negotiatesocks4(self,destaddr,destport)
+ Negotiates a connection through a SOCKS4 server.
+ """
+ # Check if the destination address provided is an IP address
+ rmtrslv = False
+ try:
+ ipaddr = socket.inet_aton(destaddr)
+ except socket.error:
+ # It's a DNS name. Check where it should be resolved.
+ if self.__proxy[3]==True:
+ ipaddr = "\x00\x00\x00\x01"
+ rmtrslv = True
+ else:
+ ipaddr = socket.inet_aton(socket.gethostbyname(destaddr))
+ # Construct the request packet
+ req = "\x04\x01" + struct.pack(">H",destport) + ipaddr
+ # The username parameter is considered userid for SOCKS4
+ if self.__proxy[4] != None:
+ req = req + self.__proxy[4]
+ req = req + "\x00"
+ # DNS name if remote resolving is required
+ # NOTE: This is actually an extension to the SOCKS4 protocol
+ # called SOCKS4A and may not be supported in all cases.
+ if rmtrslv==True:
+ req = req + destaddr + "\x00"
+ self.sendall(req)
+ # Get the response from the server
+ resp = self.__recvall(8)
+ if resp[0] != "\x00":
+ # Bad data
+ self.close()
+ raise GeneralProxyError((1,_generalerrors[1]))
+ if resp[1] != "\x5A":
+ # Server returned an error
+ self.close()
+ if ord(resp[1]) in (91,92,93):
+ self.close()
+ raise Socks4Error((ord(resp[1]),_socks4errors[ord(resp[1])-90]))
+ else:
+ raise Socks4Error((94,_socks4errors[4]))
+ # Get the bound address/port
+ self.__proxysockname = (socket.inet_ntoa(resp[4:]),struct.unpack(">H",resp[2:4])[0])
+ if rmtrslv != None:
+ self.__proxypeername = (socket.inet_ntoa(ipaddr),destport)
+ else:
+ self.__proxypeername = (destaddr,destport)
+
+ def __negotiatehttp(self,destaddr,destport):
+ """__negotiatehttp(self,destaddr,destport)
+ Negotiates a connection through an HTTP server.
+ """
+ # If we need to resolve locally, we do this now
+ if self.__proxy[3] == False:
+ addr = socket.gethostbyname(destaddr)
+ else:
+ addr = destaddr
+ self.sendall("CONNECT " + addr + ":" + str(destport) + " HTTP/1.1\r\n" + "Host: " + destaddr + "\r\n\r\n")
+ # We read the response until we get the string "\r\n\r\n"
+ resp = self.recv(1)
+ while resp.find("\r\n\r\n")==-1:
+ resp = resp + self.recv(1)
+ # We just need the first line to check if the connection
+ # was successful
+ statusline = resp.splitlines()[0].split(" ",2)
+ if statusline[0] not in ("HTTP/1.0","HTTP/1.1"):
+ self.close()
+ raise GeneralProxyError((1,_generalerrors[1]))
+ try:
+ statuscode = int(statusline[1])
+ except ValueError:
+ self.close()
+ raise GeneralProxyError((1,_generalerrors[1]))
+ if statuscode != 200:
+ self.close()
+ raise HTTPError((statuscode,statusline[2]))
+ self.__proxysockname = ("0.0.0.0",0)
+ self.__proxypeername = (addr,destport)
+
+ def connect(self,destpair):
+ """connect(self,despair)
+ Connects to the specified destination through a proxy.
+ destpar - A tuple of the IP/DNS address and the port number.
+ (identical to socket's connect).
+ To select the proxy server use setproxy().
+ """
+ # Do a minimal input check first
+ if (type(destpair) in (list,tuple)==False) or (len(destpair)<2) or (type(destpair[0])!=str) or (type(destpair[1])!=int):
+ raise GeneralProxyError((5,_generalerrors[5]))
+ if self.__proxy[0] == PROXY_TYPE_SOCKS5:
+ if self.__proxy[2] != None:
+ portnum = self.__proxy[2]
+ else:
+ portnum = 1080
+ _orgsocket.connect(self,(self.__proxy[1],portnum))
+ self.__negotiatesocks5(destpair[0],destpair[1])
+ elif self.__proxy[0] == PROXY_TYPE_SOCKS4:
+ if self.__proxy[2] != None:
+ portnum = self.__proxy[2]
+ else:
+ portnum = 1080
+ _orgsocket.connect(self,(self.__proxy[1],portnum))
+ self.__negotiatesocks4(destpair[0],destpair[1])
+ elif self.__proxy[0] == PROXY_TYPE_HTTP:
+ if self.__proxy[2] != None:
+ portnum = self.__proxy[2]
+ else:
+ portnum = 8080
+ _orgsocket.connect(self,(self.__proxy[1],portnum))
+ self.__negotiatehttp(destpair[0],destpair[1])
+ elif self.__proxy[0] == None:
+ _orgsocket.connect(self,(destpair[0],destpair[1]))
+ else:
+ raise GeneralProxyError((4,_generalerrors[4]))
diff --git a/src/caosdb/connection/streaminghttp.py b/src/caosdb/connection/streaminghttp.py
index fa97a964..55f5ba3a 100644
--- a/src/caosdb/connection/streaminghttp.py
+++ b/src/caosdb/connection/streaminghttp.py
@@ -51,7 +51,8 @@ since there is no way to determine in advance the total size that will be
yielded, and there is no way to reset an interator.
"""
-from __future__ import unicode_literals, print_function
+from __future__ import unicode_literals, print_function, absolute_import
+from . import socks
import socket
try:
# python3
@@ -69,6 +70,17 @@ class StreamingHTTPSConnection(client.HTTPSConnection, object):
that overrides the `send()` method to support iterable body objects."""
# pylint: disable=unused-argument, arguments-differ
+ def __init__(self, socket_proxy=None, **kwargs):
+ if socket_proxy is not None:
+ print("socket_proxy:" + socket_proxy)
+ host, port = socket_proxy.split(":")
+ socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, host,
+ int(port))
+ socket.socket = socks.socksocket
+ else:
+ print("no socket_proxy")
+ super(StreamingHTTPSConnection, self).__init__(**kwargs)
+
def _send_output(self, body, **kwargs):
"""Send the currently buffered request and clear the buffer.
@@ -87,7 +99,7 @@ class StreamingHTTPSConnection(client.HTTPSConnection, object):
if body is not None:
self.send(body)
- # pylint: disable=too-complex, too-many-branches
+ # pylint: disable=too-many-branches
def send(self, value):
"""Send ``value`` to the server.
--
GitLab