valar 1.3.6__tar.gz → 1.3.7__tar.gz

{valar-1.3.6/src/valar.egg-info → valar-1.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.6
+Version: 1.3.7
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP

{valar-1.3.6 → valar-1.3.7}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
 
-version = "1.3.6"
+version = "1.3.7"
 
 requires = [
     'channels==3.0.3',

valar-1.3.7/src/valar/auth/Authentication.py

@@ -0,0 +1,50 @@
+import jwt
+from django.conf import settings
+
+from ..classes.valar_response import ValarResponse
+
+
+class ValaAuthError(Exception):
+    def __init__(self, message, code):
+        self.code = code
+        self.message = message
+
+
+def auth_required(view_func):
+    def wrapper(request, *args, **kwargs):
+        try:
+            payload = valid_request_token(request)
+            request.user_id = payload["user_id"]
+            return view_func(request, *args, **kwargs)
+        except ValaAuthError as e:
+            return ValarResponse(False, e.message, e.code, status=401)
+
+    return wrapper
+
+
+def get_token_from_request(request):
+    auth_header = request.headers.get("Authorization")
+    if auth_header and auth_header.startswith("Bearer "):
+        return auth_header.split(" ")[1]
+    return None
+
+
+status = {
+    0: (None, None, None),
+    1: ('请登录系统', 'info', 401),
+    2: ('状态已过期，请重新登录', 'warning', 401),
+    3: ('错误状态，请重新登录', 'error', 401),
+}
+
+
+def valid_request_token(request):
+    token = get_token_from_request(request)
+    if not token: raise ValaAuthError('请登录系统', 'info')
+    try:
+        payload = jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
+        payload['token'] = token
+        return payload
+    except jwt.ExpiredSignatureError:
+        raise ValaAuthError('状态已过期，请重新登录', 'warning')
+    except jwt.InvalidTokenError:
+        raise ValaAuthError('错误状态，请重新登录', 'error')

{valar-1.3.6 → valar-1.3.7}/src/valar/auth/Middleware.py

@@ -4,25 +4,29 @@ import json
 from django.http import HttpRequest
 from django.utils.deprecation import MiddlewareMixin
 
-from ..auth.Authentication import validate
+from ..auth.Authentication import valid_request_token, ValaAuthError
 from ..classes.valar_response import ValarResponse
 
 
 class ValarMiddleware(MiddlewareMixin):
     @staticmethod
     def process_response(request: HttpRequest, response: ValarResponse):
-        auth = request.headers.get("Auth")
-        if auth:
-            payload, _ = validate(request)
-            if not payload:
+        try:
+            payload = valid_request_token(request)
+            response["token"] = payload['token'] or '~~~'
+            """此处可以加入数据级别的权限验证"""
+        except ValaAuthError as e:
+            if request.headers.get("Auth"):
                 return ValarResponse(False, '无效权限', 'error', status=403)
+
         if type(response) == ValarResponse:
             valar_message, valar_code = response.valar_message, response.valar_code
             data = {
                 'payload': json.loads(response.content),
                 'message': valar_message,
-                'code': valar_code
+                'code': valar_code,
             }
             response.content = json.dumps(data, ensure_ascii=False).encode("utf-8")
             response["Content-Type"] = "application/json; charset=utf-8"
+
         return response

{valar-1.3.6 → valar-1.3.7}/src/valar/channels/sender.py

@@ -7,7 +7,7 @@ from channels.layers import get_channel_layer
 from django.http import HttpRequest
 import threading
 from .consumer import VALAR_CHANNEL_GROUP
-from ..auth.Authentication import validate
+from ..auth.Authentication import valid_request_token
 
 
 class Channel:
@@ -19,6 +19,7 @@ class Channel:
         self.auth = body.get('auth')
         self.broadcast = body.get('broadcast')
         self.data = body.get('data')
+        self.resolve = body.get('resolve')
 
     def to_dict(self, status, payload):
         data = {
@@ -26,6 +27,7 @@ class Channel:
             'url': self.url,
             'auth': self.auth,
             'broadcast': self.broadcast,
+            'resolve': self.resolve,
             'timestamp': datetime.now().timestamp()
         }
         if status:
@@ -55,9 +57,8 @@ class ValarChannelSender(Sender):
         self.__lock__ = threading.Lock()
         self.__interval__ = interval
         if self.__channel__.auth:
-            payload, _ = validate(request)
-            if payload is None:
-                raise Exception('Unauthorized!')
+            payload = valid_request_token(request)
+            self.user_id = payload["user_id"]
 
     def _run(self):
         while self.__loading__:

{valar-1.3.6 → valar-1.3.7}/src/valar/classes/valar_minio.py

@@ -6,20 +6,22 @@ from urllib3 import BaseHTTPResponse
 from ..classes.singleton_meta import SingletonMeta
 
 
-class ValarMinio(metaclass=SingletonMeta):
+class ValarMinio:
 
     def __init__(self, client, entity):
         self.client = client
         self.bucket_name = f'{settings.BASE_DIR.name}.{entity}'.replace('_', '-').lower()
-        if client and not self.client.bucket_exists(self.bucket_name):
-            self.client.make_bucket(self.bucket_name)
-            self.client.set_bucket_policy(self.bucket_name, self.__generate_policy__())
 
     @staticmethod
     def get_object_name(_id, prop, file_name):
         return f"{_id}-{prop}-{file_name}"
 
     def upload(self, object_name, _bytes):
+        if not self.client:
+            raise Exception('未配置Minio')
+        if not self.client.bucket_exists(self.bucket_name):
+            self.client.make_bucket(self.bucket_name)
+            self.client.set_bucket_policy(self.bucket_name, self.__generate_policy__())
         file_data = BytesIO(_bytes)
         file_size = len(_bytes)  # file.siz
         self.client.put_object(

{valar-1.3.6 → valar-1.3.7}/src/valar/dao/orm_dao.py

@@ -2,16 +2,19 @@ import datetime
 import json
 
 from django.core.paginator import Paginator
+from django.db.models.options import Options
 
 from .abstract import AbstractDao
 from .query import Query
-from django.db.models import ManyToOneRel, ForeignKey, ManyToManyRel, ManyToManyField, OneToOneField, OneToOneRel
+from django.db.models import ManyToOneRel, ForeignKey, ManyToManyRel, ManyToManyField, OneToOneField, OneToOneRel, \
+    CharField, BooleanField, FloatField, IntegerField, BigAutoField
 from django.db.models import QuerySet
 from django.db.models import Manager
 from django.db.models.fields.files import FieldFile
 from django.forms import FileField
 
 from ..dao.orm_field import OrmField
+from ..models.auth import Account
 from ..models.core import VTree, VModel
 from ..models.meta import MetaField
 
@@ -150,12 +153,13 @@ class OrmDao(AbstractDao):
                 m2m.clear()
                 m2m.add(*value)
             elif clazz == ManyToOneRel:
-                getattr(bean, model_field.get_accessor_name()).clear()
-                remote_model: VModel = model_field.related_model
-                new_set: QuerySet = remote_model.objects.filter(id__in=value)
-                remote_field: ForeignKey = model_field.remote_field
-                k = remote_field.get_attname()
-                new_set.update(**{k: bean.id})
+                pass
+                # getattr(bean, model_field.get_accessor_name()).clear()
+                # remote_model: VModel = model_field.related_model
+                # new_set: QuerySet = remote_model.objects.filter(id__in=value)
+                # remote_field: ForeignKey = model_field.remote_field
+                # k = remote_field.get_attname()
+                # new_set.update(**{k: bean.id})
             elif clazz == ManyToManyRel:
                 getattr(bean, model_field.get_accessor_name()).clear()
                 remote_model: VModel = model_field.related_model
@@ -207,6 +211,7 @@ class OrmDao(AbstractDao):
         # 简单字段取值
         simple_props = [field.prop for field in meta_fields if field.domain not in __referred_domains__]
         custom_props = __get_custom_props__(self.entity, code)
+
         results = list(query_set.filter().values(*[*simple_props, *custom_props]))
         __set_simple_values__(meta_fields, results)
         # 关系型字段取值
@@ -216,9 +221,72 @@ class OrmDao(AbstractDao):
         for meta_field in referred_fields:
             manager: Manager = query_set.model.objects
             qs = manager.filter(id__in=pks)
-            __linkage__(meta_field, qs, mapping)
+            self.__linkage__(meta_field, qs, mapping)
         return results
 
+    def __linkage__(self, meta_field: OrmField, query_set: QuerySet, mapping):
+        model_field = meta_field.model_field
+        prop = model_field.name
+        multiple = meta_field.domain in __multiple_domains__
+
+        # 获取级联关系的键索引
+        ref_prop = f'{prop}__id'
+        edges = query_set.exclude(**{f'{ref_prop}__isnull': True}).values('id', ref_prop)
+        if multiple:
+            related_primary_keys = set()
+            results_mapping = {}
+            for edge in edges:
+                _id, rid = edge['id'], edge[ref_prop]
+                related_primary_keys.add(rid)
+                array = results_mapping.get(_id, [])
+                array.append(rid)
+                results_mapping[_id] = array
+        else:
+            results_mapping = {row['id']: row[ref_prop] for row in edges if row[ref_prop]}
+            related_primary_keys = set(results_mapping.values())
+
+        # 获取级联关系从属方的数据
+        related_model = model_field.related_model
+        related_fields = related_model._meta.get_fields()
+        related_props = self.__get_related_props__(related_fields)
+        related_values = list(related_model.objects.filter(id__in=related_primary_keys).values(*related_props))
+        __set_simple_values__(related_fields, related_values)
+        related_mapping = {item['id']: item for item in related_values}
+
+        # 将从属方的数据绑定在主数据上
+        for _id in mapping:
+            row = mapping[_id]
+            if multiple:
+                keys = results_mapping.get(_id, [])
+                items = [related_mapping[pid] for pid in keys]
+                row[prop] = keys
+                row[f'{prop}_set'] = items
+            else:
+                key = results_mapping.get(_id)
+                item = related_mapping.get(key) if key else None
+                row[prop] = item
+                row[f'{prop}_id'] = key
+
+    def __get_related_props__(self, fields):
+        array = []
+        for field in fields:
+            domain = type(field).__name__
+            prop = field.name
+            if field.name in __omit_field_props__ or domain in __multiple_domains__:
+                continue
+            if domain in __referred_domains__:
+                field: ForeignKey = field
+                model = field.related_model
+                meta: Options = model._meta
+                if meta.label != self.entity and meta.label != 'valar.Account':
+                    _fields = meta.get_fields()
+                    for _field in _fields:
+                        if type(_field) in [CharField, BooleanField, FloatField, IntegerField, BigAutoField]:
+                            array.append(f'{prop}__{_field.name}')
+            else:
+                array.append(prop)
+        return array
+
 
 """ 以下为静态方法和变量 """
 
@@ -254,52 +322,6 @@ def __set_simple_values__(fields, values):
         for prop in json_props:
             row[prop] = json.loads(row[prop]) if type(row[prop]) is str else row[prop]
 
-
-def __get_related_props__(fields):
-    def fun(field): return type(field).__name__ not in __referred_domains__ and field.name not in __omit_field_props__
-
-    return [field.name for field in fields if fun(field)]
-
-
-def __linkage__(meta_field: OrmField, query_set: QuerySet, mapping):
-    model_field = meta_field.model_field
-    prop = model_field.name
-    multiple = meta_field.domain in __multiple_domains__
-
-    # 获取级联关系的键索引
-    ref_prop = f'{prop}__id'
-    edges = query_set.exclude(**{f'{ref_prop}__isnull': True}).values('id', ref_prop)
-    if multiple:
-        related_primary_keys = set()
-        results_mapping = {}
-        for edge in edges:
-            _id, rid = edge['id'], edge[ref_prop]
-            related_primary_keys.add(rid)
-            array = results_mapping.get(_id, [])
-            array.append(rid)
-            results_mapping[_id] = array
-    else:
-        results_mapping = {row['id']: row[ref_prop] for row in edges if row[ref_prop]}
-        related_primary_keys = set(results_mapping.values())
-
-    # 获取级联关系从属方的数据
-    related_model = model_field.related_model
-    related_fields = related_model._meta.get_fields()
-    related_props = __get_related_props__(related_fields)
-    related_values = list(related_model.objects.filter(id__in=related_primary_keys).values(*related_props))
-    __set_simple_values__(related_fields, related_values)
-    related_mapping = {item['id']: item for item in related_values}
-
-    # 将从属方的数据绑定在主数据上
-    for _id in mapping:
-        row = mapping[_id]
-        if multiple:
-            keys = results_mapping.get(_id, [])
-            items = [related_mapping[pid] for pid in keys]
-            row[prop] = keys
-            row[f'{prop}_set'] = items
-        else:
-            key = results_mapping.get(_id)
-            item = related_mapping.get(key) if key else None
-            row[prop] = item
-            row[f'{prop}_id'] = key
+    # def fun(field): return type(field).__name__ not in __referred_domains__ and field.name not in __omit_field_props__
+    #
+    # return [field.name for field in fields if fun(field)]

{valar-1.3.6 → valar-1.3.7}/src/valar/models/auth.py

@@ -34,6 +34,7 @@ class Menu(VTree):
     path = models.CharField(max_length=255, null=True, verbose_name='地址')
     roles = models.ManyToManyField(Role)
     is_admin = models.BooleanField(null=True, default=False, verbose_name='超管权限')
+    is_auth = models.BooleanField(null=True, default=False, verbose_name='需要登录')
 
     class Meta:
         verbose_name = '菜单'

{valar-1.3.6 → valar-1.3.7}/src/valar/models/meta.py

@@ -88,3 +88,8 @@ class MetaField(VModel):
 
     class Meta:
         verbose_name = '视图字段'
+
+
+class MetaViewDefault(VModel):
+    class Meta:
+        verbose_name = '元数据字段类型'

{valar-1.3.6 → valar-1.3.7}/src/valar/views/auth.py

@@ -41,18 +41,17 @@ def sign_in(request):
                 })
     return ValarResponse(jwt.encode({
         "user_id": account.id,
-        "exp": datetime.datetime.utcnow() + datetime.timedelta(hours=2)
+        "exp": datetime.datetime.utcnow() + datetime.timedelta(hours=5)
     }, settings.SECRET_KEY, algorithm="HS256"))
 
 
 def free_menus(request):
     body = json.loads(request.body)
     scope = body.get("scope", 'admin')
-    menus = Menu.objects.filter(isLeaf=True, scope=scope, is_admin=False, path__isnull=False,
-                                roles__isnull=True).values('path')
-    payload = {
-        "permissions": [m['path'] for m in menus]
-    }
+    menus = Menu.objects.filter(
+        isLeaf=True, scope=scope, is_admin=False, path__isnull=False, is_auth=False,
+        roles__isnull=True).values('path')
+    payload = {"permissions": [m['path'] for m in menus]}
     token = jwt.encode(payload, settings.SECRET_KEY, algorithm="HS256")
     return ValarResponse(token)
 
@@ -104,6 +103,7 @@ def user_profile(request):
         if hasattr(account, accessor):
             user = getattr(account, accessor)
             name = getattr(user, 'name')
-            payload.update({'name': name})
+            key = getattr(user, 'id')
+            payload.update({'name': name, 'user_key': key})
     token = jwt.encode(payload, settings.SECRET_KEY, algorithm="HS256")
     return ValarResponse(token)

{valar-1.3.6 → valar-1.3.7}/src/valar/views/file.py

@@ -17,6 +17,7 @@ def save_file(request, db, entity):
     dao = Dao(entity, db)
     engine = ValarEngine().get_minio_bucket(entity)
     item = dao.find_one(_id)
+
     if engine is None or item is None:
         return ValarResponse(False)
     old_value = getattr(item, prop)

{valar-1.3.6 → valar-1.3.7}/src/valar/views/rest.py

@@ -1,5 +1,7 @@
 import json
 
+from django.db.models import QuerySet
+
 from .handler import batch_handler
 from ..channels.executer import execute_channel
 from ..channels.sender import ValarChannelSender
@@ -71,13 +73,13 @@ def search(request, db, entity):
     size = body.get('size')
     page = body.get('page')
     root = body.get('root')
-
-    print(root, 'root', entity)
-
     code = body.get('code', 'default')
     conditions = body.get('conditions')
     dao = Dao(entity, db)
 
+    qs, _ = dao.find(conditions)
+    qs.filter(saved=False).delete()
+
     if _type == 'tree':
         query_set = dao.tree(root, conditions)
         total = query_set.count()

{valar-1.3.6 → valar-1.3.7/src/valar.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valar
-Version: 1.3.6
+Version: 1.3.7
 Summary: valar for morghulis
 Home-page: https://gitee.com/GRIFFIN120/valar_dev
 Author: LYP

valar-1.3.6/src/valar/auth/Authentication.py

@@ -1,32 +0,0 @@
-import jwt
-from django.conf import settings
-
-from ..classes.valar_response import ValarResponse
-
-
-def auth_required(view_func):
-    def wrapper(request, *args, **kwargs):
-        payload, response = validate(request)
-        if payload:
-            request.user_id = payload["user_id"]
-            return view_func(request, *args, **kwargs)
-        else:
-            return response
-
-    return wrapper
-
-
-def validate(request):
-    auth_header = request.headers.get("Authorization")
-    if not auth_header or not auth_header.startswith("Bearer "):
-        return None, ValarResponse(False, '请登录系统', 'info', status=401)
-    token = auth_header.split(" ")[1]
-    if not token:
-        return None, ValarResponse(False, status=401)
-    try:
-        payload = jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
-        return payload, ValarResponse(False)
-    except jwt.ExpiredSignatureError:
-        return None, ValarResponse(False, '状态已过期，请重新登录', 'warning', status=401)
-    except jwt.InvalidTokenError:
-        return None, ValarResponse(False, '错误状态，请重新登录', 'error', status=401)