summaryrefslogtreecommitdiff
path: root/service/pixelated/extensions
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-07-25 11:40:11 -0400
committerKali Kaneko <kali@leap.se>2017-07-25 11:40:29 -0400
commit91e4481c450eb7eb928debc1cb7fa59bdb63dd7b (patch)
tree8fd7e6e77b6df669c33d96b7edad6db3cbe14dfe /service/pixelated/extensions
parente4f755309d4cf5cfb6b0bcc62ed73d6070956ab5 (diff)
[pkg] packaging and path changes
- move all the pixelated python package under src/ - move the pixelated_www package under the leap namespace - allow to set globally the static folder - add hours and minutes to the timestamp in package version, to allow for several releases a day.
Diffstat (limited to 'service/pixelated/extensions')
-rw-r--r--service/pixelated/extensions/__init__.py0
-rw-r--r--service/pixelated/extensions/esmtp_sender_factory.py27
-rw-r--r--service/pixelated/extensions/protobuf_socket.py37
-rw-r--r--service/pixelated/extensions/requests_urllib3.py82
-rw-r--r--service/pixelated/extensions/sqlcipher_wal.py24
5 files changed, 0 insertions, 170 deletions
diff --git a/service/pixelated/extensions/__init__.py b/service/pixelated/extensions/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/service/pixelated/extensions/__init__.py
+++ /dev/null
diff --git a/service/pixelated/extensions/esmtp_sender_factory.py b/service/pixelated/extensions/esmtp_sender_factory.py
deleted file mode 100644
index 59aa90c8..00000000
--- a/service/pixelated/extensions/esmtp_sender_factory.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated 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.
-#
-# Pixelated 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 Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-from twisted.mail import smtp
-
-
-def no_require_transport_security(f):
- def wrapper(*args, **kwargs):
- kwargs['requireTransportSecurity'] = False
- return f(*args, **kwargs)
- return wrapper
-
-
-smtp.ESMTPSenderFactory = no_require_transport_security(smtp.ESMTPSenderFactory)
diff --git a/service/pixelated/extensions/protobuf_socket.py b/service/pixelated/extensions/protobuf_socket.py
deleted file mode 100644
index 548f5fd6..00000000
--- a/service/pixelated/extensions/protobuf_socket.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated 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.
-#
-# Pixelated 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 Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import print_function
-from sys import platform as _platform
-
-import protobuf.socketrpc.server
-
-# protobuf throws a lot of 'Socket is not connected' exceptions on OSX but they are not an issue.
-# refer too https://code.google.com/p/protobuf-socket-rpc/issues/detail?id=10 and
-# or https://leap.se/code/issues/2187
-if _platform == 'darwin':
- def try_except_decorator(func):
- def wrapper(*args, **kwargs):
- try:
- func(*args, **kwargs)
- pass
- except:
- pass
-
- return wrapper
-
- protobuf.socketrpc.server.SocketHandler.handle = try_except_decorator(
- protobuf.socketrpc.server.SocketHandler.handle)
diff --git a/service/pixelated/extensions/requests_urllib3.py b/service/pixelated/extensions/requests_urllib3.py
deleted file mode 100644
index c4ec2438..00000000
--- a/service/pixelated/extensions/requests_urllib3.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated 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.
-#
-# Pixelated 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 Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-import requests
-
-
-if requests.__version__ == '2.0.0':
- try:
- import requests.packages.urllib3.connectionpool
- from socket import error as SocketError, timeout as SocketTimeout
- from requests.packages.urllib3.packages.ssl_match_hostname import CertificateError, match_hostname
- import socket
- import ssl
-
- from requests.packages.urllib3.exceptions import (
- ClosedPoolError,
- ConnectTimeoutError,
- EmptyPoolError,
- HostChangedError,
- MaxRetryError,
- SSLError,
- ReadTimeoutError,
- ProxyError,
- )
-
- from requests.packages.urllib3.util import (
- assert_fingerprint,
- get_host,
- is_connection_dropped,
- resolve_cert_reqs,
- resolve_ssl_version,
- ssl_wrap_socket,
- Timeout,
- )
-
- def patched_connect(self):
- # Add certificate verification
- try:
- sock = socket.create_connection(address=(self.host, self.port), timeout=self.timeout)
- except SocketTimeout:
- raise ConnectTimeoutError(self, "Connection to %s timed out. (connect timeout=%s)" % (self.host, self.timeout))
-
- resolved_cert_reqs = resolve_cert_reqs(self.cert_reqs)
- resolved_ssl_version = resolve_ssl_version(self.ssl_version)
-
- if self._tunnel_host:
- self.sock = sock
- # Calls self._set_hostport(), so self.host is
- # self._tunnel_host below.
- self._tunnel()
-
- # Wrap socket using verification with the root certs in
- # trusted_root_certs
- self.sock = ssl_wrap_socket(sock, self.key_file, self.cert_file,
- cert_reqs=resolved_cert_reqs,
- ca_certs=self.ca_certs,
- server_hostname=self.host,
- ssl_version=resolved_ssl_version)
-
- if self.assert_fingerprint:
- assert_fingerprint(self.sock.getpeercert(binary_form=True),
- self.assert_fingerprint)
- elif resolved_cert_reqs != ssl.CERT_NONE and self.assert_hostname is not False:
- match_hostname(self.sock.getpeercert(),
- self.assert_hostname or self.host)
-
- requests.packages.urllib3.connectionpool.VerifiedHTTPSConnection.connect = patched_connect
- except ImportError:
- pass # The patch is specific for the debian package. Ignore it if it can't be found
diff --git a/service/pixelated/extensions/sqlcipher_wal.py b/service/pixelated/extensions/sqlcipher_wal.py
deleted file mode 100644
index 776087bf..00000000
--- a/service/pixelated/extensions/sqlcipher_wal.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated 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.
-#
-# Pixelated 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 Pixelated. If not, see <http://www.gnu.org/licenses/>.
-
-from sys import platform as _platform
-
-import leap.soledad.client.sqlcipher
-
-# WAL is breaking for the debian sqlcipher package so we need to disable it
-# refer to https://leap.se/code/issues/5562
-if _platform == 'linux2':
- leap.soledad.client.sqlcipher.SQLCipherDatabase._pragma_write_ahead_logging = lambda x, y: None