diff --git a/json/rolepermission.json b/json/rolepermission.json index 49bf3fd..7fc4021 100644 --- a/json/rolepermission.json +++ b/json/rolepermission.json @@ -1,7 +1,4 @@ { - "models_dir": "${HOME}$/py/rbac/models", - "output_dir": "${HOME}$/py/sage/wwwroot/_a/rolepermission", - "dbname": "sage", "tblname": "rolepermission", "title":"用户", "params": { diff --git a/json/userdepartment.json b/json/userdepartment.json index 91f409e..1dbd9b4 100644 --- a/json/userdepartment.json +++ b/json/userdepartment.json @@ -1,7 +1,4 @@ { - "models_dir": "${HOME}$/py/rbac/models", - "output_dir": "${HOME}$/py/sage/wwwroot/_a/userdepartment", - "dbname": "sage", "tblname": "userdepartment", "title":"用户", "params": { diff --git a/rbac/check_perm.py b/rbac/check_perm.py index 619893c..43b2937 100644 --- a/rbac/check_perm.py +++ b/rbac/check_perm.py @@ -102,7 +102,8 @@ async def checkUserPassword(request, username, password): return True return False -async def basic_auth(sor, auth): +async def basic_auth(sor, request): + auth = request.headers.get('Authentication') auther = BasicAuth('x') m = auther.decode(auth) username = m.login @@ -122,7 +123,7 @@ async def getAuthenticationUserid(sor, request): return None for h,f in registered_auth_methods.items(): if auth.startswith(h): - return await f(auth) + return await f(sor, request) return None async def objcheckperm(obj, request, userid, path):