diff --git a/redstring/server.py b/redstring/server.py index 6be5a28..b536a57 100644 --- a/redstring/server.py +++ b/redstring/server.py @@ -42,7 +42,7 @@ class Admin(UserMixin): class LoginForm(FlaskForm): - password = PasswordField('Password', validators=[DataRequired()]) + password = PasswordField('Password') submit = SubmitField('Submit') @@ -105,9 +105,19 @@ def document(document_id): @app.route('/login/', methods=['GET', 'POST']) def login(): form = LoginForm() - if form.validate_on_submit() and check_password(current_app, form.password.data): - login_user(Admin()) - return redirect(url_for('index')) + s = form.is_submitted() + logger.debug(f's={s}') + if s: + logger.debug(f'pw={form.password.data}') + logger.debug(f'headers={request.headers}') + v = form.validate() + logger.debug(f'v={v}') + logger.debug(f'e={form.errors}') + if v: + valid = check_password(current_app, form.password.data) + if valid: + login_user(Admin()) + return redirect(url_for('index')) return render_template('login.jinja', form=form) @@ -233,5 +243,5 @@ def wsgi(): config_path = os.environ.get(CONFIG_ENVVAR) or '/etc/redstring.conf' config = read_config(app, config_path) logger.setLevel(logging.DEBUG) - logger.debug(f'Loaded config from {config_path}: {config}') + logger.debug(f'Lloaded config from {config_path}: {config}') return app diff --git a/redstring/templates/login.jinja b/redstring/templates/login.jinja index 972c1af..637df99 100644 --- a/redstring/templates/login.jinja +++ b/redstring/templates/login.jinja @@ -8,12 +8,9 @@