Merge pull request #125 from indera/develop

Improve logging: show the shib email
ctsit · Feb 8, 2016 · 70f2dc6 · 70f2dc6
2 parents 622470a + f702215
commit 70f2dc6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/app/deploy/fabfile.py b/app/deploy/fabfile.py
@@ -99,7 +99,6 @@ def _fix_perms(folder):
 
 def _init_virtualenv():
     """Create initial virtualenv"""
-
     print('\n\nCreating virtualenv...')
     sudo('virtualenv -p %(python)s --no-site-packages %(env_path)s' % env,
          user=env.server_user)
@@ -114,8 +113,8 @@ def _install_requirements():
 
     with prefix('source %(env_path)s/bin/activate' % env):
         sudo('pip install -r '
-             ' %(project_repo_path)s/app/requirements/deploy.txt'
-             % env, user=env.server_user)
+             ' %(project_repo_path)s/app/requirements/deploy.txt' % env,
+             user=env.server_user)
 
 
 def _update_requirements():
@@ -125,7 +124,7 @@ def _update_requirements():
     with prefix('source %(env_path)s/bin/activate' % env):
         sudo('pip install -U  -r '
              ' %(project_repo_path)s/app/requirements/deploy.txt' % env,
-             % env, user=env.server_user)
+             user=env.server_user)
 
 
 def _is_prod():

diff --git a/app/deploy/sample.vagrant.settings.conf b/app/deploy/sample.vagrant.settings.conf
@@ -33,4 +33,4 @@ DB_NAME = 'ctsi_dropper_s'
 SERVER_SSL_KEY_FILE = 'ssl/server.key'
 SERVER_SSL_CRT_FILE = 'ssl/server.crt'
 
-APP_VERSION = '0.0.1'
+APP_VERSION = '0.0.4b'
diff --git a/app/redidropper/routes/pages.py b/app/redidropper/routes/pages.py
@@ -236,19 +236,22 @@ def shibb_return():
     if not user:
         utils.flash_error("No such user: {}".format(email))
         LogEntity.login_error(uuid,
-                              "Shibboleth user is not registered for this app")
+                              "Shibboleth user {} is not registered for this "
+                              "app".format(email))
 
         return redirect(url_for('index'))
 
     if not user.is_active():
         utils.flash_error("Inactive user: {}".format(email))
-        LogEntity.login_error(uuid, 'Inactive user tried to login')
+        LogEntity.login_error(uuid, "Inactive user {} tried to login"
+                              .format(email))
         return redirect(url_for('index'))
 
     if user.is_expired():
         utils.flash_error("User account for {} expired on {}"
                           .format(email, user.access_expires_at))
-        LogEntity.login_error(uuid, 'Expired user tried to login')
+        LogEntity.login_error(uuid, "Expired user {} tried to login"
+                              .format(email))
         return redirect(url_for('index'))
 
     # Log it