diff options
| -rw-r--r-- | service/pixelated/config/sessions.py | 3 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 4 | ||||
| -rw-r--r-- | service/test/unit/config/test_site.py | 5 | ||||
| -rw-r--r-- | sshKeyDir/id_rsa | 15 | ||||
| -rwxr-xr-x | sshKeyDir/id_rsa.pub | 1 |
5 files changed, 5 insertions, 23 deletions
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py index ec5e1c0e..b3021982 100644 --- a/service/pixelated/config/sessions.py +++ b/service/pixelated/config/sessions.py @@ -82,8 +82,7 @@ class LeapSessionFactory(object): server_url=server_url, cert_file=api_cert, shared_db=None, - auth_token=user_token, - defer_encryption=False) + auth_token=user_token) defer.returnValue(soledad) except (WrongMacError, UnknownMacMethodError), e: raise SoledadWrongPassphraseException(e) diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index d52c85c0..0ff1df31 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -437,9 +437,7 @@ def initialize_soledad(tempdir, uuid): secret_path, local_db_path, server_url, - cert_file, - defer_encryption=False, - syncable=False) + cert_file) yield SoledadMailAdaptor().initialize_store(_soledad) diff --git a/service/test/unit/config/test_site.py b/service/test/unit/config/test_site.py index 6911b4a5..63ac9f1a 100644 --- a/service/test/unit/config/test_site.py +++ b/service/test/unit/config/test_site.py @@ -1,10 +1,11 @@ from twisted.trial import unittest -from mockito import mock +from mock import MagicMock from pixelated.config.site import PixelatedSite from twisted.protocols.basic import LineReceiver class TestPixelatedSite(unittest.TestCase): + def test_add_security_headers(self): request = self.create_request() request.process() @@ -36,7 +37,7 @@ class TestPixelatedSite(unittest.TestCase): def create_request(self): channel = LineReceiver() - channel.site = PixelatedSite(mock()) + channel.site = PixelatedSite(MagicMock()) request = PixelatedSite.requestFactory(channel=channel, queued=True) request.method = "GET" request.uri = "localhost" diff --git a/sshKeyDir/id_rsa b/sshKeyDir/id_rsa deleted file mode 100644 index 3df44486..00000000 --- a/sshKeyDir/id_rsa +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQCislwCbPl41Dq02X8BtA97+5GVp2J40l8LOzTbsTc20ikt/2hy -EFgbbnhnd0IkPMO2ggnr9jB0PX39QliXIrhDGSkIcLf3VHowHZwfsVEKO2jjlQgs -uliymfYc3MI8yN/2W1vDYIqJ56W52ZWSs+csPnioMPAwG+d14qDsjJ/FCwIDAQAB -AoGBAI2cNy+5UG8WMr8E7GI8KpocvnwHBFPrr+RjtT9fgZKK3GL4Ax39EeNWhSBx -kjVeWm85wo8KauRSPZ45qEhsZPpG0dBihgvv/L1HFIDdyscS61Jmb3spngb3+PpS -EYGIyMlEfnzXGRsdH3QFNdGwTFhe7uHx2qTuXdM8sTJ2jMMBAkEAyJt/S8/229w5 -znLzeRgt4yacKaiZQuWdX66Jdtogap57ZfXpLAV+pmck980748XDQdo54uLayAgv -VPNZuPbliwJBAM+fCZI8tTJI9ziXqwty0Tv2FmLnwuzS34/hhVr76t2w7ToN0T2E -oCo5SQerbvGQlZzWlC3RWGSM0n7ZJlkJjoECQFAm2OiokgBscGhNQ3xprcPpZFG8 -vGefKI7XRLNJGdSft7wYUe61z1GbOokL5lbuaEKCd8hwTWvI4Wh2xq2BcFsCQHQl -Lb+HAn5M3y/jeKYA5xe6BK/zotHE7ZeZu3Y4cxzteuf9Ds5xQQAd58LInlm4XlnM -mDxBXkdxl9eqNo+cjwECQCQMqAgrWUeaviH8uHukWCud8gxpLt1G/gduoqwLixoo -Od0G87s6V4fbUXSu34oix1cCQore95S+fliPOsrdue8= ------END RSA PRIVATE KEY-----
\ No newline at end of file diff --git a/sshKeyDir/id_rsa.pub b/sshKeyDir/id_rsa.pub deleted file mode 100755 index e02f9bc1..00000000 --- a/sshKeyDir/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCislwCbPl41Dq02X8BtA97+5GVp2J40l8LOzTbsTc20ikt/2hyEFgbbnhnd0IkPMO2ggnr9jB0PX39QliXIrhDGSkIcLf3VHowHZwfsVEKO2jjlQgsuliymfYc3MI8yN/2W1vDYIqJ56W52ZWSs+csPnioMPAwG+d14qDsjJ/FCw== rdevries@eurdevries.local
\ No newline at end of file |