bugfix
This commit is contained in:
parent
7d3cfe924d
commit
fc4faed700
@ -12,36 +12,6 @@ from appPublic.uniqueID import getID
|
|||||||
from ahserver.auth_api import AuthAPI, user_login
|
from ahserver.auth_api import AuthAPI, user_login
|
||||||
from ahserver.globalEnv import password_encode
|
from ahserver.globalEnv import password_encode
|
||||||
from ahserver.serverenv import ServerEnv, get_serverenv, set_serverenv
|
from ahserver.serverenv import ServerEnv, get_serverenv, set_serverenv
|
||||||
import jwt
|
|
||||||
|
|
||||||
defualt_password_key = "!@#$%^&*(*&^%$QWERTYUIqwertyui234567"
|
|
||||||
defualt_secret_key="test1234!@#$2222354"
|
|
||||||
|
|
||||||
def generate_token(ak):
|
|
||||||
tim = int(round(time.time()))
|
|
||||||
exp = tim + 5 * 60
|
|
||||||
d = {
|
|
||||||
'apikey':ak,
|
|
||||||
'exp':exp,
|
|
||||||
'timestamp':exp
|
|
||||||
}
|
|
||||||
return jwt.encode(
|
|
||||||
d,
|
|
||||||
defualt_secret_key,
|
|
||||||
algorithm="HS256",
|
|
||||||
headers={"alg":"HS256","sign_type":"SIGN"}
|
|
||||||
)
|
|
||||||
|
|
||||||
def get_apikey_from_token(token):
|
|
||||||
try:
|
|
||||||
dt = jwt.decode(token, defualt_secret_key, algorithms=["HS256"])
|
|
||||||
t = time.time()
|
|
||||||
d = DictObject(**dt)
|
|
||||||
if t > d.exp:
|
|
||||||
return None
|
|
||||||
return d.apikey
|
|
||||||
except:
|
|
||||||
return None
|
|
||||||
|
|
||||||
async def get_user_roles(userid):
|
async def get_user_roles(userid):
|
||||||
sql = "select concat(b.orgtypeid, '.', b.name) as name from userrole a, role b where a.userid=${userid}$ and a.roleid = b.id"
|
sql = "select concat(b.orgtypeid, '.', b.name) as name from userrole a, role b where a.userid=${userid}$ and a.roleid = b.id"
|
||||||
@ -112,13 +82,6 @@ async def register_user(sor, ns):
|
|||||||
await create_user(sor, ns)
|
await create_user(sor, ns)
|
||||||
return id
|
return id
|
||||||
|
|
||||||
def load_rbac():
|
|
||||||
AuthAPI.checkUserPermission = objcheckperm
|
|
||||||
env = ServerEnv()
|
|
||||||
env.get_user_roles = get_user_roles
|
|
||||||
env.check_user_password = checkUserPassword
|
|
||||||
env.register_user = register_user
|
|
||||||
|
|
||||||
async def get_dbname():
|
async def get_dbname():
|
||||||
rf = RegisterFunction()
|
rf = RegisterFunction()
|
||||||
dbname = await rf.exe('get_module_dbname', 'rbac')
|
dbname = await rf.exe('get_module_dbname', 'rbac')
|
||||||
|
@ -13,3 +13,4 @@ def load_rbac():
|
|||||||
env.set_role_perms = set_role_perms
|
env.set_role_perms = set_role_perms
|
||||||
env.register_auth_method = register_auth_method
|
env.register_auth_method = register_auth_method
|
||||||
|
|
||||||
|
|
||||||
|
52
setup.py
52
setup.py
@ -1,52 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
from rbac.version import __version__
|
|
||||||
try:
|
|
||||||
from setuptools import setup
|
|
||||||
except ImportError:
|
|
||||||
from distutils.core import setup
|
|
||||||
required = []
|
|
||||||
with open('requirements.txt', 'r') as f:
|
|
||||||
ls = f.read()
|
|
||||||
required = ls.split('\n')
|
|
||||||
|
|
||||||
with open('rbac/version.py', 'r') as f:
|
|
||||||
x = f.read()
|
|
||||||
y = x[x.index("'")+1:]
|
|
||||||
z = y[:y.index("'")]
|
|
||||||
version = z
|
|
||||||
with open("README.md", "r") as fh:
|
|
||||||
long_description = fh.read()
|
|
||||||
|
|
||||||
name = "rbac"
|
|
||||||
description = "rbac"
|
|
||||||
author = "yumoqing"
|
|
||||||
email = "yumoqing@gmail.com"
|
|
||||||
|
|
||||||
package_data = {}
|
|
||||||
|
|
||||||
setup(
|
|
||||||
name="rbac",
|
|
||||||
version=version,
|
|
||||||
|
|
||||||
# uncomment the following lines if you fill them out in release.py
|
|
||||||
description=description,
|
|
||||||
author=author,
|
|
||||||
author_email=email,
|
|
||||||
platforms='any',
|
|
||||||
install_requires=required ,
|
|
||||||
packages=[
|
|
||||||
"rbac"
|
|
||||||
],
|
|
||||||
package_data=package_data,
|
|
||||||
keywords = [
|
|
||||||
],
|
|
||||||
url="https://github.com/yumoqing/rbac",
|
|
||||||
long_description=long_description,
|
|
||||||
long_description_content_type="text/markdown",
|
|
||||||
classifiers = [
|
|
||||||
'Operating System :: OS Independent',
|
|
||||||
'Programming Language :: Python :: 3',
|
|
||||||
'License :: OSI Approved :: MIT License',
|
|
||||||
],
|
|
||||||
)
|
|
Loading…
Reference in New Issue
Block a user