Compare commits
2 Commits
440301d737
...
6a92249ca2
Author | SHA1 | Date |
---|---|---|
Tim Van Baak | 6a92249ca2 | |
Tim Van Baak | c89afe5b94 |
|
@ -50,10 +50,10 @@ WTForms = "*"
|
||||||
itsdangerous = "*"
|
itsdangerous = "*"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
category = "dev"
|
category = "main"
|
||||||
description = "WSGI HTTP Server for UNIX"
|
description = "WSGI HTTP Server for UNIX"
|
||||||
name = "gunicorn"
|
name = "gunicorn"
|
||||||
optional = false
|
optional = true
|
||||||
python-versions = ">=3.4"
|
python-versions = ">=3.4"
|
||||||
version = "20.0.4"
|
version = "20.0.4"
|
||||||
|
|
||||||
|
@ -164,8 +164,11 @@ email = ["email-validator"]
|
||||||
ipaddress = ["ipaddress"]
|
ipaddress = ["ipaddress"]
|
||||||
locale = ["Babel (>=1.3)"]
|
locale = ["Babel (>=1.3)"]
|
||||||
|
|
||||||
|
[extras]
|
||||||
|
dev = ["gunicorn"]
|
||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
content-hash = "5a3b077899ce6bd8f1a70c4fc48784486bb1373081d94c5b772191e7edb2788c"
|
content-hash = "e4930aaf62df0a261424129ab0d89af96ea4e19f80b76c7c6fbcb25c491a213d"
|
||||||
lock-version = "1.0"
|
lock-version = "1.0"
|
||||||
python-versions = "^3.8"
|
python-versions = "^3.8"
|
||||||
|
|
||||||
|
|
|
@ -9,10 +9,13 @@ python = "^3.8"
|
||||||
flask = "^1.1.2"
|
flask = "^1.1.2"
|
||||||
flask-login = "^0.5.0"
|
flask-login = "^0.5.0"
|
||||||
flask_wtf = "^0.14.3"
|
flask_wtf = "^0.14.3"
|
||||||
|
gunicorn = {version = "^20.0.4", optional = true}
|
||||||
|
|
||||||
[tool.poetry.dev-dependencies]
|
[tool.poetry.dev-dependencies]
|
||||||
mypy = "^0.800"
|
mypy = "^0.800"
|
||||||
gunicorn = "^20.0.4"
|
|
||||||
|
[tool.poetry.extras]
|
||||||
|
dev = ["gunicorn"]
|
||||||
|
|
||||||
[tool.poetry.scripts]
|
[tool.poetry.scripts]
|
||||||
redstring-check = "redstring.parser:main"
|
redstring-check = "redstring.parser:main"
|
||||||
|
|
|
@ -1,2 +1,14 @@
|
||||||
|
import logging
|
||||||
|
|
||||||
import redstring.parser
|
import redstring.parser
|
||||||
import redstring.server
|
import redstring.server
|
||||||
|
|
||||||
|
formatter = logging.Formatter('[{asctime}] [{process}] [{levelname}] {message}', '%Y-%m-%d %H:%M:%S %z', style='{')
|
||||||
|
|
||||||
|
handler = logging.StreamHandler()
|
||||||
|
handler.setFormatter(formatter)
|
||||||
|
handler.setLevel(logging.DEBUG)
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
logger.setLevel(logging.DEBUG)
|
||||||
|
logger.addHandler(handler)
|
||||||
|
|
|
@ -3,6 +3,7 @@ Logic for serving a collection of documents through a web frontend.
|
||||||
"""
|
"""
|
||||||
import argparse
|
import argparse
|
||||||
import json
|
import json
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
import string
|
import string
|
||||||
|
@ -47,6 +48,8 @@ class LoginForm(FlaskForm):
|
||||||
|
|
||||||
CONFIG_ENVVAR = 'REDSTRING_CONFIG'
|
CONFIG_ENVVAR = 'REDSTRING_CONFIG'
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
app.secret_key = ''.join(random.choices(string.ascii_uppercase + string.digits, k=32))
|
app.secret_key = ''.join(random.choices(string.ascii_uppercase + string.digits, k=32))
|
||||||
|
|
||||||
|
@ -60,10 +63,16 @@ def check_password(app, password):
|
||||||
Checks if a password is correct
|
Checks if a password is correct
|
||||||
"""
|
"""
|
||||||
password_file = app.config['password_file']
|
password_file = app.config['password_file']
|
||||||
|
if not os.path.isfile(password_file):
|
||||||
|
logger.debug('Authentication failed: no password file found')
|
||||||
with open(password_file) as f:
|
with open(password_file) as f:
|
||||||
real_password = f.read().strip()
|
real_password = f.read().strip()
|
||||||
correct = password == real_password
|
correct = password == real_password
|
||||||
del real_password
|
del real_password
|
||||||
|
if correct:
|
||||||
|
logger.debug('Authentication successful')
|
||||||
|
else:
|
||||||
|
logger.debug('Authentication failed: password incorrect')
|
||||||
return correct
|
return correct
|
||||||
|
|
||||||
|
|
||||||
|
@ -223,4 +232,6 @@ def cli():
|
||||||
def wsgi():
|
def wsgi():
|
||||||
config_path = os.environ.get(CONFIG_ENVVAR) or '/etc/redstring.conf'
|
config_path = os.environ.get(CONFIG_ENVVAR) or '/etc/redstring.conf'
|
||||||
config = read_config(app, config_path)
|
config = read_config(app, config_path)
|
||||||
|
logger.setLevel(logging.DEBUG)
|
||||||
|
logger.debug(f'Loaded config from {config_path}: {config}')
|
||||||
return app
|
return app
|
||||||
|
|
Loading…
Reference in New Issue