From 2478805452d2c516deda9fc1e0a3eaf68a970b07 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 2 Nov 2022 23:10:56 +0100
Subject: [PATCH] WIP: http proxy
---
setup.py | 3 +-
src/caosdb/common/administration.py | 2 +-
src/caosdb/common/models.py | 7 +-
src/caosdb/connection/SocksiPy.zip | Bin 9266 -> 0 bytes
src/caosdb/connection/connection.py | 79 ++++--------
src/caosdb/connection/encode.py | 38 +++++-
src/caosdb/connection/streaminghttp.py | 161 -------------------------
7 files changed, 65 insertions(+), 225 deletions(-)
delete mode 100644 src/caosdb/connection/SocksiPy.zip
delete mode 100644 src/caosdb/connection/streaminghttp.py
diff --git a/setup.py b/setup.py
index 50c5b89e..f85c0938 100755
--- a/setup.py
+++ b/setup.py
@@ -171,11 +171,10 @@ def setup_package():
python_requires='>=3.8',
package_dir={'': 'src'},
install_requires=['lxml>=4.6.3',
- "requests>=2.28.1",
+ "requests[socks]>=2.28.1",
"python-dateutil>=2.8.2",
'PyYAML>=5.4.1',
'future',
- 'PySocks>=1.6.7',
],
extras_require={'keyring': ['keyring>=13.0.0'],
'jsonschema': ['jsonschema>=4.4.0']},
diff --git a/src/caosdb/common/administration.py b/src/caosdb/common/administration.py
index 98d4d282..bd09c626 100644
--- a/src/caosdb/common/administration.py
+++ b/src/caosdb/common/administration.py
@@ -76,7 +76,7 @@ def get_server_properties():
con = get_connection()
try:
body = con._http_request(
- method="GET", path="_server_properties").response
+ method="GET", path="_server_properties")
except EntityDoesNotExistError:
raise ServerConfigurationException(
"Debug mode in server is probably disabled.") from None
diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 7000ede9..00e3884a 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -55,7 +55,8 @@ from caosdb.common.timezone import TimeZone
from caosdb.common.versioning import Version
from caosdb.configuration import get_config
from caosdb.connection.connection import get_connection
-from caosdb.connection.encode import MultipartParam, multipart_encode
+from caosdb.connection.encode import (MultipartParam, multipart_encode,
+ ReadableMultiparts)
from caosdb.exceptions import (AmbiguousEntityError, AuthorizationError,
CaosDBConnectionError, CaosDBException,
ConsistencyError, EmptyUniqueQueryError,
@@ -3415,7 +3416,9 @@ class Container(list):
if http_parts is not None and len(http_parts) > 0:
http_parts.insert(
0, MultipartParam("FileRepresentation", xml2str(insert_xml)))
+
body, headers = multipart_encode(http_parts)
+ body = ReadableMultiparts(body)
http_response = con.update(
entity_uri_segment=[_ENTITY_URI_SEGMENT],
@@ -3571,6 +3574,8 @@ class Container(list):
0, MultipartParam("FileRepresentation", xml2str(insert_xml)))
body, headers = multipart_encode(http_parts)
+ body = ReadableMultiparts(body)
+
http_response = con.insert(
entity_uri_segment=[_ENTITY_URI_SEGMENT],
body=body,
diff --git a/src/caosdb/connection/SocksiPy.zip b/src/caosdb/connection/SocksiPy.zip
deleted file mode 100644
index e81f1f9393c766a3acd41b44245f9e17f090cbe5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 9266
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
RurRPNTx4Ki@Ky$?0|3F`cBcRU
diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py
index 3fff3b7d..2c23ed0a 100644
--- a/src/caosdb/connection/connection.py
+++ b/src/caosdb/connection/connection.py
@@ -31,7 +31,7 @@ import sys
from builtins import str # pylint: disable=redefined-builtin
from errno import EPIPE as BrokenPipe
from socket import error as SocketError
-from urllib.parse import urlparse
+from urllib.parse import quote, urlparse
from requests import Session as HTTPSession
from requests.exceptions import ConnectionError as HTTPConnectionError
@@ -52,21 +52,15 @@ except ModuleNotFoundError:
from pkg_resources import resource_filename
from .interface import CaosDBHTTPResponse, CaosDBServerConnection
-from .streaminghttp import StreamingHTTPSConnection
from .utils import make_uri_path, parse_url, urlencode
-try:
- from urllib.parse import quote, urlparse
-except ImportError:
- from urllib import quote
- from urlparse import urlparse
# pylint: disable=missing-docstring
_LOGGER = logging.getLogger(__name__)
-class _WrappedHTTPResponse2(CaosDBHTTPResponse):
+class _WrappedHTTPResponse(CaosDBHTTPResponse):
def __init__(self, response):
self.response = response
@@ -92,32 +86,6 @@ class _WrappedHTTPResponse2(CaosDBHTTPResponse):
self.response.close()
-class _WrappedHTTPResponse(CaosDBHTTPResponse):
-
- def __init__(self, response):
- self.response = response
-
- @property
- def reason(self):
- return self.response.reason
-
- @property
- def status(self):
- return self.response.status
-
- def read(self, size=None):
- return self.response.read(size)
-
- def getheader(self, name, default=None):
- return self.response.getheader(name=name, default=default)
-
- def getheaders(self):
- return self.response.getheaders()
-
- def close(self):
- self.response.close()
-
-
class _DefaultCaosDBServerConnection(CaosDBServerConnection):
"""_DefaultCaosDBServerConnection.
@@ -146,7 +114,7 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
including query and frament segments.
headers : dict of str -> str, optional
HTTP request headers. (Defautl: None)
- body : str or bytes or readable, opional
+ body : str or bytes or readable, optional
The body of the HTTP request. Bytes should be a utf-8 encoded
string.
**kwargs :
@@ -163,37 +131,30 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
headers["User-Agent"] = self._useragent
try:
+ session = HTTPSession()
if self.setup_fields["https_proxy"] is not None:
- session = HTTPSession()
session.proxies = {
"https": self.setup_fields["https_proxy"]
}
- response = session.request(method=method,
- url=self.setup_fields["url_base_path"] + path,
- headers=headers, data=body, stream=True)
- return _WrappedHTTPResponse2(response)
- except HTTPConnectionError as conn_err:
- raise CaosDBConnectionError(
- "Connection failed. Network or server down? " + str(conn_err)
- )
+ verify = True
+ if self.setup_fields["cacert"]:
+ verify = self.setup_fields["cacert"]
+ if self.setup_fields["ssl_insecure"]:
+ verify = False
+ url = urlparse(self.setup_fields["url_base_path"] + path)
- try:
- self._http_con = ProxyConnection(
- # TODO looks as if configure needs to be done first.
- # That is however not assured.
- host=self.setup_fields["host"],
- timeout=self.setup_fields["timeout"],
- context=self.setup_fields["context"],
- socket_proxy=self.setup_fields["socket_proxy"])
- self._http_con.request(method=method, url=self._base_path + path,
- headers=headers, body=body)
- except SocketError as socket_err:
+
+ response = session.request(method=method,
+ url=self.setup_fields["url_base_path"] + path,
+ verify=verify,
+ headers=headers, data=body, stream=True)
+ return _WrappedHTTPResponse(response)
+ except HTTPConnectionError as conn_err:
raise CaosDBConnectionError(
- "Connection failed. Network or server down? " + str(socket_err)
+ "Connection failed. Network or server down? " + str(conn_err)
)
- return _WrappedHTTPResponse(self._http_con.getresponse())
def configure(self, **config):
"""configure.
@@ -271,7 +232,9 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
https_proxy = result.scheme + "://" + result.netloc
self.setup_fields = {
- "url_base_path": config["url"] + "/",
+ "url_base_path": config["url"],
+ "cacert": config["cacert"] if "cacert" in config else None,
+ "ssl_insecure": config["ssl_insecure"] if "ssl_insecure" in config else False,
"host": host,
"timeout": int(config.get("timeout")),
"context": context,
diff --git a/src/caosdb/connection/encode.py b/src/caosdb/connection/encode.py
index 7b092aae..e43b7814 100644
--- a/src/caosdb/connection/encode.py
+++ b/src/caosdb/connection/encode.py
@@ -51,7 +51,8 @@ multipart/form-data is the standard way to upload files over HTTP
__all__ = [
'gen_boundary', 'encode_and_quote', 'MultipartParam', 'encode_string',
- 'encode_file_header', 'get_body_size', 'get_headers', 'multipart_encode'
+ 'encode_file_header', 'get_body_size', 'get_headers', 'multipart_encode',
+ 'ReadableMultiparts',
]
from urllib.parse import quote_plus
from io import UnsupportedOperation
@@ -363,7 +364,6 @@ def get_headers(params, boundary):
headers['Content-Length'] = str(get_body_size(params, boundary))
return headers
-
class MultipartYielder(object):
"""An iterator that yields the parameters of a multipart/formdata http
body."""
@@ -475,3 +475,37 @@ def multipart_encode(params, boundary=None, callback=None):
params = MultipartParam.from_params(params)
return MultipartYielder(params, boundary, callback), headers
+
+class ReadableMultiparts(object):
+
+ def __init__(self, multipart_yielder):
+ self.multipart_yielder = multipart_yielder
+ self.current_block = None
+ self.left_over = b''
+
+ def read(self, size=-1):
+ result = self.left_over
+ while size == -1 or len(result) < size:
+ try:
+ next_chunk = self.multipart_yielder.next()
+ if hasattr(next_chunk, "encode"):
+ next_chunk = next_chunk.encode("utf8")
+ result += next_chunk
+ except StopIteration:
+ break
+
+ if size == -1:
+ self.left_over = b''
+ return result
+
+ self.left_over = result[size:]
+ return result[:size]
+
+ def __enter__(self):
+ pass
+
+ def __exit__(self, type, value, traceback):
+ self.close()
+
+ def close(self):
+ self.multipart_yielder.reset()
diff --git a/src/caosdb/connection/streaminghttp.py b/src/caosdb/connection/streaminghttp.py
deleted file mode 100644
index e3442795..00000000
--- a/src/caosdb/connection/streaminghttp.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# ** header v3.0
-# This file is a part of the CaosDB Project.
-#
-# Copyright (C) 2018 Research Group Biomedical Physics,
-# Max-Planck-Institute for Dynamics and Self-Organization Göttingen
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-# ** end header
-#
-# Original work Copyright (c) 2011 Chris AtLee
-# Modified work Copyright (c) 2017 Biomedical Physics, MPI for Dynamics and Self-Organization
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-"""Streaming HTTP uploads module.
-
-This module extends the standard httplib and http.client HTTPConnection so that
-iterable objects can be used in the body of HTTP requests.
-
-**N.B.** You must specify a Content-Length header if using an iterable object
-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, absolute_import
-import socks
-import socket
-try:
- # python3
- from http import client as client
-except ImportError:
- # python2
- import httplib as client
-
-
-__all__ = ['StreamingHTTPSConnection']
-
-
-class StreamingHTTPSConnection(client.HTTPSConnection, object):
- """Subclass of `http.client.HTTSConnection` or `httplib.HTTPSConnection`
- that overrides the `send()` method to support iterable body objects."""
- # pylint: disable=unused-argument, arguments-differ
-
- def __init__(self, socket_proxy=None, https_proxy=None, **kwargs):
- host = kwargs["host"]
- port = int(kwargs["port"]) if "port" in kwargs else None
- if socket_proxy is not None:
- proxy_host, proxy_port = socket_proxy.split(":")
- socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, proxy_host,
- int(proxy_port))
- socket.socket = socks.socksocket
- if https_proxy is not None:
- tunnel_host = host
- tunnel_port = port
- host, port = https_proxy.split(":")
- port = int(port)
- super(StreamingHTTPSConnection, self).__init__(**kwargs)
- if tunnel_host is not None:
- self.set_tunnel(host=host, port=port)
-
- def _send_output(self, body, **kwargs):
- """Send the currently buffered request and clear the buffer.
-
- Appends an extra \\r\\n to the buffer.
- A message_body may be specified, to be appended to the request.
-
- This method is implemented in differently in the various python
- versions (which is extremely annoying). So we provide a unified but
- relatively dumb implementaion which only serves our needs.
- """
- self._buffer.extend(("".encode("utf-8"), "".encode("utf-8")))
- headers = "\r\n".encode("utf-8").join(self._buffer)
- del self._buffer[:]
-
- self.send(headers)
- if body is not None:
- self.send(body)
-
- # pylint: disable=too-many-branches
-
- def send(self, value):
- """Send ``value`` to the server.
-
- ``value`` can be a string-like object which supports a 'encode' method,
- a file-like object that supports a .read() method, or an iterable object
- that supports a .next() method.
-
- An encode()able ``value`` will be utf-8 encoded before sending.
- """
- # Based on python 2.6's httplib.HTTPConnection.send()
- if self.sock is None:
- if self.auto_open:
- self.connect()
- else:
- raise client.NotConnected()
-
- # send the data to the server. if we get a broken pipe, then close
- # the socket. we want to reconnect when somebody tries to send again.
- #
- # NOTE: we DO propagate the error, though, because we cannot simply
- # ignore the error... the caller will know if they can retry.
- if self.debuglevel > 0:
- print("send: ", repr(value))
- try:
- blocksize = 8192
- if hasattr(value, 'read'):
- if hasattr(value, 'seek'):
- value.seek(0)
- if self.debuglevel > 0:
- print("sendIng a read()able")
- data = value.read(blocksize)
- while data:
- self.sock.sendall(data)
- data = value.read(blocksize)
- elif hasattr(value, 'next'):
- if hasattr(value, 'reset'):
- value.reset()
- if self.debuglevel > 0:
- print("sendIng an iterable")
- for data in value:
- if hasattr(data, "encode"):
- self.sock.sendall(data.encode('utf-8'))
- else:
- self.sock.sendall(data)
- else:
- if self.debuglevel > 0:
- print("sendIng a byte-like")
- self.sock.sendall(value)
- except socket.error as err:
- if err.args[0] == 32: # Broken pipe
- self.close()
- raise
--
GitLab