update to upstream/master

.gitignore

@@ -3,7 +3,8 @@ deploy-latest.sh
 .DS_Store
 *~
 media/*
-venv
+venv*
 celerybeat-*
 env.sh
-.cache
+.cache
+.idea/

.travis.yml

@@ -1,14 +1,46 @@
-sudo: false
 language: python
-python:
-  - "2.7"
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+os: linux
+
+jobs:
+  include:
+  - python: "3.7"
+    dist: xenial
+    addons:
+      postgresql: "9.5"
+  - python: "3.7"
+    dist: xenial
+    addons:
+      postgresql: "9.6"
+  - python: "3.7"
+    dist: xenial
+    addons:
+      postgresql: "10"
+  - python: "3.8"
+    dist: bionic
+    addons:
+      postgresql: "9.5"
+  - python: "3.8"
+    dist: bionic
+    addons:
+      postgresql: "9.6"
+  - python: "3.8"
+    dist: bionic
+    addons:
+      postgresql: "10"
+  - python: "3.8"
+    dist: bionic
+    addons:
+      postgresql: "11"
+
+before_install:
+  - export BOTO_CONFIG=/dev/null
+
 install:
-  - pip install setuptools==24.3.1
-  - pip install -r requirements.txt
-# command to run tests, e.g. python setup.py test
-script: "python manage.py test"
-addons:
-  postgresql: "9.3"
+  - pip3 install --upgrade pip
+  - pip3 install -r requirements.txt
+  - pip3 freeze
+
 before_script:
   - psql -c 'create database helios;' -U postgres
+
+script: "python3 -Wall manage.py test -v 2"

CONTRIBUTORS.txt

@@ -7,3 +7,6 @@ Significant contributors:
 - Olivier de Marneffe
 - Emily Stark, Mike Hamburg, Tom Wu, and Dan Boneh for SJCL and integration of javascript crypto.
 - Nicholas Chang-Fong and Aleksander Essex for security reports and fixes.
+- Shirley Chaves
+- Marco Ciotola
+- Lucas Araujo

INSTALL.md

@@ -1,4 +1,8 @@
-* install PostgreSQL 8.3+
+* install PostgreSQL 9.5+
+
+* install Rabbit MQ
+  This is needed for celery to work, which does background processing such as
+  the processing of uploaded list-of-voter CSV files.  
 
 * make sure you have virtualenv installed:
 http://www.virtualenv.org/en/latest/
@@ -7,10 +11,22 @@ http://www.virtualenv.org/en/latest/
 
 * cd into the helios-server directory
 
-* create a virtualenv:
+* install Python3.6 including dev, pip, and venv
+
+```
+sudo apt install python3.6 python3.6-venv python3.6-pip python3.6-venv
+```
+
+* create a virtualenv
+
+```
+python3.6 -m venv $(pwd)/venv
+```
+
+* you'll also need Postgres dev libraries. For example on Ubuntu:
 
 ```
-virtualenv venv
+sudo apt install libpq-dev 
 ```
 
 * activate virtual environment
@@ -45,6 +61,6 @@ python manage.py runserver
 
 ** set up oauth2 credentials as a web application, with your origin, e.g. https://myhelios.example.com, and your auth callback, which, based on our example, is https://myhelios.example.com/auth/after/
 
-** still in the developer console, enable the Google+ API.
+** still in the developer console, enable the Google+ API and Google People API.
 
-** set the GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET configuration variables accordingly.
+** set the GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET configuration variables accordingly.

Procfile

@@ -1,2 +1,2 @@
 web: gunicorn wsgi:application -b 0.0.0.0:$PORT -w 8
-worker: python manage.py celeryd -E -B --beat --concurrency=1
+worker: celery --app helios worker --events --beat --concurrency 1

README.md

@@ -2,6 +2,6 @@
 
 Helios is an end-to-end verifiable voting system.
 
-![Travis Build Status](https://travis-ci.org/benadida/helios-server.svg?branch=master)
+[![Travis Build Status](https://travis-ci.org/benadida/helios-server.svg?branch=master)](https://travis-ci.org/benadida/helios-server)
 
 [![Stories in Ready](https://badge.waffle.io/benadida/helios-server.png?label=ready&title=Ready)](https://waffle.io/benadida/helios-server)

extract-passwords-for-email.py

@@ -5,12 +5,16 @@
 # python extract-passwords-for-email.py <election_uuid> <email_address>
 #
 
-from django.core.management import setup_environ
-import settings, sys, csv
+import sys
 
-setup_environ(settings)
+import csv
+import django
+import os
 
-from helios.models import *
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+django.setup()
+
+from helios.models import Election
 
 election_uuid = sys.argv[1]
 email = sys.argv[2]

helios/__init__.py

@@ -1,7 +1,9 @@
-
 from django.conf import settings
-from django.core.urlresolvers import reverse
-from helios.views import election_shortcut
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery_app import app as celery_app
+
+__all__ = ('celery_app', 'TEMPLATE_BASE', 'ADMIN_ONLY', 'VOTERS_UPLOAD', 'VOTERS_EMAIL',)
 
 TEMPLATE_BASE = settings.HELIOS_TEMPLATE_BASE or "helios/templates/base.html"
 

helios/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+class HeliosConfig(AppConfig):
+    name = 'helios'
+    verbose_name = "Helios"

helios/celery_app.py

@@ -0,0 +1,21 @@
+import os
+
+# set the default Django settings module for the 'celery' program.
+from celery import Celery
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
+
+app = Celery()
+
+# Using a string here means the worker doesn't have to serialize
+# the configuration object to child processes.
+# - namespace='CELERY' means all celery-related configuration keys
+#   should have a `CELERY_` prefix.
+app.config_from_object('django.conf:settings', namespace='CELERY')
+
+# Load task modules from all registered Django app configs.
+app.autodiscover_tasks()
+
+@app.task(bind=True)
+def debug_task(self):
+    print('Request: {0!r}'.format(self.request))