xtn-tools-pro 1.0.1.2.9__tar.gz → 1.0.1.3.1__tar.gz

{xtn-tools-pro-1.0.1.2.9/xtn_tools_pro.egg-info → xtn-tools-pro-1.0.1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.1.2.9
+Version: 1.0.1.3.1
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn-tools-pro-1.0.1.2.9 → xtn-tools-pro-1.0.1.3.1}/setup.py

@@ -15,7 +15,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="xtn-tools-pro",  # 模块名称
-    version="1.0.1.2.9",  # 版本
+    version="1.0.1.3.1",  # 版本
     author="xtn",  # 作者
     author_email="czw011122@gmail.com",  # 作者邮箱
     description="xtn 开发工具",  # 模块简介

xtn-tools-pro-1.0.1.3.1/xtn_tools_pro/utils/crypto_pro.py

@@ -0,0 +1,161 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# 说明：
+#    加解密、编解码
+# History:
+# Date          Author    Version       Modification
+# --------------------------------------------------------------------------------------------------
+# 2024/5/13    xiatn     V00.01.000    新建
+# --------------------------------------------------------------------------------------------------
+import jwt
+import time
+import json
+import pyotp
+import base64
+import hashlib
+import secrets
+from Crypto.PublicKey import RSA
+from Crypto.Cipher import AES, PKCS1_OAEP
+from Crypto.Util.Padding import pad, unpad
+from Crypto.Random import get_random_bytes
+
+
+class XtnDeEnAir:
+    BLOCK_SIZE = AES.block_size
+
+    @staticmethod
+    def de_data(key: bytes, raw: dict) -> str:
+        """
+            加密
+        """
+        cipher = AES.new(key, AES.MODE_ECB)
+        raw["time"] = int(time.time())
+        raw_s = json.dumps(raw)
+        padded_data = pad(raw_s.encode('utf-8'), XtnDeEnAir.BLOCK_SIZE)
+        enc = cipher.encrypt(padded_data)
+        result = base64.b64encode(enc).decode('utf-8')
+        return result
+
+    @staticmethod
+    def en_data(key: bytes, raw: str) -> str:
+        """
+            解密
+        """
+        cipher = AES.new(key, AES.MODE_ECB)
+        enc = base64.b64decode(raw)
+        decrypted = cipher.decrypt(enc)
+        result = unpad(decrypted, XtnDeEnAir.BLOCK_SIZE).decode('utf-8')
+        return result
+
+
+class XtnDeEnPro:
+    BLOCK_SIZE = AES.block_size
+
+    @staticmethod
+    def encrypt_dict(key: bytes, raw: dict) -> str:
+        """
+            加密
+        """
+        raw["encrypt_time"] = int(time.time())
+        raw_json = json.dumps(data).encode('utf-8')
+        padded_data = pad(raw_json, XtnDeEnPro.BLOCK_SIZE)
+        iv = get_random_bytes(XtnDeEnPro.BLOCK_SIZE)
+        cipher = AES.new(key, AES.MODE_CBC, iv)
+        encrypted = cipher.encrypt(padded_data)
+        combined = iv + encrypted
+        result = base64.b64encode(combined).decode('utf-8')
+        # result = combined.hex() # hex
+        return result
+
+    @staticmethod
+    def decrypt_dict(key: bytes, raw: str) -> dict:
+        """
+            解密
+        """
+        try:
+            combined = base64.b64decode(raw)
+            # combined = bytes.fromhex("") # hex
+            iv = combined[:XtnDeEnPro.BLOCK_SIZE]
+            encrypted = combined[XtnDeEnPro.BLOCK_SIZE:]
+            cipher = AES.new(key, AES.MODE_CBC, iv)
+            decrypted = unpad(cipher.decrypt(encrypted), XtnDeEnPro.BLOCK_SIZE)
+            result = decrypted.decode('utf-8')
+            return json.loads(result)
+        except (ValueError, KeyError, json.JSONDecodeError) as e:
+            raise ValueError(f"解密失败: {e}")
+
+
+class XtnDeEnProMax:
+    BLOCK_SIZE = AES.block_size
+
+    @staticmethod
+    def encrypt_dict(key: bytes, raw: dict) -> str:
+        """
+            加密
+        """
+        session_key = get_random_bytes(16)
+
+        rsa_key = RSA.import_key(key)
+        rsa_cipher = PKCS1_OAEP.new(rsa_key)
+        encrypted_session_key = rsa_cipher.encrypt(session_key)
+
+        iv = get_random_bytes(16)
+        aes_cipher = AES.new(session_key, AES.MODE_CBC, iv)
+        raw["encrypt_time"] = int(time.time())
+        raw_data = json.dumps(raw).encode('utf-8')
+        encrypted_data = aes_cipher.encrypt(pad(raw_data, XtnDeEnProMax.BLOCK_SIZE))
+
+        combined = (
+                len(encrypted_session_key).to_bytes(2, 'big') +
+                encrypted_session_key +
+                iv +
+                encrypted_data
+        )
+
+        result_base64 = base64.b64encode(combined).decode()
+        # result_hex = combined.hex()  # hex
+        return result_base64
+
+    @staticmethod
+    def decrypt_dict(key: bytes, raw: str) -> dict:
+        """
+            解密
+        """
+        try:
+            combined = base64.b64decode(raw)
+            key_len = int.from_bytes(combined[:2], 'big')
+            encrypted_session_key = combined[2:2 + key_len]
+            iv = combined[2 + key_len:2 + key_len + 16]
+            encrypted_data = combined[2 + key_len + 16:]
+
+            rsa_key = RSA.import_key(key)
+            rsa_cipher = PKCS1_OAEP.new(rsa_key)
+            session_key = rsa_cipher.decrypt(encrypted_session_key)
+
+            aes_cipher = AES.new(session_key, AES.MODE_CBC, iv)
+            decrypted = unpad(aes_cipher.decrypt(encrypted_data), XtnDeEnProMax.BLOCK_SIZE)
+            result = decrypted.decode('utf-8')
+            return json.loads(result)
+        except (ValueError, KeyError, json.JSONDecodeError) as e:
+            raise ValueError(f"解密失败: {e}")
+
+
+if __name__ == '__main__':
+    key = b"d9fe4b29dc7decc8360e72e7dd15a5c8"
+    data = {
+        "task_type": "update_name",
+        "task_client": "tiktok",
+    }
+    sss = XtnDeEnAir.de_data(key, data)
+    print(sss)
+    print(XtnDeEnAir.en_data(key, sss))
+
+    key_pair = RSA.generate(2048)
+    private_key = key_pair.export_key()
+    public_key = key_pair.publickey().export_key()
+    print(private_key)
+    print(public_key)
+    sss = XtnDeEnProMax.encrypt_dict(public_key, data)
+    print(sss)
+    print(XtnDeEnProMax.decrypt_dict(private_key, sss))

{xtn-tools-pro-1.0.1.2.9 → xtn-tools-pro-1.0.1.3.1}/xtn_tools_pro/utils/log.py

@@ -118,7 +118,7 @@ class Log:
             # 记录当前的日期，用于之后检查日期是否已经改变
             self.current_date = get_time_timestamp_to_datestr(format="%Y_%m_%d")
             # 记录日志文件的路径模板，用于之后创建新的日志文件
-            self.path_template = f"logs/{{date}}/{name}.log"
+            self.path_template = f"{path}/logs/{{date}}/{name}.log"
             path = self.path_template.format(date=self.current_date)
             # print(path)
             if is_write_to_file:

{xtn-tools-pro-1.0.1.2.9 → xtn-tools-pro-1.0.1.3.1/xtn_tools_pro.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.1.2.9
+Version: 1.0.1.3.1
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@gmail.com

{xtn-tools-pro-1.0.1.2.9 → xtn-tools-pro-1.0.1.3.1}/xtn_tools_pro.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ xtn_tools_pro/task_pro/go_fun_v3.py
 xtn_tools_pro/utils/__init__.py
 xtn_tools_pro/utils/audio_video.py
 xtn_tools_pro/utils/crypto.py
+xtn_tools_pro/utils/crypto_pro.py
 xtn_tools_pro/utils/file_utils.py
 xtn_tools_pro/utils/helpers.py
 xtn_tools_pro/utils/log.py