Skip to content

Commit

Permalink
Fix #534
Browse files Browse the repository at this point in the history
  • Loading branch information
OzzieIsaacs committed Jul 3, 2018
1 parent a06748e commit c66bb54
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 6 additions & 2 deletions cps/ub.py
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,10 @@ def migrate_Database():
conn.execute("ALTER TABLE Settings ADD column `config_certfile` String DEFAULT ''")
conn.execute("ALTER TABLE Settings ADD column `config_keyfile` String DEFAULT ''")
session.commit()
# Remove login capability of user Guest
conn = engine.connect()
conn.execute("UPDATE user SET password='' where nickname = 'Guest' and password !=''")
session.commit()


def clean_database():
Expand Down Expand Up @@ -691,10 +695,10 @@ def get_mail_settings():
# Generate user Guest (translated text), as anoymous user, no rights
def create_anonymous_user():
user = User()
user.nickname = _("Guest")
user.nickname = "Guest"
user.email = 'no@email'
user.role = ROLE_ANONYMOUS
user.password = generate_password_hash('1')
user.password = ''

session.add(user)
try:
Expand Down
4 changes: 1 addition & 3 deletions cps/web.py
Original file line number Diff line number Diff line change
Expand Up @@ -2049,10 +2049,8 @@ def login():
if request.method == "POST":
form = request.form.to_dict()
user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == form['username'].strip().lower()).first()

if user and check_password_hash(user.password, form['password']):
if user and check_password_hash(user.password, form['password']) and user.nickname is not "Guest":
login_user(user, remember=True)

flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.nickname), category="success")
return redirect_back(url_for("index"))
else:
Expand Down

0 comments on commit c66bb54

Please sign in to comment.