Merge branch 'master' of https://github.com/pixelated/pixelated-user-agent

# By Felix Hammerl (13) and Thais Siqueira (3)
# Via Christoph (1) and Thais Siqueira (1)
* 'master' of https://github.com/pixelated/pixelated-user-agent:
  Sets SSL certifications to false.
  Fixes pep8 errors and update requests to 2.9.1.
  Update locust test to run after xsrf token implementation.
  Issue #620: Adapt unit tests to CSS changes
  Issue #620: Refactor palceholder
  Issue #620: Remove former main css file
  Issue #620: Spike growl CSS modularization
  Issue #617: Highlight search terms by altering mail content
  Issue #617: Allow only >=3 alphanumeric characters in search field
  Issue #617: Restrict searching to alphanumeric characters
  Issue #617: Remove highlighting for sandboxed content
  Issue #617: Add sandbox to build scripts
  Issue #617: Add sandbox to user-agent
  Issue #617: Create sandbox resouces
  Issue #617: Add iframe-resizer
  Issue #617: Serve content from Sandbox resource

1 files changed, 61 insertions, 17 deletions

diff --git a/service/test/load/locustfile.py b/service/test/load/locustfile.py
index 68e39433..0c2ed518 100644
--- a/service/test/load/locustfile.py
+++ b/service/test/load/locustfile.py
@@ -1,6 +1,5 @@
 import os
 import json
-import time
 from random import randint
 
 from leap.auth import SRPAuth
@@ -9,9 +8,13 @@ from locust import HttpLocust, TaskSet, task
 from pixelated.resources.login_resource import LoginResource
 
 LEAP_PROVIDER = os.environ.get('LEAP_PROVIDER', 'dev.pixelated-project.org')
-LEAP_SERVER_HOST = os.environ.get('LEAP_SERVER_HOST', 'https://api.%s:4430' % LEAP_PROVIDER)
-LEAP_VERIFY_CERTIFICATE = os.environ.get('LEAP_VERIFY_CERTIFICATE', '~/.leap/ca.crt')
-MAX_NUMBER_USER = os.environ.get('MAX_NUMBER_USER', 10000)
+LEAP_SERVER_HOST = os.environ.get(
+    'LEAP_SERVER_HOST',
+    'https://api.%s:4430' % LEAP_PROVIDER)
+LEAP_VERIFY_CERTIFICATE = os.environ.get(
+    'LEAP_VERIFY_CERTIFICATE',
+    '~/.leap/ca.crt')
+MAX_NUMBER_USER = os.environ.get('MAX_NUMBER_USER', 100)
 INVITES_FILENAME = os.environ.get('INVITES_FILENAME', '/tmp/invite_codes.txt')
 INVITES_ENABLED = os.environ.get('INVITES_ENABLED', 'true') == 'true'
 
@@ -23,53 +26,94 @@ def load_invite_from_number(number):
 
 
 class UserBehavior(TaskSet):
+    def __init__(self, *args, **kwargs):
+        super(UserBehavior, self).__init__(*args, **kwargs)
+        self.cookies = {}
+
     def on_start(self):
-        """ on_start is called when a Locust start before any task is scheduled """
         self.login()
 
     def _get_or_create_user(self, number):
-        srp_auth = SRPAuth(LEAP_SERVER_HOST, os.path.expanduser(LEAP_VERIFY_CERTIFICATE))
+        srp_auth = SRPAuth(
+            LEAP_SERVER_HOST,
+            os.path.expanduser(LEAP_VERIFY_CERTIFICATE))
         username, password = ('loadtest%d' % number), ('password_%d' % number)
         try:
             srp_auth.authenticate(username, password)
         except SRPAuthenticationError:
-            invite_code = load_invite_from_number(number) if INVITES_ENABLED else None
+            invite_code = None
+            if INVITES_ENABLED:
+                invite_code = load_invite_from_number(number)
+
             srp_auth.register(username, password, invite_code)
         return username, password
 
     def login(self):
         number = randint(1, int(MAX_NUMBER_USER))
         username, password = self._get_or_create_user(number)
-        self.client.post("/%s" % LoginResource.BASE_URL, {"username": username, "password": password})
+        response = self.client.post(
+            "/%s" % LoginResource.BASE_URL,
+            {"username": username, "password": password},
+            verify=False)
+        self.cookies.update(response.cookies.get_dict())
+        resp = self.client.get("/", verify=False)
+        self.cookies.update(resp.cookies.get_dict())
         self.username = username
-        time.sleep(5)
 
     @task(1)
     def index(self):
-        self.client.get("/")
+        self.client.get("/", verify=False)
 
     @task(2)
     def mail_box(self):
-        self.client.get("/mails?q=tag:'inbox'&p=1&w=25")
+        self.client.get("/mails?q=tag:'inbox'&p=1&w=25", verify=False)
 
     @task(3)
     def send_mail(self):
-        payload = {"tags": ["drafts"], "body": "some text lorem ipsum", "attachments": [], "ident": "",
-                   "header": {"to": ["%s@%s" % (self.username, LEAP_PROVIDER)], "cc": [], "bcc": [], "subject": "load testing"}}
-        with self.client.post('/mails', json=payload, catch_response=True) as email_response:
+        payload = {
+            "tags": ["drafts"],
+            "body": "some text lorem ipsum",
+            "attachments": [],
+            "ident": "",
+            "header": {
+                "to": ["%s@%s" % (self.username, LEAP_PROVIDER)],
+                "cc": [],
+                "bcc": [],
+                "subject": "load testing"}}
+
+        self.cookies.update(
+            self.client.get("/", verify=False).cookies.get_dict())
+        print(self.cookies)
+        with self.client.post(
+            '/mails',
+            json=payload,
+            catch_response=True,
+            cookies=self.cookies,
+            headers={
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-XSRF-TOKEN': self.cookies['XSRF-TOKEN']}) as email_response:
             if email_response.status_code == 201:
                 email_id = json.loads(email_response.content)['ident']
                 print email_id
                 self.delete_mail(email_id)
             else:
-                email_response.failure('Error: email not Sent, status code: %s' % email_response.status_code)
+                email_response.failure(
+                    'Error: email not Sent, status code: %s' % (
+                        email_response.status_code))
 
     def delete_mail(self, ident):
         payload = {"idents": [ident]}
-        self.client.post('/mails/delete', json=payload)
+        self.client.post(
+            '/mails/delete',
+            json=payload,
+            cookies=self.cookies,
+            verify=False,
+            headers={
+                'X-Requested-With': 'XMLHttpRequest',
+                'X-XSRF-TOKEN': self.cookies['XSRF-TOKEN']})
 
 
 class WebsiteUser(HttpLocust):
     task_set = UserBehavior
-    min_wait = 3000
+    min_wait = 5000
     max_wait = 15000