diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/pixelated/adapter/model/mail.py | 4 | ||||
| -rw-r--r-- | service/requirements.txt | 1 | ||||
| -rw-r--r-- | service/test/load/locustfile.py | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py index 76df076e..a24818c0 100644 --- a/service/pixelated/adapter/model/mail.py +++ b/service/pixelated/adapter/model/mail.py @@ -19,11 +19,11 @@ import logging from email import message_from_file from email.mime.text import MIMEText from email.header import Header +from hashlib import sha256 import binascii from email.MIMEMultipart import MIMEMultipart from email.mime.nonmultipart import MIMENonMultipart -from pycryptopp.hash import sha256 import leap.mail.walk as walk from pixelated.adapter.model.status import Status from pixelated.support import date @@ -137,7 +137,7 @@ class Mail(object): return self._mime_multipart.as_string() def _get_chash(self): - return sha256.SHA256(self.raw).hexdigest() + return sha256(self.raw).hexdigest() class InputMail(Mail): diff --git a/service/requirements.txt b/service/requirements.txt index b74b7f94..48d55ac2 100644 --- a/service/requirements.txt +++ b/service/requirements.txt @@ -7,7 +7,6 @@ pyasn1==0.1.8 requests==2.9.1 srp==1.0.4 whoosh==2.5.7 -pycryptopp -e 'git+https://github.com/pixelated/leap_pycommon.git@develop#egg=leap.common' -e 'git+https://github.com/pixelated/leap_auth.git#egg=leap.auth' -e 'git+https://github.com/pixelated/soledad.git@develop#egg=leap.soledad.common&subdirectory=common/' diff --git a/service/test/load/locustfile.py b/service/test/load/locustfile.py index 0995315c..2969a218 100644 --- a/service/test/load/locustfile.py +++ b/service/test/load/locustfile.py @@ -7,6 +7,10 @@ from leap.exceptions import SRPAuthenticationError from locust import HttpLocust, TaskSet, task from pixelated.resources.login_resource import LoginResource +import requests +from requests.packages.urllib3.exceptions import InsecureRequestWarning +requests.packages.urllib3.disable_warnings(InsecureRequestWarning) + LEAP_PROVIDER = os.environ.get('LEAP_PROVIDER', 'dev.pixelated-project.org') LEAP_SERVER_HOST = os.environ.get( 'LEAP_SERVER_HOST', @@ -14,7 +18,7 @@ LEAP_SERVER_HOST = os.environ.get( LEAP_VERIFY_CERTIFICATE = os.environ.get( 'LEAP_VERIFY_CERTIFICATE', '~/.leap/ca.crt') -MAX_NUMBER_USER = os.environ.get('MAX_NUMBER_USER', 100) +MAX_NUMBER_USER = os.environ.get('MAX_NUMBER_USER', 80) INVITES_FILENAME = os.environ.get('INVITES_FILENAME', '/tmp/invite_codes.txt') INVITES_ENABLED = os.environ.get('INVITES_ENABLED', 'true') == 'true' |