7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade flask to 2.3.2 and replace g.user with current_user

This commit is contained in:
pycook 2023-08-06 19:12:44 +08:00 committed by pycook
parent 51c6d50b38
commit ef09497d67
23 changed files with 130 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmdb-api/Pipfile
View File

@ -5,24 +5,24 @@ name = "pypi"
[packages] [packages]
# Flask # Flask
Flask = "==1.0.3" Flask = "==2.3.2"
Werkzeug = "==0.15.5" Werkzeug = "==2.3.6"
click = ">=5.0" click = ">=5.0"
# Api # Api
Flask-RESTful = "==0.3.7" Flask-RESTful = "==0.3.10"
# Database # Database
Flask-SQLAlchemy = "==2.4.0" Flask-SQLAlchemy = "==2.5.0"
SQLAlchemy = "==1.3.5" SQLAlchemy = "==1.4.49"
PyMySQL = "==0.9.3" PyMySQL = "==1.1.0"
redis = "==3.2.1" redis = "==3.2.1"
# Migrations # Migrations
Flask-Migrate = "==2.5.2" Flask-Migrate = "==2.5.2"
# Deployment # Deployment
gunicorn = "==19.5.0" gunicorn = "==21.0.1"
supervisor = "==4.0.3" supervisor = "==4.0.3"
# Auth # Auth
Flask-Login = "==0.4.1" Flask-Login = "==0.6.2"
Flask-Bcrypt = "==0.7.1" Flask-Bcrypt = "==1.0.1"
Flask-Cors = ">=3.0.8" Flask-Cors = ">=3.0.8"
python-ldap = "==3.4.0" python-ldap = "==3.4.0"
pycryptodome = "==3.12.0" pycryptodome = "==3.12.0"
@ -37,7 +37,6 @@ celery_once = "==3.0.1"
more-itertools = "==5.0.0" more-itertools = "==5.0.0"
kombu = "==4.4.0" kombu = "==4.4.0"
# common setting # common setting
Flask-APScheduler = "==1.12.4"
timeout-decorator = "==0.5.0" timeout-decorator = "==0.5.0"
WTForms = "==3.0.0" WTForms = "==3.0.0"
email-validator = "==1.3.1" email-validator = "==1.3.1"
@ -52,8 +51,8 @@ requests = ">=2.22.0"
PyJWT = "==2.4.0" PyJWT = "==2.4.0"
elasticsearch = "==7.17.9" elasticsearch = "==7.17.9"
future = "==0.18.2" future = "==0.18.2"
itsdangerous = "==2.0.1" itsdangerous = "==2.1.2"
Jinja2 = "==3.0.1" Jinja2 = "==3.1.2"
jinja2schema = "==0.1.4" jinja2schema = "==0.1.4"
msgpack-python = "==0.5.6" msgpack-python = "==0.5.6"
alembic = "==1.7.7" alembic = "==1.7.7"

16
cmdb-api/api/app.py
View File

@ -6,26 +6,16 @@ import logging
import os import os
import sys import sys
from inspect import getmembers from inspect import getmembers
from json import JSONEncoder
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
from flask import Flask from flask import Flask
from flask import make_response, jsonify from flask import jsonify, make_response
from flask.blueprints import Blueprint from flask.blueprints import Blueprint
from flask.cli import click from flask.cli import click
from flask.json import JSONEncoder
import api.views.entry import api.views.entry
from api.extensions import ( from api.extensions import (bcrypt, cache, celery, cors, db, es, login_manager, migrate, rd)
bcrypt,
cors,
cache,
db,
login_manager,
migrate,
celery,
rd,
es,
)
from api.flask_cas import CAS from api.flask_cas import CAS
from api.models.acl import User from api.models.acl import User

10
cmdb-api/api/lib/cmdb/attribute.py
View File

@ -3,13 +3,13 @@
import requests import requests
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g
from flask import session from flask import session
from flask_login import current_user
from api.extensions import db from api.extensions import db
from api.lib.cmdb.cache import AttributeCache from api.lib.cmdb.cache import AttributeCache
from api.lib.cmdb.const import CITypeOperateType from api.lib.cmdb.const import CITypeOperateType
from api.lib.cmdb.const import ResourceTypeEnum, RoleEnum, PermEnum from api.lib.cmdb.const import PermEnum, ResourceTypeEnum, RoleEnum
from api.lib.cmdb.const import ValueTypeEnum from api.lib.cmdb.const import ValueTypeEnum
from api.lib.cmdb.history import CITypeHistoryManager from api.lib.cmdb.history import CITypeHistoryManager
from api.lib.cmdb.resp_format import ErrFormat from api.lib.cmdb.resp_format import ErrFormat
@ -177,7 +177,7 @@ class AttributeManager(object):
name=name, name=name,
alias=alias, alias=alias,
is_choice=is_choice, is_choice=is_choice,
uid=g.user.uid, uid=current_user.uid,
**kwargs) **kwargs)
if choice_value: if choice_value:
@ -240,7 +240,7 @@ class AttributeManager(object):
def _can_edit_attribute(attr): def _can_edit_attribute(attr):
from api.lib.cmdb.ci_type import CITypeManager from api.lib.cmdb.ci_type import CITypeManager
if attr.uid == g.user.uid: if attr.uid == current_user.uid:
return True return True
for i in CITypeAttribute.get_by(attr_id=attr.id, to_dict=False): for i in CITypeAttribute.get_by(attr_id=attr.id, to_dict=False):
@ -319,7 +319,7 @@ class AttributeManager(object):
if CIType.get_by(unique_id=attr.id, first=True, to_dict=False) is not None: if CIType.get_by(unique_id=attr.id, first=True, to_dict=False) is not None:
return abort(400, ErrFormat.attribute_is_unique_id) return abort(400, ErrFormat.attribute_is_unique_id)
if attr.uid and attr.uid != g.user.uid: if attr.uid and attr.uid != current_user.uid:
return abort(403, ErrFormat.cannot_delete_attribute) return abort(403, ErrFormat.cannot_delete_attribute)
if attr.is_choice: if attr.is_choice:

20
cmdb-api/api/lib/cmdb/auto_discovery/auto_discovery.py
View File

@ -5,7 +5,7 @@ import os
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g from flask_login import current_user
from sqlalchemy import func from sqlalchemy import func
from api.extensions import db from api.extensions import db
@ -156,7 +156,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
continue continue
if isinstance(rule.get("extra_option"), dict) and rule['extra_option'].get('secret'): if isinstance(rule.get("extra_option"), dict) and rule['extra_option'].get('secret'):
if not (g.user.username == "cmdb_agent" or g.user.uid == rule['uid']): if not (current_user.username == "cmdb_agent" or current_user.uid == rule['uid']):
rule['extra_option'].pop('secret', None) rule['extra_option'].pop('secret', None)
else: else:
rule['extra_option']['secret'] = AESCrypto.decrypt(rule['extra_option']['secret']) rule['extra_option']['secret'] = AESCrypto.decrypt(rule['extra_option']['secret'])
@ -213,7 +213,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
agent_id = agent_id.strip() agent_id = agent_id.strip()
q = "op_duty:{0},-rd_duty:{0},oneagent_id:{1}" q = "op_duty:{0},-rd_duty:{0},oneagent_id:{1}"
s = search(q.format(g.user.username, agent_id.strip())) s = search(q.format(current_user.username, agent_id.strip()))
try: try:
response, _, _, _, _, _ = s.search() response, _, _, _, _, _ = s.search()
if response: if response:
@ -222,7 +222,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
current_app.logger.warning(e) current_app.logger.warning(e)
return abort(400, str(e)) return abort(400, str(e))
s = search(q.format(g.user.nickname, agent_id.strip())) s = search(q.format(current_user.nickname, agent_id.strip()))
try: try:
response, _, _, _, _, _ = s.search() response, _, _, _, _, _ = s.search()
if response: if response:
@ -240,9 +240,9 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
try: try:
response, _, _, _, _, _ = s.search() response, _, _, _, _, _ = s.search()
for i in response: for i in response:
if g.user.username not in (i.get('rd_duty') or []) and g.user.username not in \ if current_user.username not in (i.get('rd_duty') or []) and current_user.username not in \
(i.get('op_duty') or []) and g.user.nickname not in (i.get('rd_duty') or []) and \ (i.get('op_duty') or []) and current_user.nickname not in (i.get('rd_duty') or []) and \
g.user.nickname not in (i.get('op_duty') or []): current_user.nickname not in (i.get('op_duty') or []):
return abort(403, ErrFormat.adt_target_expr_no_permission.format( return abort(403, ErrFormat.adt_target_expr_no_permission.format(
i.get("{}_name".format(i.get('ci_type'))))) i.get("{}_name".format(i.get('ci_type')))))
except SearchError as e: except SearchError as e:
@ -270,7 +270,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'): if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'):
kwargs['extra_option']['secret'] = AESCrypto.encrypt(kwargs['extra_option']['secret']) kwargs['extra_option']['secret'] = AESCrypto.encrypt(kwargs['extra_option']['secret'])
kwargs['uid'] = g.user.uid kwargs['uid'] = current_user.uid
return kwargs return kwargs
@ -281,7 +281,7 @@ class AutoDiscoveryCITypeCRUD(DBMixin):
self.__valid_exec_target(kwargs.get('agent_id'), kwargs.get('query_expr')) self.__valid_exec_target(kwargs.get('agent_id'), kwargs.get('query_expr'))
if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'): if isinstance(kwargs.get('extra_option'), dict) and kwargs['extra_option'].get('secret'):
if g.user.uid != existed.uid: if current_user.uid != existed.uid:
return abort(403, ErrFormat.adt_secret_no_permission) return abort(403, ErrFormat.adt_secret_no_permission)
return existed return existed
@ -477,7 +477,7 @@ class AutoDiscoveryCICRUD(DBMixin):
pass pass
adc.update(is_accept=True, adc.update(is_accept=True,
accept_by=nickname or g.user.nickname, accept_by=nickname or current_user.nickname,
accept_time=datetime.datetime.now(), accept_time=datetime.datetime.now(),
ci_id=ci_id) ci_id=ci_id)

10
cmdb-api/api/lib/cmdb/ci.py
View File

@ -7,7 +7,7 @@ import json
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g from flask_login import current_user
from werkzeug.exceptions import BadRequest from werkzeug.exceptions import BadRequest
from api.extensions import db from api.extensions import db
@ -24,8 +24,8 @@ from api.lib.cmdb.const import CMDB_QUEUE
from api.lib.cmdb.const import ConstraintEnum from api.lib.cmdb.const import ConstraintEnum
from api.lib.cmdb.const import ExistPolicy from api.lib.cmdb.const import ExistPolicy
from api.lib.cmdb.const import OperateType from api.lib.cmdb.const import OperateType
from api.lib.cmdb.const import PermEnum, ResourceTypeEnum
from api.lib.cmdb.const import REDIS_PREFIX_CI from api.lib.cmdb.const import REDIS_PREFIX_CI
from api.lib.cmdb.const import ResourceTypeEnum, PermEnum
from api.lib.cmdb.const import RetKey from api.lib.cmdb.const import RetKey
from api.lib.cmdb.history import AttributeHistoryManger from api.lib.cmdb.history import AttributeHistoryManger
from api.lib.cmdb.history import CIRelationHistoryManager from api.lib.cmdb.history import CIRelationHistoryManager
@ -38,8 +38,8 @@ from api.lib.decorator import kwargs_required
from api.lib.perm.acl.acl import ACLManager from api.lib.perm.acl.acl import ACLManager
from api.lib.perm.acl.acl import is_app_admin from api.lib.perm.acl.acl import is_app_admin
from api.lib.perm.acl.acl import validate_permission from api.lib.perm.acl.acl import validate_permission
from api.lib.utils import Lock
from api.lib.utils import handle_arg_list from api.lib.utils import handle_arg_list
from api.lib.utils import Lock
from api.models.cmdb import CI from api.models.cmdb import CI
from api.models.cmdb import CIRelation from api.models.cmdb import CIRelation
from api.models.cmdb import CITypeAttribute from api.models.cmdb import CITypeAttribute
@ -316,7 +316,7 @@ class CIManager(object):
ci_attr2type_attr = {type_attr.attr_id: type_attr for type_attr, _ in attrs} ci_attr2type_attr = {type_attr.attr_id: type_attr for type_attr, _ in attrs}
ci = None ci = None
need_lock = g.user.username not in ("worker", "cmdb_agent", "agent") need_lock = current_user.username not in ("worker", "cmdb_agent", "agent")
with Lock(ci_type_name, need_lock=need_lock): with Lock(ci_type_name, need_lock=need_lock):
existed = cls.ci_is_exist(unique_key, unique_value, ci_type.id) existed = cls.ci_is_exist(unique_key, unique_value, ci_type.id)
if existed is not None: if existed is not None:
@ -411,7 +411,7 @@ class CIManager(object):
limit_attrs = self._valid_ci_for_no_read(ci) if not _is_admin else {} limit_attrs = self._valid_ci_for_no_read(ci) if not _is_admin else {}
need_lock = g.user.username not in ("worker", "cmdb_agent", "agent") need_lock = current_user.username not in ("worker", "cmdb_agent", "agent")
with Lock(ci.ci_type.name, need_lock=need_lock): with Lock(ci.ci_type.name, need_lock=need_lock):
self._valid_unique_constraint(ci.type_id, ci_dict, ci_id) self._valid_unique_constraint(ci.type_id, ci_dict, ci_id)

14
cmdb-api/api/lib/cmdb/ci_type.py
View File

@ -5,7 +5,7 @@ import datetime
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g from flask_login import current_user
from api.extensions import db from api.extensions import db
from api.lib.cmdb.attribute import AttributeManager from api.lib.cmdb.attribute import AttributeManager
@ -118,7 +118,7 @@ class CITypeManager(object):
cls._validate_unique(alias=kwargs['alias']) cls._validate_unique(alias=kwargs['alias'])
kwargs["unique_id"] = unique_key.id kwargs["unique_id"] = unique_key.id
kwargs['uid'] = g.user.uid kwargs['uid'] = current_user.uid
ci_type = CIType.create(**kwargs) ci_type = CIType.create(**kwargs)
CITypeAttributeManager.add(ci_type.id, [unique_key.id], is_required=True) CITypeAttributeManager.add(ci_type.id, [unique_key.id], is_required=True)
@ -132,7 +132,7 @@ class CITypeManager(object):
ResourceTypeEnum.CI, ResourceTypeEnum.CI,
permissions=[PermEnum.READ]) permissions=[PermEnum.READ])
ACLManager().grant_resource_to_role(ci_type.name, ACLManager().grant_resource_to_role(ci_type.name,
g.user.username, current_user.username,
ResourceTypeEnum.CI) ResourceTypeEnum.CI)
CITypeHistoryManager.add(CITypeOperateType.ADD, ci_type.id, change=ci_type.to_dict()) CITypeHistoryManager.add(CITypeOperateType.ADD, ci_type.id, change=ci_type.to_dict())
@ -185,7 +185,7 @@ class CITypeManager(object):
def delete(cls, type_id): def delete(cls, type_id):
ci_type = cls.check_is_existed(type_id) ci_type = cls.check_is_existed(type_id)
if ci_type.uid and ci_type.uid != g.user.uid: if ci_type.uid and ci_type.uid != current_user.uid:
return abort(403, ErrFormat.only_owner_can_delete) return abort(403, ErrFormat.only_owner_can_delete)
if CI.get_by(type_id=type_id, first=True, to_dict=False) is not None: if CI.get_by(type_id=type_id, first=True, to_dict=False) is not None:
@ -582,7 +582,7 @@ class CITypeRelationManager(object):
ResourceTypeEnum.CI_TYPE_RELATION, ResourceTypeEnum.CI_TYPE_RELATION,
permissions=[PermEnum.READ]) permissions=[PermEnum.READ])
ACLManager().grant_resource_to_role(resource_name, ACLManager().grant_resource_to_role(resource_name,
g.user.username, current_user.username,
ResourceTypeEnum.CI_TYPE_RELATION) ResourceTypeEnum.CI_TYPE_RELATION)
CITypeHistoryManager.add(CITypeOperateType.ADD_RELATION, p.id, CITypeHistoryManager.add(CITypeOperateType.ADD_RELATION, p.id,
@ -816,7 +816,7 @@ class CITypeTemplateManager(object):
ResourceTypeEnum.CI, ResourceTypeEnum.CI,
permissions=[PermEnum.READ]) permissions=[PermEnum.READ])
ACLManager().grant_resource_to_role(type_name, ACLManager().grant_resource_to_role(type_name,
g.user.username, current_user.username,
ResourceTypeEnum.CI) ResourceTypeEnum.CI)
else: else:
@ -954,7 +954,7 @@ class CITypeTemplateManager(object):
rule.pop("created_at", None) rule.pop("created_at", None)
rule.pop("updated_at", None) rule.pop("updated_at", None)
rule['uid'] = g.user.uid rule['uid'] = current_user.uid
try: try:
AutoDiscoveryCITypeCRUD.add(**rule) AutoDiscoveryCITypeCRUD.add(**rule)
except: except:

8
cmdb-api/api/lib/cmdb/history.py
View File

@ -4,7 +4,7 @@
import json import json
from flask import abort from flask import abort
from flask import g from flask_login import current_user
from api.extensions import db from api.extensions import db
from api.lib.cmdb.cache import AttributeCache from api.lib.cmdb.cache import AttributeCache
@ -201,7 +201,7 @@ class AttributeHistoryManger(object):
@staticmethod @staticmethod
def add(record_id, ci_id, history_list, type_id=None, flush=False, commit=True): def add(record_id, ci_id, history_list, type_id=None, flush=False, commit=True):
if record_id is None: if record_id is None:
record = OperationRecord.create(uid=g.user.uid, type_id=type_id) record = OperationRecord.create(uid=current_user.uid, type_id=type_id)
record_id = record.id record_id = record.id
for attr_id, operate_type, old, new in history_list or []: for attr_id, operate_type, old, new in history_list or []:
@ -220,7 +220,7 @@ class AttributeHistoryManger(object):
class CIRelationHistoryManager(object): class CIRelationHistoryManager(object):
@staticmethod @staticmethod
def add(rel_obj, operate_type=OperateType.ADD): def add(rel_obj, operate_type=OperateType.ADD):
record = OperationRecord.create(uid=g.user.uid) record = OperationRecord.create(uid=current_user.uid)
CIRelationHistory.create(relation_id=rel_obj.id, CIRelationHistory.create(relation_id=rel_obj.id,
record_id=record.id, record_id=record.id,
@ -279,7 +279,7 @@ class CITypeHistoryManager(object):
for _type_id in type_ids: for _type_id in type_ids:
payload = dict(operate_type=operate_type, payload = dict(operate_type=operate_type,
type_id=_type_id, type_id=_type_id,
uid=g.user.uid, uid=current_user.uid,
attr_id=attr_id, attr_id=attr_id,
trigger_id=trigger_id, trigger_id=trigger_id,
unique_constraint_id=unique_constraint_id, unique_constraint_id=unique_constraint_id,

6
cmdb-api/api/lib/cmdb/perms.py
View File

@ -4,8 +4,8 @@ import functools
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g
from flask import request from flask import request
from flask_login import current_user
from api.lib.cmdb.const import ResourceTypeEnum from api.lib.cmdb.const import ResourceTypeEnum
from api.lib.cmdb.resp_format import ErrFormat from api.lib.cmdb.resp_format import ErrFormat
@ -74,7 +74,7 @@ class CIFilterPermsCRUD(DBMixin):
@classmethod @classmethod
def get_attr_filter(cls, type_id): def get_attr_filter(cls, type_id):
if is_app_admin('cmdb') or g.user.username in ('worker', 'cmdb_agent'): if is_app_admin('cmdb') or current_user.username in ('worker', 'cmdb_agent'):
return [] return []
res2 = ACLManager('cmdb').get_resources(ResourceTypeEnum.CI_FILTER) res2 = ACLManager('cmdb').get_resources(ResourceTypeEnum.CI_FILTER)
@ -160,7 +160,7 @@ def has_perm_for_ci(arg_name, resource_type, perm, callback=None, app=None):
resource = callback(resource) resource = callback(resource)
if current_app.config.get("USE_ACL") and resource: if current_app.config.get("USE_ACL") and resource:
if g.user.username == "worker" or g.user.username == "cmdb_agent": if current_user.username == "worker" or current_user.username == "cmdb_agent":
request.values['__is_admin'] = True request.values['__is_admin'] = True
return func(*args, **kwargs) return func(*args, **kwargs)

38
cmdb-api/api/lib/cmdb/preference.py
View File

@ -7,7 +7,7 @@ import six
import toposort import toposort
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g from flask_login import current_user
from api.extensions import db from api.extensions import db
from api.lib.cmdb.attribute import AttributeManager from api.lib.cmdb.attribute import AttributeManager
@ -36,10 +36,10 @@ class PreferenceManager(object):
@staticmethod @staticmethod
def get_types(instance=False, tree=False): def get_types(instance=False, tree=False):
types = db.session.query(PreferenceShowAttributes.type_id).filter( types = db.session.query(PreferenceShowAttributes.type_id).filter(
PreferenceShowAttributes.uid == g.user.uid).filter( PreferenceShowAttributes.uid == current_user.uid).filter(
PreferenceShowAttributes.deleted.is_(False)).group_by(PreferenceShowAttributes.type_id).all() \ PreferenceShowAttributes.deleted.is_(False)).group_by(PreferenceShowAttributes.type_id).all() \
if instance else [] if instance else []
tree_types = PreferenceTreeView.get_by(uid=g.user.uid, to_dict=False) if tree else [] tree_types = PreferenceTreeView.get_by(uid=current_user.uid, to_dict=False) if tree else []
type_ids = list(set([i.type_id for i in types + tree_types])) type_ids = list(set([i.type_id for i in types + tree_types]))
return [CITypeCache.get(type_id).to_dict() for type_id in type_ids] return [CITypeCache.get(type_id).to_dict() for type_id in type_ids]
@ -62,7 +62,7 @@ class PreferenceManager(object):
PreferenceShowAttributes.deleted.is_(False)).group_by( PreferenceShowAttributes.deleted.is_(False)).group_by(
PreferenceShowAttributes.uid, PreferenceShowAttributes.type_id) PreferenceShowAttributes.uid, PreferenceShowAttributes.type_id)
for i in types: for i in types:
if i.uid == g.user.uid: if i.uid == current_user.uid:
result['self']['instance'].append(i.type_id) result['self']['instance'].append(i.type_id)
if str(i.created_at) > str(result['self']['type_id2subs_time'].get(i.type_id, "")): if str(i.created_at) > str(result['self']['type_id2subs_time'].get(i.type_id, "")):
result['self']['type_id2subs_time'][i.type_id] = i.created_at result['self']['type_id2subs_time'][i.type_id] = i.created_at
@ -72,7 +72,7 @@ class PreferenceManager(object):
if tree: if tree:
types = PreferenceTreeView.get_by(to_dict=False) types = PreferenceTreeView.get_by(to_dict=False)
for i in types: for i in types:
if i.uid == g.user.uid: if i.uid == current_user.uid:
result['self']['tree'].append(i.type_id) result['self']['tree'].append(i.type_id)
if str(i.created_at) > str(result['self']['type_id2subs_time'].get(i.type_id, "")): if str(i.created_at) > str(result['self']['type_id2subs_time'].get(i.type_id, "")):
result['self']['type_id2subs_time'][i.type_id] = i.created_at result['self']['type_id2subs_time'][i.type_id] = i.created_at
@ -91,7 +91,7 @@ class PreferenceManager(object):
attrs = db.session.query(PreferenceShowAttributes, CITypeAttribute.order).join( attrs = db.session.query(PreferenceShowAttributes, CITypeAttribute.order).join(
CITypeAttribute, CITypeAttribute.attr_id == PreferenceShowAttributes.attr_id).filter( CITypeAttribute, CITypeAttribute.attr_id == PreferenceShowAttributes.attr_id).filter(
PreferenceShowAttributes.uid == g.user.uid).filter( PreferenceShowAttributes.uid == current_user.uid).filter(
PreferenceShowAttributes.type_id == type_id).filter( PreferenceShowAttributes.type_id == type_id).filter(
PreferenceShowAttributes.deleted.is_(False)).filter(CITypeAttribute.deleted.is_(False)).filter( PreferenceShowAttributes.deleted.is_(False)).filter(CITypeAttribute.deleted.is_(False)).filter(
CITypeAttribute.type_id == type_id).all() CITypeAttribute.type_id == type_id).all()
@ -120,7 +120,7 @@ class PreferenceManager(object):
@classmethod @classmethod
def create_or_update_show_attributes(cls, type_id, attr_order): def create_or_update_show_attributes(cls, type_id, attr_order):
existed_all = PreferenceShowAttributes.get_by(type_id=type_id, uid=g.user.uid, to_dict=False) existed_all = PreferenceShowAttributes.get_by(type_id=type_id, uid=current_user.uid, to_dict=False)
for x, order in attr_order: for x, order in attr_order:
if isinstance(x, list): if isinstance(x, list):
_attr, is_fixed = x _attr, is_fixed = x
@ -128,13 +128,13 @@ class PreferenceManager(object):
_attr, is_fixed = x, False _attr, is_fixed = x, False
attr = AttributeCache.get(_attr) or abort(404, ErrFormat.attribute_not_found.format("id={}".format(_attr))) attr = AttributeCache.get(_attr) or abort(404, ErrFormat.attribute_not_found.format("id={}".format(_attr)))
existed = PreferenceShowAttributes.get_by(type_id=type_id, existed = PreferenceShowAttributes.get_by(type_id=type_id,
uid=g.user.uid, uid=current_user.uid,
attr_id=attr.id, attr_id=attr.id,
first=True, first=True,
to_dict=False) to_dict=False)
if existed is None: if existed is None:
PreferenceShowAttributes.create(type_id=type_id, PreferenceShowAttributes.create(type_id=type_id,
uid=g.user.uid, uid=current_user.uid,
attr_id=attr.id, attr_id=attr.id,
order=order, order=order,
is_fixed=is_fixed) is_fixed=is_fixed)
@ -148,7 +148,7 @@ class PreferenceManager(object):
@staticmethod @staticmethod
def get_tree_view(): def get_tree_view():
res = PreferenceTreeView.get_by(uid=g.user.uid, to_dict=True) res = PreferenceTreeView.get_by(uid=current_user.uid, to_dict=True)
for item in res: for item in res:
if item["levels"]: if item["levels"]:
ci_type = CITypeCache.get(item['type_id']).to_dict() ci_type = CITypeCache.get(item['type_id']).to_dict()
@ -176,14 +176,14 @@ class PreferenceManager(object):
if i == attr.id or i == attr.name or i == attr.alias: if i == attr.id or i == attr.name or i == attr.alias:
levels[idx] = attr.id levels[idx] = attr.id
existed = PreferenceTreeView.get_by(uid=g.user.uid, type_id=type_id, to_dict=False, first=True) existed = PreferenceTreeView.get_by(uid=current_user.uid, type_id=type_id, to_dict=False, first=True)
if existed is not None: if existed is not None:
if not levels: if not levels:
existed.soft_delete() existed.soft_delete()
return existed return existed
return existed.update(levels=levels) return existed.update(levels=levels)
elif levels: elif levels:
return PreferenceTreeView.create(levels=levels, type_id=type_id, uid=g.user.uid) return PreferenceTreeView.create(levels=levels, type_id=type_id, uid=current_user.uid)
@staticmethod @staticmethod
def get_relation_view(): def get_relation_view():
@ -254,7 +254,7 @@ class PreferenceManager(object):
existed = PreferenceRelationView.get_by(name=name, to_dict=False, first=True) existed = PreferenceRelationView.get_by(name=name, to_dict=False, first=True)
current_app.logger.debug(existed) current_app.logger.debug(existed)
if existed is None: if existed is None:
PreferenceRelationView.create(name=name, cr_ids=cr_ids, uid=g.user.uid, is_public=is_public) PreferenceRelationView.create(name=name, cr_ids=cr_ids, uid=current_user.uid, is_public=is_public)
if current_app.config.get("USE_ACL"): if current_app.config.get("USE_ACL"):
ACLManager().add_resource(name, ResourceTypeEnum.RELATION_VIEW) ACLManager().add_resource(name, ResourceTypeEnum.RELATION_VIEW)
@ -278,7 +278,7 @@ class PreferenceManager(object):
@staticmethod @staticmethod
def get_search_option(**kwargs): def get_search_option(**kwargs):
query = PreferenceSearchOption.get_by(only_query=True) query = PreferenceSearchOption.get_by(only_query=True)
query = query.filter(PreferenceSearchOption.uid == g.user.uid) query = query.filter(PreferenceSearchOption.uid == current_user.uid)
for k in kwargs: for k in kwargs:
if hasattr(PreferenceSearchOption, k) and kwargs[k]: if hasattr(PreferenceSearchOption, k) and kwargs[k]:
@ -288,9 +288,9 @@ class PreferenceManager(object):
@staticmethod @staticmethod
def add_search_option(**kwargs): def add_search_option(**kwargs):
kwargs['uid'] = g.user.uid kwargs['uid'] = current_user.uid
existed = PreferenceSearchOption.get_by(uid=g.user.uid, existed = PreferenceSearchOption.get_by(uid=current_user.uid,
name=kwargs.get('name'), name=kwargs.get('name'),
prv_id=kwargs.get('prv_id'), prv_id=kwargs.get('prv_id'),
ptv_id=kwargs.get('ptv_id'), ptv_id=kwargs.get('ptv_id'),
@ -306,10 +306,10 @@ class PreferenceManager(object):
existed = PreferenceSearchOption.get_by_id(_id) or abort(404, ErrFormat.preference_search_option_not_found) existed = PreferenceSearchOption.get_by_id(_id) or abort(404, ErrFormat.preference_search_option_not_found)
if g.user.uid != existed.uid: if current_user.uid != existed.uid:
return abort(400, ErrFormat.no_permission2) return abort(400, ErrFormat.no_permission2)
other = PreferenceSearchOption.get_by(uid=g.user.uid, other = PreferenceSearchOption.get_by(uid=current_user.uid,
name=kwargs.get('name'), name=kwargs.get('name'),
prv_id=kwargs.get('prv_id'), prv_id=kwargs.get('prv_id'),
ptv_id=kwargs.get('ptv_id'), ptv_id=kwargs.get('ptv_id'),
@ -324,7 +324,7 @@ class PreferenceManager(object):
def delete_search_option(_id): def delete_search_option(_id):
existed = PreferenceSearchOption.get_by_id(_id) or abort(404, ErrFormat.preference_search_option_not_found) existed = PreferenceSearchOption.get_by_id(_id) or abort(404, ErrFormat.preference_search_option_not_found)
if g.user.uid != existed.uid: if current_user.uid != existed.uid:
return abort(400, ErrFormat.no_permission2) return abort(400, ErrFormat.no_permission2)
existed.soft_delete() existed.soft_delete()

7
cmdb-api/api/lib/cmdb/search/ci/db/search.py
View File

@ -7,8 +7,9 @@ import copy
import time import time
from flask import current_app from flask import current_app
from flask import g from flask_login import current_user
from jinja2 import Template from jinja2 import Template
from api.extensions import db from api.extensions import db
from api.lib.cmdb.cache import AttributeCache from api.lib.cmdb.cache import AttributeCache
from api.lib.cmdb.cache import CITypeCache from api.lib.cmdb.cache import CITypeCache
@ -105,7 +106,7 @@ class Search(object):
ci_filter = self.type2filter_perms[ci_type.id].get('ci_filter') ci_filter = self.type2filter_perms[ci_type.id].get('ci_filter')
if ci_filter: if ci_filter:
sub = [] sub = []
ci_filter = Template(ci_filter).render(user=g.user) ci_filter = Template(ci_filter).render(user=current_user)
for i in ci_filter.split(','): for i in ci_filter.split(','):
if i.startswith("~") and not sub: if i.startswith("~") and not sub:
queries.append(i) queries.append(i)
@ -355,7 +356,7 @@ class Search(object):
else: else:
result.append(q) result.append(q)
_is_app_admin = is_app_admin('cmdb') or g.user.username == "worker" _is_app_admin = is_app_admin('cmdb') or current_user.username == "worker"
if result and not has_type and not _is_app_admin: if result and not has_type and not _is_app_admin:
type_q = self.__get_types_has_read() type_q = self.__get_types_has_read()
if id_query: if id_query:

10
cmdb-api/api/lib/http_cli.py
View File

@ -4,16 +4,16 @@
import hashlib import hashlib
import requests import requests
from future.moves.urllib.parse import urlparse
from flask import abort from flask import abort
from flask import g
from flask import current_app from flask import current_app
from flask_login import current_user
from future.moves.urllib.parse import urlparse
def build_api_key(path, params): def build_api_key(path, params):
g.user is not None or abort(403, u"您得登陆才能进行该操作") current_user is not None or abort(403, u"您得登陆才能进行该操作")
key = g.user.key key = current_user.key
secret = g.user.secret secret = current_user.secret
values = "".join([str(params[k]) for k in sorted(params.keys()) values = "".join([str(params[k]) for k in sorted(params.keys())
if params[k] is not None]) if params.keys() else "" if params[k] is not None]) if params.keys() else ""
_secret = "".join([path, secret, values]).encode("utf-8") _secret = "".join([path, secret, values]).encode("utf-8")

17
cmdb-api/api/lib/perm/acl/acl.py
View File

@ -5,8 +5,9 @@ import hashlib
import requests import requests
import six import six
from flask import current_app, g, request from flask import abort, session
from flask import session, abort from flask import current_app, request
from flask_login import current_user
from api.extensions import cache from api.extensions import cache
from api.lib.perm.acl.audit import AuditCRUD from api.lib.perm.acl.audit import AuditCRUD
@ -154,9 +155,9 @@ class ACLManager(object):
if is_app_admin(self.app_id): if is_app_admin(self.app_id):
return True return True
role = self._get_role(g.user.username) role = self._get_role(current_user.username)
role or abort(404, ErrFormat.role_not_found.format(g.user.username)) role or abort(404, ErrFormat.role_not_found.format(current_user.username))
return RoleCRUD.has_permission(role.id, resource_name, resource_type, self.app_id, perm, return RoleCRUD.has_permission(role.id, resource_name, resource_type, self.app_id, perm,
resource_id=resource_id) resource_id=resource_id)
@ -193,9 +194,9 @@ class ACLManager(object):
return user return user
def get_resources(self, resource_type_name=None): def get_resources(self, resource_type_name=None):
role = self._get_role(g.user.username) role = self._get_role(current_user.username)
role or abort(404, ErrFormat.role_not_found.format(g.user.username)) role or abort(404, ErrFormat.role_not_found.format(current_user.username))
rid = role.id rid = role.id
return RoleCRUD.recursive_resources(rid, self.app_id, resource_type_name).get('resources') return RoleCRUD.recursive_resources(rid, self.app_id, resource_type_name).get('resources')
@ -215,7 +216,7 @@ def validate_permission(resources, resource_type, perm, app=None):
return return
if current_app.config.get("USE_ACL"): if current_app.config.get("USE_ACL"):
if g.user.username == "worker": if current_user.username == "worker":
return return
resources = [resources] if isinstance(resources, six.string_types) else resources resources = [resources] if isinstance(resources, six.string_types) else resources
@ -313,7 +314,7 @@ def role_required(role_name, app=None):
return return
if current_app.config.get("USE_ACL"): if current_app.config.get("USE_ACL"):
if getattr(g.user, 'username', None) == "worker": if getattr(current_user, 'username', None) == "worker":
return func(*args, **kwargs) return func(*args, **kwargs)
if role_name not in session.get("acl", {}).get("parentRoles", []) and not is_app_admin(app): if role_name not in session.get("acl", {}).get("parentRoles", []) and not is_app_admin(app):

6
cmdb-api/api/lib/perm/acl/audit.py
View File

@ -9,8 +9,8 @@ from flask_login import current_user
from sqlalchemy import func from sqlalchemy import func
from api.lib.perm.acl import AppCache from api.lib.perm.acl import AppCache
from api.models.acl import AuditRoleLog, AuditResourceLog, AuditPermissionLog, AuditTriggerLog, RolePermission, \ from api.models.acl import AuditPermissionLog, AuditResourceLog, AuditRoleLog, AuditTriggerLog, Permission, Resource, \
Resource, ResourceGroup, Permission, Role, ResourceType ResourceGroup, ResourceType, Role, RolePermission
class AuditScope(str, Enum): class AuditScope(str, Enum):
@ -50,7 +50,7 @@ class AuditCRUD(object):
@staticmethod @staticmethod
def get_current_operate_uid(uid=None): def get_current_operate_uid(uid=None):
user_id = uid or (hasattr(g, 'user') and getattr(g.user, 'uid', None)) \ user_id = uid or (hasattr(g, 'user') and getattr(current_user, 'uid', None)) \
or getattr(current_user, 'user_id', None) or getattr(current_user, 'user_id', None)
if has_request_context() and request.headers.get('X-User-Id'): if has_request_context() and request.headers.get('X-User-Id'):

17
cmdb-api/api/lib/perm/acl/role.py
View File

@ -6,6 +6,7 @@ import time
import six import six
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from sqlalchemy import or_
from api.extensions import db from api.extensions import db
from api.lib.perm.acl.app import AppCRUD from api.lib.perm.acl.app import AppCRUD
@ -212,18 +213,16 @@ class RoleCRUD(object):
@staticmethod @staticmethod
def search(q, app_id, page=1, page_size=None, user_role=True, is_all=False, user_only=False): def search(q, app_id, page=1, page_size=None, user_role=True, is_all=False, user_only=False):
query = db.session.query(Role).filter(Role.deleted.is_(False))
query1 = query.filter(Role.app_id == app_id).filter(Role.uid.is_(None))
query2 = query.filter(Role.app_id.is_(None)).filter(Role.uid.is_(None))
query = query1.union(query2)
if user_role: if user_only: # only user role
query1 = db.session.query(Role).filter(Role.deleted.is_(False)).filter(Role.uid.isnot(None))
query = query.union(query1)
if user_only:
query = db.session.query(Role).filter(Role.deleted.is_(False)).filter(Role.uid.isnot(None)) query = db.session.query(Role).filter(Role.deleted.is_(False)).filter(Role.uid.isnot(None))
else:
query = db.session.query(Role).filter(Role.deleted.is_(False)).filter(
or_(Role.app_id == app_id, Role.app_id.is_(None)))
if not user_role: # only virtual role
query = query.filter(Role.uid.is_(None))
if not is_all: if not is_all:
role_ids = list(HasResourceRoleCache.get(app_id).keys()) role_ids = list(HasResourceRoleCache.get(app_id).keys())
query = query.filter(Role.id.in_(role_ids)) query = query.filter(Role.id.in_(role_ids))

6
cmdb-api/api/lib/perm/acl/user.py
View File

@ -6,7 +6,7 @@ import string
import uuid import uuid
from flask import abort from flask import abort
from flask import g from flask_login import current_user
from api.extensions import db from api.extensions import db
from api.lib.perm.acl.audit import AuditCRUD, AuditOperateType, AuditScope from api.lib.perm.acl.audit import AuditCRUD, AuditOperateType, AuditScope
@ -90,9 +90,9 @@ class UserCRUD(object):
@classmethod @classmethod
def reset_key_secret(cls): def reset_key_secret(cls):
key, secret = cls.gen_key_secret() key, secret = cls.gen_key_secret()
g.user.update(key=key, secret=secret) current_user.update(key=key, secret=secret)
UserCache.clean(g.user) UserCache.clean(current_user)
return key, secret return key, secret

3
cmdb-api/api/lib/perm/auth.py
View File

@ -10,6 +10,7 @@ from flask import current_app
from flask import g from flask import g
from flask import request from flask import request
from flask import session from flask import session
from flask_login import current_user
from flask_login import login_user from flask_login import login_user
from api.lib.perm.acl.acl import ACLManager from api.lib.perm.acl.acl import ACLManager
@ -65,7 +66,7 @@ def _auth_with_key():
def _auth_with_session(): def _auth_with_session():
if isinstance(getattr(g, 'user', None), User): if isinstance(getattr(g, 'user', None), User):
login_user(g.user) login_user(current_user)
return True return True
if "acl" in session and "userName" in (session["acl"] or {}): if "acl" in session and "userName" in (session["acl"] or {}):
login_user(UserCache.get(session["acl"]["userName"])) login_user(UserCache.get(session["acl"]["userName"]))

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

@ -2,6 +2,7 @@
from flask import g from flask import g
from flask import request from flask import request
from flask_login import current_user
from api.lib.decorator import args_required from api.lib.decorator import args_required
from api.lib.decorator import args_validate from api.lib.decorator import args_validate
@ -103,8 +104,8 @@ class ResourceView(APIView):
type_id = request.values.get('type_id') type_id = request.values.get('type_id')
app_id = request.values.get('app_id') app_id = request.values.get('app_id')
uid = request.values.get('uid') uid = request.values.get('uid')
if not uid and hasattr(g, "user") and hasattr(g.user, "uid"): if not uid and hasattr(g, "user") and hasattr(current_user, "uid"):
uid = g.user.uid uid = current_user.uid
resource = ResourceCRUD.add(name, type_id, app_id, uid) resource = ResourceCRUD.add(name, type_id, app_id, uid)

15
cmdb-api/api/views/acl/role.py
View File

@ -2,8 +2,8 @@
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g
from flask import request from flask import request
from flask_login import current_user
from api.lib.decorator import args_required from api.lib.decorator import args_required
from api.lib.decorator import args_validate from api.lib.decorator import args_validate
@ -31,12 +31,9 @@ class RoleView(APIView):
page_size = get_page_size(request.values.get("page_size")) page_size = get_page_size(request.values.get("page_size"))
q = request.values.get('q') q = request.values.get('q')
app_id = request.values.get('app_id') app_id = request.values.get('app_id')
is_all = request.values.get('is_all', True) is_all = request.values.get('is_all', True) in current_app.config.get("BOOL_TRUE")
is_all = True if is_all in current_app.config.get("BOOL_TRUE") else False user_role = request.values.get('user_role', True) in current_app.config.get("BOOL_TRUE")
user_role = request.values.get('user_role', True) user_only = request.values.get('user_only', False) in current_app.config.get("BOOL_TRUE")
user_only = request.values.get('user_only', False)
user_role = True if user_role in current_app.config.get("BOOL_TRUE") else False
user_only = True if user_only in current_app.config.get("BOOL_TRUE") else False
numfound, roles = RoleCRUD.search(q, app_id, page, page_size, user_role, is_all, user_only) numfound, roles = RoleCRUD.search(q, app_id, page, page_size, user_role, is_all, user_only)
@ -160,8 +157,8 @@ class RoleHasPermissionView(APIView):
@auth_with_app_token @auth_with_app_token
def get(self): def get(self):
if not request.values.get('rid'): if not request.values.get('rid'):
role = RoleCache.get_by_name(None, g.user.username) role = RoleCache.get_by_name(None, current_user.username)
role or abort(404, ErrFormat.role_not_found.format(g.user.username)) role or abort(404, ErrFormat.role_not_found.format(current_user.username))
else: else:
role = RoleCache.get(int(request.values.get('rid'))) role = RoleCache.get(int(request.values.get('rid')))

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

@ -13,7 +13,6 @@ from api.lib.decorator import args_required
from api.lib.decorator import args_validate from api.lib.decorator import args_validate
from api.lib.perm.acl.acl import ACLManager from api.lib.perm.acl.acl import ACLManager
from api.lib.perm.acl.acl import role_required from api.lib.perm.acl.acl import role_required
from api.lib.perm.acl.audit import AuditCRUD, AuditOperateType
from api.lib.perm.acl.cache import AppCache from api.lib.perm.acl.cache import AppCache
from api.lib.perm.acl.cache import UserCache from api.lib.perm.acl.cache import UserCache
from api.lib.perm.acl.resp_format import ErrFormat from api.lib.perm.acl.resp_format import ErrFormat
@ -116,7 +115,7 @@ class UserView(APIView):
@role_required("acl_admin") @role_required("acl_admin")
def delete(self, uid): def delete(self, uid):
if g.user.uid == uid: if current_user.uid == uid:
return abort(400, ErrFormat.invalid_operation) return abort(400, ErrFormat.invalid_operation)
UserCRUD.delete(uid) UserCRUD.delete(uid)
@ -163,7 +162,7 @@ class UserResetPasswordView(APIView):
return abort(403, ErrFormat.invalid_request) return abort(403, ErrFormat.invalid_request)
elif hasattr(g, 'user'): elif hasattr(g, 'user'):
if g.user.username != request.values['username']: if current_user.username != request.values['username']:
return abort(403, ErrFormat.invalid_request) return abort(403, ErrFormat.invalid_request)
else: else:

6
cmdb-api/api/views/cmdb/auto_discovery.py
View File

@ -5,8 +5,8 @@ from io import BytesIO
from flask import abort from flask import abort
from flask import current_app from flask import current_app
from flask import g
from flask import request from flask import request
from flask_login import current_user
from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCICRUD from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCICRUD
from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCITypeCRUD from api.lib.cmdb.auto_discovery.auto_discovery import AutoDiscoveryCITypeCRUD
@ -119,7 +119,7 @@ class AutoDiscoveryCITypeView(APIView):
_, res = AutoDiscoveryCITypeCRUD.search(page=1, page_size=100000, type_id=type_id, **request.values) _, res = AutoDiscoveryCITypeCRUD.search(page=1, page_size=100000, type_id=type_id, **request.values)
for i in res: for i in res:
if isinstance(i.get("extra_option"), dict) and i['extra_option'].get('secret'): if isinstance(i.get("extra_option"), dict) and i['extra_option'].get('secret'):
if not (g.user.username == "cmdb_agent" or g.user.uid == i['uid']): if not (current_user.username == "cmdb_agent" or current_user.uid == i['uid']):
i['extra_option'].pop('secret', None) i['extra_option'].pop('secret', None)
else: else:
i['extra_option']['secret'] = AESCrypto.decrypt(i['extra_option']['secret']) i['extra_option']['secret'] = AESCrypto.decrypt(i['extra_option']['secret'])
@ -213,7 +213,7 @@ class AutoDiscoveryRuleSyncView(APIView):
url_prefix = ("/adt/sync",) url_prefix = ("/adt/sync",)
def get(self): def get(self):
if g.user.username not in ("cmdb_agent", "worker", "admin"): if current_user.username not in ("cmdb_agent", "worker", "admin"):
return abort(403) return abort(403)
oneagent_name = request.values.get('oneagent_name') oneagent_name = request.values.get('oneagent_name')

7
cmdb-api/autoapp.py
View File

@ -1,14 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Create an application instance.""" """Create an application instance."""
from flask import g
from flask_login import current_user
from api.app import create_app from api.app import create_app
app = create_app() app = create_app()
@app.before_request
def before_request():
g.user = current_user

29
cmdb-api/requirements.txt
View File

@ -2,7 +2,6 @@
alembic==1.7.7 alembic==1.7.7
amqp==2.6.1 amqp==2.6.1
aniso8601==9.0.1 aniso8601==9.0.1
APScheduler==3.10.1
attrs==23.1.0 attrs==23.1.0
backports.zoneinfo==0.2.1 backports.zoneinfo==0.2.1
bcrypt==4.0.1 bcrypt==4.0.1
@ -20,22 +19,22 @@ elasticsearch==7.17.9
email-validator==1.3.1 email-validator==1.3.1
environs==4.2.0 environs==4.2.0
flasgger==0.9.5 flasgger==0.9.5
Flask==1.0.3 Flask==2.3.2
Flask-APScheduler==1.12.4 Flask-Bcrypt==1.0.1
Flask-Bcrypt==0.7.1
Flask-Caching==2.0.2 Flask-Caching==2.0.2
Flask-Cors==4.0.0 Flask-Cors==4.0.0
Flask-Login==0.4.1 Flask-Login==0.6.2
Flask-Migrate==2.5.2 Flask-Migrate==2.5.2
Flask-RESTful==0.3.7 Flask-RESTful==0.3.10
Flask-SQLAlchemy==2.4.0 Flask-SQLAlchemy==2.5.0
future==0.18.2 future==0.18.2
gunicorn==19.5.0 gunicorn==21.0.1
idna==3.4 idna==3.4
importlib-metadata==6.8.0 importlib-metadata==6.8.0
importlib-resources==6.0.0 importlib-resources=
itsdangerous==2.0.1 =6.0.0
Jinja2==3.0.1 itsdangerous==2.1.2
Jinja2==3.1.2
jinja2schema==0.1.4 jinja2schema==0.1.4
jsonschema==4.18.0 jsonschema==4.18.0
jsonschema-specifications==2023.6.1 jsonschema-specifications==2023.6.1
@ -47,13 +46,13 @@ meld3==2.0.1
mistune==3.0.1 mistune==3.0.1
more-itertools==5.0.0 more-itertools==5.0.0
msgpack-python==0.5.6 msgpack-python==0.5.6
Pillow==9.2.0 Pillow==9.3.0
pkgutil_resolve_name==1.3.10 pkgutil_resolve_name==1.3.10
pyasn1==0.5.0 pyasn1==0.5.0
pyasn1-modules==0.3.0 pyasn1-modules==0.3.0
pycryptodome==3.12.0 pycryptodome==3.12.0
PyJWT==2.4.0 PyJWT==2.4.0
PyMySQL==0.9.3 PyMySQL==1.1.0
python-dateutil==2.8.2 python-dateutil==2.8.2
python-dotenv==1.0.0 python-dotenv==1.0.0
python-ldap==3.4.0 python-ldap==3.4.0
@ -65,7 +64,7 @@ requests==2.31.0
rpds-py==0.8.8 rpds-py==0.8.8
six==1.12.0 six==1.12.0
soupsieve==2.4.1 soupsieve==2.4.1
SQLAlchemy==1.3.5 SQLAlchemy==1.4.49
supervisor==4.0.3 supervisor==4.0.3
timeout-decorator==0.5.0 timeout-decorator==0.5.0
toposort==1.10 toposort==1.10
@ -73,6 +72,6 @@ treelib==1.6.1
tzlocal==5.0.1 tzlocal==5.0.1
urllib3==1.26.16 urllib3==1.26.16
vine==1.3.0 vine==1.3.0
Werkzeug==0.15.5 Werkzeug==2.3.6
WTForms==3.0.0 WTForms==3.0.0
zipp==3.16.0 zipp==3.16.0

1
cmdb-api/tests/sample.py
View File

@ -3,6 +3,7 @@
import uuid import uuid
import random import random
from api.models.cmdb import ( from api.models.cmdb import (
Attribute, Attribute,
CIType, CIType,