mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
add passreset routes
Introduced `get|post` `/passreset` routes. These routes mimic the behavior of the existing PHP implementation, with the exception of HTTP status code returns. Routes added: GET /passreset POST /passreset Routers added: aurweb.routers.accounts * On an unknown user or mismatched resetkey (where resetkey must == user.resetkey), return HTTP status NOT_FOUND (404). * On another error in the request, return HTTP status BAD_REQUEST (400). Both `get|post` routes requires that the current user is **not** authenticated, hence `@auth_required(False, redirect="/")`. + Added auth_required decorator to aurweb.auth. + Added some more utility to aurweb.models.user.User. + Added `partials/error.html` template. + Added `passreset.html` template. + Added aurweb.db.ConnectionExecutor functor for paramstyle logic. Decoupling the executor logic from the database connection logic is needed for us to easily use the same logic with a fastapi database session, when we need to use aurweb.scripts modules. At this point, notification configuration is now required to complete tests involved with notifications properly, like passreset. `conf/config.dev` has been modified to include [notifications] sendmail, sender and reply-to overrides. Dockerfile and .gitlab-ci.yml have been updated to setup /etc/hosts and start postfix before running tests. * setup.cfg: ignore E741, C901 in aurweb.routers.accounts These two warnings (shown in the commit) are not dangerous and a bi-product of maintaining compatibility with our current code flow. Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
4423326cec
commit
a33d076d8b
15 changed files with 552 additions and 41 deletions
70
aurweb/db.py
70
aurweb/db.py
|
@ -145,35 +145,21 @@ def connect():
|
|||
return get_engine().connect()
|
||||
|
||||
|
||||
class Connection:
|
||||
class ConnectionExecutor:
|
||||
_conn = None
|
||||
_paramstyle = None
|
||||
|
||||
def __init__(self):
|
||||
aur_db_backend = aurweb.config.get('database', 'backend')
|
||||
|
||||
if aur_db_backend == 'mysql':
|
||||
def __init__(self, conn, backend=aurweb.config.get("database", "backend")):
|
||||
self._conn = conn
|
||||
if backend == "mysql":
|
||||
import mysql.connector
|
||||
aur_db_host = aurweb.config.get('database', 'host')
|
||||
aur_db_name = aurweb.config.get('database', 'name')
|
||||
aur_db_user = aurweb.config.get('database', 'user')
|
||||
aur_db_pass = aurweb.config.get('database', 'password')
|
||||
aur_db_socket = aurweb.config.get('database', 'socket')
|
||||
self._conn = mysql.connector.connect(host=aur_db_host,
|
||||
user=aur_db_user,
|
||||
passwd=aur_db_pass,
|
||||
db=aur_db_name,
|
||||
unix_socket=aur_db_socket,
|
||||
buffered=True)
|
||||
self._paramstyle = mysql.connector.paramstyle
|
||||
elif aur_db_backend == 'sqlite':
|
||||
elif backend == "sqlite":
|
||||
import sqlite3
|
||||
aur_db_name = aurweb.config.get('database', 'name')
|
||||
self._conn = sqlite3.connect(aur_db_name)
|
||||
self._conn.create_function("POWER", 2, math.pow)
|
||||
self._paramstyle = sqlite3.paramstyle
|
||||
else:
|
||||
raise ValueError('unsupported database backend')
|
||||
|
||||
def paramstyle(self):
|
||||
return self._paramstyle
|
||||
|
||||
def execute(self, query, params=()):
|
||||
if self._paramstyle in ('format', 'pyformat'):
|
||||
|
@ -193,3 +179,43 @@ class Connection:
|
|||
|
||||
def close(self):
|
||||
self._conn.close()
|
||||
|
||||
|
||||
class Connection:
|
||||
_executor = None
|
||||
_conn = None
|
||||
|
||||
def __init__(self):
|
||||
aur_db_backend = aurweb.config.get('database', 'backend')
|
||||
|
||||
if aur_db_backend == 'mysql':
|
||||
import mysql.connector
|
||||
aur_db_host = aurweb.config.get('database', 'host')
|
||||
aur_db_name = aurweb.config.get('database', 'name')
|
||||
aur_db_user = aurweb.config.get('database', 'user')
|
||||
aur_db_pass = aurweb.config.get('database', 'password')
|
||||
aur_db_socket = aurweb.config.get('database', 'socket')
|
||||
self._conn = mysql.connector.connect(host=aur_db_host,
|
||||
user=aur_db_user,
|
||||
passwd=aur_db_pass,
|
||||
db=aur_db_name,
|
||||
unix_socket=aur_db_socket,
|
||||
buffered=True)
|
||||
elif aur_db_backend == 'sqlite':
|
||||
import sqlite3
|
||||
aur_db_name = aurweb.config.get('database', 'name')
|
||||
self._conn = sqlite3.connect(aur_db_name)
|
||||
self._conn.create_function("POWER", 2, math.pow)
|
||||
else:
|
||||
raise ValueError('unsupported database backend')
|
||||
|
||||
self._conn = ConnectionExecutor(self._conn)
|
||||
|
||||
def execute(self, query, params=()):
|
||||
return self._conn.execute(query, params)
|
||||
|
||||
def commit(self):
|
||||
self._conn.commit()
|
||||
|
||||
def close(self):
|
||||
self._conn.close()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue