diff --git a/submit/__init__.py b/submit/__init__.py index bf30fb3..3ed9c5a 100644 --- a/submit/__init__.py +++ b/submit/__init__.py @@ -8,7 +8,7 @@ from .models import configure_sql, create_schema, populate_database from .security import get_user, group_finder -__version__ = '1.2.0' +__version__ = '1.0.3' class Root(object): @@ -79,7 +79,7 @@ def main(global_config, **settings): engine = engine_from_config(settings, 'sqlalchemy.') configure_sql(engine) - secure_cookies = settings.get('secure_cookies') != 'false' + secure_cookies = True if 'pyramid_debugtoolbar' in settings['pyramid.includes']: create_schema(global_config['__file__']) populate_database() diff --git a/submit/helpers.py b/submit/helpers.py index 6ceee12..5683a85 100644 --- a/submit/helpers.py +++ b/submit/helpers.py @@ -71,9 +71,8 @@ class UmailAddress(EmailAddress): """A validator to verify that a umail address is correct.""" - def run(self, value, errors, request, *args): - retval = super(UmailAddress, self).run(value.lower(), errors, request, - *args) + def run(self, value, errors, *args): + retval = super(UmailAddress, self).run(value.lower(), errors, *args) if errors: return retval if not retval.endswith('@umail.ucsb.edu'): @@ -81,7 +80,7 @@ def run(self, value, errors, request, *args): return retval # Fetch name try: - name = fetch_name_by_umail(retval, request) + name = fetch_name_by_umail(retval) except Exception as exc: self.add_error(errors, exc.message) return retval @@ -274,7 +273,7 @@ def fetch_request_ids(item_ids, cls, attr_name, verification_list=None): return items -def fetch_name_by_umail(umail, request): +def fetch_name_by_umail(umail): def extract(item): if len(data[item]) == 1: return data[item][0] @@ -282,13 +281,8 @@ def extract(item): uid = umail.split('@')[0] - # Return the portion before @umail.ucsb.edu if ldap_uri is not provided - ldap_uri = request.registry.settings.get('ldap_uri') - if not ldap_uri: - return uid - # connect to ldap - ldap_conn = ldap.initialize(ldap_uri) + ldap_conn = ldap.initialize('ldaps://directory.ucsb.edu') ldap_conn.protocol_version = ldap.VERSION3 results = ldap_conn.search_s( 'o=ucsb', ldap.SCOPE_ONELEVEL, filterstr='uid={}'.format(uid), diff --git a/submit/models.py b/submit/models.py index 4a4d5da..ddcc47d 100644 --- a/submit/models.py +++ b/submit/models.py @@ -407,7 +407,7 @@ class Project(BasicBase, Base): makefile = relationship(File, backref='makefile_for_projects') makefile_id = Column(Integer, ForeignKey('file.id'), nullable=True) name = Column(Unicode, nullable=False) - status = Column(Enum('locked', 'notready', 'ready', name='proj_status'), + status = Column(Enum('locked', 'notready', 'ready', name='status'), nullable=False, server_default='notready') submissions = relationship('Submission', backref='project', cascade='all, delete-orphan') diff --git a/submit/views.py b/submit/views.py index 1e6ab89..d3a6575 100644 --- a/submit/views.py +++ b/submit/views.py @@ -1071,6 +1071,10 @@ def submission_view(request, submission, as_user): else: prev_group = next_group = None + + if not submission_admin and submission.project.name[0:4]=="EXAM": + files = {} + return {'diff_table': diff_table, 'extra_files': extra_files, 'files': files,