base/DB.py base/DBObjectGAE.py base/DBObjectStandalone.py models/modelsGAE.py models/modelsStandalone.py models/modelsbase.py sql/create.sql start-wsgi.py @@ -1,21 +1,9 @@ """ The DBObject base class -Database objects that could be DB-backed, or GAE backed. For now, just GAE. - -This needs more work to be much more generic. - ben@adida.net """ -import utils - -from django.utils import simplejson -import datetime - -from google.appengine.ext import db - - def from_utf8(string): if type(string) == str: return string.decode('utf-8') @@ -28,151 +16,9 @@ def to_utf8(string): else: return string -class DBObject(db.Model): - - # GAE get_id - def get_id(self): - return self.key() - - @classmethod - def selectById(cls, key_value): - return cls.get(key_value) - - @classmethod - def selectByKey(cls, key_name, key_value): - obj = cls() - if obj.select(keys={key_name:key_value}): - return obj - else: - return None - - @classmethod - def selectByKeys(cls, keys): - # GAE - all_values= cls.selectAllByKeys(keys) - if len(all_values) == 0: - return None - else: - return all_values[0] - - @classmethod - def selectAll(cls, order_by = None, offset = None, limit = None): - # GAE query - query = cls.all() - - # order - if order_by: - query.order(order_by) - - return query.fetch(limit or 1000, offset or 0) - - @classmethod - def selectAllByKey(cls, key_name, key_value, order_by = None, offset = None, limit = None): - keys = dict() - keys[key_name] = key_value - return cls.selectAllByKeys(keys, order_by, offset, limit) - - @classmethod - def selectAllByKeys(cls, keys, order_by = None, offset = None, limit = None): - # unicode - for k,v in keys.items(): - keys[k] = to_utf8(v) - - # GAE query - query = cls.all() - - # order - if order_by: - query.order(order_by) - - # conditions - for k,v in keys.items(): - query.filter('%s' % k, v) - - return query.fetch(limit or 1000, offset or 0) - - def _load_from_row(self, row, extra_fields=[]): - - prepared_row = self._prepare_object_values(row) - - for field in self.FIELDS: - # unicode - self.__dict__[field] = from_utf8(prepared_row[field]) - - for field in extra_fields: - # unicode - self.__dict__[field] = from_utf8(prepared_row[field]) - - def insert(self): - """ - Insert a new object, but only if it hasn't been inserted yet - """ - self.save() - - def update(self): - """ - Update an object - """ - # GAE - self.save() - - # DELETE inherited from GAE - - @classmethod - def multirow_to_array(cls, multirow, extra_fields=[]): - objects = [] - - if multirow == None: - return objects - - for row in multirow: - one_object = cls() - one_object._load_from_row(row, extra_fields) - objects.append(one_object) - - return objects - - def toJSONDict(self, extra_fields = []): - # a helper recursive procedure to navigate down the items - # even if they don't have a toJSONDict() method - def toJSONRecurse(item): - if type(item) == int or type(item) == bool or hasattr(item, 'encode') or not item: - return item - - if hasattr(item,'toJSONDict'): - return item.toJSONDict() - - if type(item) == dict: - new_dict = dict() - for k in item.keys(): - new_dict[k] = toJSONRecurse(item[k]) - return new_dict - - if hasattr(item,'__iter__'): - return [toJSONRecurse(el) for el in item] - - return str(item) - - # limit the fields to just JSON_FIELDS if it exists - json_dict = dict() - if hasattr(self.__class__,'JSON_FIELDS'): - keys = self.__class__.JSON_FIELDS + extra_fields - else: - keys = extra_fields - - # go through the keys and recurse down each one - for f in keys: - ## FIXME: major hack here while I figure out how to dynamically get the right field - if hasattr(self, f): - json_dict[f] = toJSONRecurse(getattr(self, f)) - else: - if self.__dict__.has_key(f): - json_dict[f] = toJSONRecurse(self.__dict__[f]) - else: - continue - - - return json_dict - - def toJSON(self): - return simplejson.dumps(self.toJSONDict()) +#from DBObjectGAE import * +try: + from google.appengine.ext import db + from DBObjectGAE import * +except: + from DBObjectStandalone import * \ No newline at end of file base/DBObject.py @@ -4,7 +4,8 @@ # root = '.' -hostname = 'www.heliosvoting.org' +#hostname = 'www.heliosvoting.org' +hostname = 'localhost:8082' webroot = 'http://' + hostname # @@ -18,3 +19,9 @@ PYTHON_DEBUG = True ## SEND_MAIL = True +# +# database +# +DB_HOST = "localhost" +DB_NAME = "helios" +DB_PORT = 5432 base/config.py @@ -7,7 +7,11 @@ Ben Adida (ben@adida.net) # needs a rewrite for GAE from base import config -from google.appengine.api import mail + +try: + from google.appengine.api import mail +except: + pass def no_send(recipient_names, recipient_emails, sender_name, sender_email, subject, body, reply_to=None): print "not sending email as per config (GAE update needed to see email)" base/mail.py @@ -11,7 +11,12 @@ Ben Adida - ben@adida.net import urllib, re, sys, datetime, urlparse, string import cherrypy import threading -from django.utils import simplejson + +try: + from django.utils import simplejson +except: + import simplejson + import random import htmlsanitizer, config import sha, hmac, base64 base/utils.py @@ -5,10 +5,14 @@ Ben Adida (ben@adida.net) """ from base import * -from base import REST, session, Controller, template, utils +from base import REST, session, Controller, template import cherrypy, time, logging -from django.utils import simplejson + +try: + from django.utils import simplejson +except: + import simplejson class HeliosController(Controller): """ controllers/basic.py @@ -7,12 +7,19 @@ Ben Adida (ben@adida.net) from base import * from base import REST, session, Controller, template, mail from crypto import algs -from models import models as do +import models as do import cherrypy, time, logging -from django.utils import simplejson -from google.appengine.api import users +try: + from django.utils import simplejson +except: + import simplejson + +try: + from google.appengine.api import users +except: + pass import basic controllers/election.py @@ -7,12 +7,19 @@ Ben Adida (ben@adida.net) from base import * from base import REST, session, Controller, template from crypto import algs -from models import models as do +import models as do import cherrypy, time, logging -from django.utils import simplejson -from google.appengine.api import users +try: + from django.utils import simplejson +except: + import simplejson + +try: + from google.appengine.api import users +except: + pass # the basic controllers import basic controllers/user.py @@ -19,7 +19,6 @@ import wsgiref.handlers -import models import cherrypy import sitemap heliosvoting.py @@ -10,7 +10,7 @@ indexes: # automatically uploaded to the admin console when you next deploy # your application using appcfg.py. -# Used 6 times in query history. +# Used 11 times in query history. - kind: ElectionExponent properties: - name: election @@ -30,7 +30,7 @@ indexes: - name: cast_id direction: desc -# Unused in query history -- copied from input. +# Used 2 times in query history. - kind: Voter properties: - name: election index.yaml @@ -0,0 +1,12 @@ +""" +The Models for Helios. + +First the generic stuff, then the extension +""" + +#from modelsGAE import * +try: + from google.appengine.ext import db + from modelsGAE import * +except: + from modelsStandalone import * \ No newline at end of file models/__init__.py @@ -24,7 +24,7 @@ function load_election_and_ballots(election_id) { VOTER_LIST = []; // get the election data - Helios.get_election({'election_id' : election_id}, function(election) { + Helios.get_election({'election_id' : election_id}, function(election_json) { var election = HELIOS.Election.fromJSONObject(election_json); ELECTION = election; @@ -158,8 +158,7 @@ function do_tally() { <div id="sk_section"> <form onsubmit="return false;"> Your Secret Key:<br /> - <textarea id="sk_textarea" cols="60" rows="5"> - </textarea> + <textarea id="sk_textarea" cols="60" rows="5"></textarea> </form> </div> templates/election/drive_tally.tmpl @@ -59,7 +59,7 @@ BOOTH.setup_election = function(election) { }; BOOTH.show = function(el) { - \$('#page div').hide(); + \$('.panel').hide(); el.show(); return el; }; @@ -140,7 +140,8 @@ BOOTH.seal_ballot = function() { BOOTH.encrypted_ballot = new HELIOS.EncryptedVote(BOOTH.election, BOOTH.ballot.answers); - BOOTH.show(\$('#seal_div')).processTemplate({'encrypted_vote_hash' : BOOTH.encrypted_ballot.get_hash()}); + \$('#seal_div').processTemplate({'encrypted_vote_hash' : BOOTH.encrypted_ballot.get_hash()}); + BOOTH.show(\$('#seal_div')); }; BOOTH.audit_ballot = function() { @@ -210,30 +211,30 @@ BOOTH.show_receipt = function() { </script> <div id="page"> - <div class="entry" id="election_div" class="panel"> + <div id="election_div" class="panel"> Loading Election Booth... </div> - <div class="entry" id="question_div" class="panel"> + <div id="question_div" class="panel"> </div> - <div class="entry" id="confirm_div" class="panel"> + <div id="confirm_div" class="panel"> </div> - <div class="entry" id="processing_div" class="panel"> + <div id="processing_div" class="panel"> <h3 align="center">Processing....</h3> </div> - <div class="entry" id="seal_div" class="panel"> + <div id="seal_div" class="panel"> </div> - <div class="entry" id="audit_div" class="panel"> + <div id="audit_div" class="panel"> </div> - <div class="entry" id="login_div" class="panel"> + <div id="login_div" class="panel"> </div> - <div class="entry" id="done_div" class="panel"> + <div id="done_div" class="panel"> </div> </div> #include "templates/booth-footer.tmpl" templates/election/vote.tmpl @@ -17,6 +17,11 @@ <script language="javascript" src="/static/elgamal.js"></script> <script language="javascript" src="/static/sha1.js"></script> <script language="javascript" src="/static/helios.js"></script> +#from base import utils +<script language="javascript"> +var API_HOST = '$utils.get_host()' +</script> + <script language="javascript" src="/static/cross-site-api.js"></script> </head> <body><div id="content"><div id="header"> templates/header.tmpl models/models.py 3c1589d3a88f4afc70c6408163a87c3bc20e8f50 Ben Adida ben@adida.net http://github.com/benadida/helios/commit/9e8d2219aa423559f014704557938fd06ed632ac 9e8d2219aa423559f014704557938fd06ed632ac 2008-08-18T14:40:38-07:00 2008-08-18T14:40:38-07:00 began the refactoring of code to enable running on PostgreSQL backend 1ffe8e2135df1bf5528bf515aca27b8ab91190d0 Ben Adida ben@adida.net