From 48a8a33fab4523182adfae43f654d77734646af0 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Tue, 18 Jul 2023 18:25:59 +0800 Subject: [PATCH] bugfix --- ahserver/auth_api.py | 11 +++++++++++ ahserver/configuredServer.py | 13 ++++++++----- requirements.txt | 1 + 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ahserver/auth_api.py b/ahserver/auth_api.py index 2498220..c300d17 100755 --- a/ahserver/auth_api.py +++ b/ahserver/auth_api.py @@ -4,14 +4,17 @@ from aiohttp_auth.auth.ticket_auth import TktAuthentication from os import urandom from aiohttp import web import aiohttp_session +import aioredis import base64 from aiohttp_session import get_session, session_middleware from aiohttp_session.cookie_storage import EncryptedCookieStorage +from aiohttp_session.redis_storage import RedisStorage from appPublic.jsonConfig import getConfig from appPublic.rsawrap import RSA from appPublic.app_logger import AppLogger + class AuthAPI(AppLogger): def __init__(self): super().__init__() @@ -34,7 +37,15 @@ class AuthAPI(AppLogger): def setupAuth(self,app): # setup session middleware in aiohttp fashion + storage = EncryptedCookieStorage(urandom(32)) + """ + if self.conf.website.session_redis: + url = self.conf.website.session_redis.url + # redis = await aioredis.from_url("redis://127.0.0.1:6379") + redis = await aioredis.from_url(url) + storage = aiohttp_session.redis_storage.RedisStorage(redis) + """ aiohttp_session.setup(app, storage) # Create an auth ticket mechanism that expires after 1 minute (60 diff --git a/ahserver/configuredServer.py b/ahserver/configuredServer.py index a2f652e..209c90f 100755 --- a/ahserver/configuredServer.py +++ b/ahserver/configuredServer.py @@ -19,10 +19,13 @@ from .filestorage import TmpFileRecord class ConfiguredServer(AppLogger): def __init__(self, auth_klass=AuthAPI, workdir=None): + self.auth_klass = auth_klass + self.workdir = workdir super().__init__() - if workdir is not None: + if self.workdir is not None: pp = ProgramPath() - config = getConfig(workdir,{'workdir':workdir,'ProgramPath':pp}) + config = getConfig(self.workdir, + {'workdir':self.workdir,'ProgramPath':pp}) else: config = getConfig() if config.databases: @@ -35,11 +38,11 @@ class ConfiguredServer(AppLogger): print(f'{client_max_size=}') self.app = web.Application(client_max_size=client_max_size) - auth = auth_klass() - auth.setupAuth(self.app) - self.configPath(config) def run(self): + auth = self.auth_klass() + await auth.setupAuth(self.app) + self.configPath(config) a = TmpFileRecord() config = getConfig() ssl_context = None diff --git a/requirements.txt b/requirements.txt index 3dfb29b..6221d9e 100755 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ aiohttp aiohttp_session aiohttp_auth_autz aiomysql +aioredis psycopg2-binary aiopg jinja2