7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-08-08 02:11:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix g.user

Browse Source
This commit is contained in:
pycook
2023-08-21 11:54:33 +08:00
parent ece24080d5
commit 7547b67805
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmdb-api/api/views/acl/resources.py
View File

@@ -1,6 +1,5 @@
# -*- coding:utf-8 -*-
from flask import g
from flask import request
from flask_login import current_user
@@ -104,7 +103,7 @@ class ResourceView(APIView):
type_id = request.values.get('type_id')
app_id = request.values.get('app_id')
uid = request.values.get('uid')
if not uid and hasattr(g, "user") and hasattr(current_user, "uid"):
if not uid and hasattr(current_user, "uid"):
uid = current_user.uid
resource = ResourceCRUD.add(name, type_id, app_id, uid)

3
cmdb-api/api/views/acl/user.py
View File

@@ -4,7 +4,6 @@
import requests
from flask import abort
from flask import current_app
from flask import g
from flask import request
from flask import session
from flask_login import current_user
@@ -161,7 +160,7 @@ class UserResetPasswordView(APIView):
if app.name not in ('cas-server', 'acl'):
return abort(403, ErrFormat.invalid_request)
elif hasattr(g, 'user'):
elif hasattr(current_user, 'username'):
if current_user.username != request.values['username']:
return abort(403, ErrFormat.invalid_request)