Permalink
Browse files

Added everware-server to scripts

  • Loading branch information...
1 parent 55533e8 commit c4c1264a44d9c796247008e55a73e7ea023f09b9 @astiunov astiunov committed Mar 13, 2016
Showing with 16 additions and 7 deletions.
  1. +0 −5 everware/authenticator.py
  2. +1 −1 everware/user_spawn_handler.py
  3. +1 −1 everware/user_wait_handler.py
  4. +14 −0 scripts/everware-server
@@ -66,8 +66,6 @@ class WelcomeHandler(BaseHandler):
"""Render the login page."""
def _render(self, login_error=None, username=None):
- if username:
- username = username.lower()
return self.render_template('login.html',
next=url_escape(self.get_argument('next', default='')),
repourl=url_escape(self.get_argument('repourl', default='')),
@@ -146,7 +144,6 @@ def get(self):
username, token = yield self.authenticator.authenticate(self)
if username:
- username = username.lower()
user = self.user_from_username(username)
user.token = token
self.set_login_cookie(user)
@@ -309,8 +306,6 @@ def authenticate(self, handler):
whitelisted = yield self.check_whitelist(username, headers)
if not whitelisted:
username = None
- if username:
- username = username.lower()
return username
def check_whitelist(self, username, headers):
@@ -16,7 +16,7 @@ def _spawn(self, user, form_options):
def get(self):
user = self.get_current_user()
if user.running:
- name = user.name.lower()
+ name = user.name
self.log.debug("User is running: %s", name)
self.redirect('/user/%s' % name)
return
@@ -11,7 +11,7 @@ class UserSpawnHandler(BaseHandler):
@gen.coroutine
def get(self, name, user_path):
current_user = self.get_current_user()
- if current_user and current_user.name == name.lower():
+ if current_user and current_user.name == name:
# logged in, work with spawner
if current_user.stop_pending:
self.redirect(url_path_join(self.hub.server.base_url, 'home'))
View
@@ -0,0 +1,14 @@
+#!/bin/bash
+source ./env.sh
+PYTHON_MAJOR=`python -c 'import sys; print(sys.version_info[0])'`
+if [ ${PYTHON_MAJOR} -eq 3 ] ; then
+ PYTHON=python
+ PIP=pip
+elif [ -n `which python3` ] ; then
+ PYTHON=python3
+ PIP=pip3
+else
+ echo "Unable to find python"
+ exit 1
+fi
+${PYTHON} ./run.py "$@"

0 comments on commit c4c1264

Please sign in to comment.