gomyck-tools 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

ctools/api_result.py

@@ -2,8 +2,6 @@ from ctools import cjson
 
 cjson.str_value_keys = [
   "obj_id",
-  "script_id",
-  "template_id"
 ]
 
 

ctools/cjson.py

@@ -6,7 +6,7 @@ jsonpickle.set_preferred_backend('json')
 jsonpickle.set_encoder_options('json', ensure_ascii=False)
 jsonpickle.set_decoder_options('json')
 
-def dumps(obj) -> str:
+def dumps(obj, **kwargs) -> str:
   """
   将对象转换为json字符串
   :param obj: 对象
@@ -14,18 +14,18 @@ def dumps(obj) -> str:
   """
   if obj is None: return None
   if type(obj) == str: return obj
-  return f'{jsonpickle.encode(obj, unpicklable=False)}'
+  return f'{jsonpickle.encode(obj, unpicklable=False, make_refs=False, **kwargs)}'
 
-def loads(json_str: str) -> dict:
+def loads(json_str: str, **kwargs) -> dict:
   """
   将json字符串转换为对象
   :param json_str: json 字符串
   :return: 对象
   """
-  return jsonpickle.decode(json_str)
+  return jsonpickle.decode(json_str, **kwargs)
 
 def unify_to_str(json_str: str) -> str:
-  if not str_value_keys: return json_str
+  if not str_value_keys and len(str_value_keys) == 0: return json_str
   obj = loads(json_str)
   if isinstance(obj, list):
     _handle_list(obj)

ctools/date_utils.py

@@ -30,7 +30,7 @@ def get_file_time():
   获取 %Y-%m-%d %H:%M:%S 文件格式时间
   :return:
   """
-  return time.strftime('%Y-%m-%d_%H-%M-%S', time.localtime(time.time()))
+  return time.strftime('%Y-%m-%d_%H-%M-%S-%s', time.localtime(time.time()))
 
 def get_timestamp(offset=0):
   return int(time.time() + offset)

ctools/dict_wrapper.py

@@ -6,7 +6,9 @@ __date__ = '2024/10/25 09:42'
 class DictWrapper(dict):
   def __getattr__(self, key):
     res = self.get(key)
-    if type(res) == dict:
+    if res is None:
+      raise AttributeError(f"'{key}' not found in this Entity")
+    if isinstance(res, dict):
       return DictWrapper(res)
     return res
 

ctools/rsa.py

@@ -0,0 +1,70 @@
+import base64
+
+from Crypto.Cipher import PKCS1_OAEP
+from Crypto.PublicKey import RSA
+from Crypto.Signature import pkcs1_15
+from Crypto.Hash import SHA256
+
+from ctools import work_path, cjson
+
+ENCRYPT_CHUNK_SIZE = 245
+decrypt_CHUNK_SIZE = 512
+
+def generate_rsa_keypair(bits=2048):
+  key = RSA.generate(bits)
+  private_key = key.export_key()  # 导出私钥
+  public_key = key.publickey().export_key()  # 导出公钥
+  with open("private_key.pem", "wb") as f:
+    f.write(private_key)
+  with open("public_key.pem", "wb") as f:
+    f.write(public_key)
+
+def loadLicenseInfo(auth_code):
+  with open(work_path.get_app_path() + '/keys/license.key', 'r') as pri:
+    decrypt_message = decrypt(auth_code.strip(), pri.read())
+    return cjson.loads(decrypt_message)
+
+# 加密函数
+def encrypt(msg, public_key):
+  parts = b''
+  public_key = RSA.import_key(public_key)
+  cipher = PKCS1_OAEP.new(public_key)
+  for i in range(0, len(msg), ENCRYPT_CHUNK_SIZE):
+    parts += cipher.encrypt(msg[i:i + ENCRYPT_CHUNK_SIZE].encode())
+  encrypted_base64 = base64.b64encode(parts)
+  return encrypted_base64.decode()
+
+# 解密函数
+def decrypt(msg, private_key):
+  parts = b''
+  public_key = RSA.import_key(private_key)
+  cipher = PKCS1_OAEP.new(public_key)
+  encrypted_bytes = base64.b64decode(msg)
+  for i in range(0, len(encrypted_bytes), decrypt_CHUNK_SIZE):
+    parts += cipher.decrypt(encrypted_bytes[i:i + decrypt_CHUNK_SIZE])
+  return parts.decode()
+
+# 验签
+def verify_sign(msg, public_key, sign):
+  public_key = RSA.import_key(public_key)
+  hash_message = SHA256.new(msg.encode())
+  try:
+    pkcs1_15.new(public_key).verify(hash_message, base64.b64decode(sign.encode()))
+    return True
+  except Exception as e:
+    print('签名验证失败: {}'.format(e))
+    return False
+
+# 签名
+def sign_msg(msg, private_key):
+  private_key = RSA.import_key(private_key)
+  hash_message = SHA256.new(msg.encode())
+  signature = pkcs1_15.new(private_key).sign(hash_message)
+  return base64.b64encode(signature).decode()
+
+
+# with open(work_path.get_current_path() + '/private_key.pem', 'r') as key:
+#   key = key.read()
+#   sign = sign_msg(key, key)
+#   with open(work_path.get_current_path() + '/public_key.pem', 'r') as pub:
+#     print(verify_sign(key, pub.read(), sign+'123'))

ctools/sm_tools.py

@@ -3,22 +3,35 @@ import base64
 from gmssl import sm2, func
 from gmssl.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT
 
-sm2_crypt: sm2.CryptSM2
+sm2_crypt: sm2.CryptSM2 = None
 
+def init(private_key: str, public_key: str):
+  global sm2_crypt
+  if sm2_crypt is not None:
+    print('sm2 is already init!!!')
+    return
+  sm2_crypt = sm2.CryptSM2(private_key=private_key, public_key=public_key, asn1=True, mode=1)
 
 def sign_with_sm2(sign_data: str) -> str:
-  return sm2_crypt.sign(sign_data.encode('UTF-8'), func.random_hex(sm2_crypt.para_len))
+  if sm2_crypt is None: raise Exception('sm2 is not init!!!')
+  return sm2_crypt.sign_with_sm3(sign_data.encode('UTF-8'))
 
 
 def verify_with_sm2(sign_val: str, sign_data: str) -> bool:
-  return sm2_crypt.verify(sign_val, sign_data.encode('UTF-8'))
-
+  if sm2_crypt is None: raise Exception('sm2 is not init!!!')
+  try:
+    return sm2_crypt.verify_with_sm3(sign_val, sign_data.encode('UTF-8'))
+  except Exception as e:
+    print('签名验证失败: {}'.format(e))
+    return False
 
 def encrypt_with_sm2(encrypt_data: str) -> str:
+  if sm2_crypt is None: raise Exception('sm2 is not init!!!')
   return base64.b64encode(sm2_crypt.encrypt(encrypt_data.encode('UTF-8'))).decode('UTF-8')
 
 
 def decrypt_with_sm2(encrypt_data: str) -> str:
+  if sm2_crypt is None: raise Exception('sm2 is not init!!!')
   return sm2_crypt.decrypt(base64.b64decode(encrypt_data.encode('UTF-8'))).decode('UTF-8')
 
 

{gomyck_tools-1.2.1.dist-info → gomyck_tools-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gomyck-tools
-Version: 1.2.1
+Version: 1.2.2
 Summary: A ctools for python development by hao474798383
 Home-page: https://blog.gomyck.com
 Author: gomyck

{gomyck_tools-1.2.1.dist-info → gomyck_tools-1.2.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ctools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ctools/aes_tools.py,sha256=ylUgyhlx7bNCTGrbWEZVwCObzYdJTQtwEc4ZMidL2Fo,563
-ctools/api_result.py,sha256=NiM-R9K42G3m16B27sG_mqKrlexZzC5-LKoY8D5tO4s,1239
+ctools/api_result.py,sha256=BLoJiTHFAIFRPCc4zer7NHTsRQFMY1TH-qmxSMk8iLU,1208
 ctools/application.py,sha256=DcuSt2m8cDuSftx6eKfJ5gA6_F9dDlzkj0K86EG4F7s,15884
 ctools/b64.py,sha256=_BdhX3p3-MaSSlU2wivN5qPxQfacR3VRBr1WC456tU0,194
 ctools/bashPath.py,sha256=BCN_EhYzqvwsxYso81omMNd3SbEociwSOyb9kLvu8V4,337
@@ -9,14 +9,14 @@ ctools/bottle_webserver.py,sha256=8w1oj6_P09an6Pdnr5dH9ClBiD-A6k27IBCSvqVfcTs,25
 ctools/bottle_websocket.py,sha256=wjsjKVE_tlon0hYfnzBT0Sis6yNPe318vKgTfzWYbfQ,1903
 ctools/browser_element_tools.py,sha256=IFR_tWu5on0LxhuC_4yT6EOjwCsC-juIoU8KQRDqR7E,9952
 ctools/call.py,sha256=BCr8wzt5qd70okv8IZn-9-EpjywleZgvA3u1vfZ_Kt8,1581
-ctools/cjson.py,sha256=M2XrXnFXTJyKsXP2JRos2Bse4b6WXjr6TrA6y-EF_Ig,1245
+ctools/cjson.py,sha256=g5OldDeD7bmdw_4NNNPfAREGXNplQxY_l9vtTz-UBTs,1331
 ctools/ckafka.py,sha256=EiiGCFkSbq8yRjQKVjc2_V114hKb8fJAVIOks_XbQ3w,5944
 ctools/compile_tools.py,sha256=Nybh3vnkurIKnPnubdYzigjnzFu4GaTMKPvqFdibxmE,510
 ctools/console.py,sha256=EZumuyynwteKUhUxB_XoulHswDxHd75OQB34RiZ-OBM,1807
 ctools/cron_lite.py,sha256=f9g7-64GsCxcAW-HUAvT6S-kooScl8zaJyqwHY-X_rE,8308
 ctools/database.py,sha256=7YzkO2tzV1KUQLHND8g9PkQwTyGd3clhgPiZ5SbC-HA,5447
-ctools/date_utils.py,sha256=-xI2anEzAonOvYwVmM1hCnkuLKodZ8pb33dS3dRxEIc,865
-ctools/dict_wrapper.py,sha256=A6EOcI-aeYpK3yi6KmCkzShWG0gQcMmQV2lIWPzvn2U,310
+ctools/date_utils.py,sha256=qkIvn2TGQ97vUw2ppBfHE7IyCUqg0s1FzrB0BJAsaBo,868
+ctools/dict_wrapper.py,sha256=6lZUyHomdn5QdjQTg7EL1sC_I6tOlh8ofMRQT3XGQjM,398
 ctools/douglas_rarefy.py,sha256=43WRjGGsQ_o1yPEXypA1Xv_yuo90RVo7qaYGRslx5gQ,4890
 ctools/download_tools.py,sha256=oJbG12Hojd0J17sAlvMU480P3abi4_AB9oZkEBGFPuo,1930
 ctools/enums.py,sha256=QbHa3j7j4-BDdwaga5Y0nYfA2uNSVJDHumYdIZdKVkM,118
@@ -26,7 +26,6 @@ ctools/html_soup.py,sha256=rnr8M3gn3gQGo-wNaNFXDjdzp8AAkv9o4yqfIIfO-zw,1567
 ctools/http_utils.py,sha256=dG26aci1_YxAyKwYqMKFw4wZAryLkDyvnQ3hURjB6Lk,768
 ctools/images_tools.py,sha256=TapXYCPqC7GesgrALecxxa_ApuT_dxUG5fqQIJF2bNY,670
 ctools/imgDialog.py,sha256=zFeyPmpnEn9Ih7-yuJJrePqW8Myj3jC9UYMTDk-umTs,1385
-ctools/license.py,sha256=0Kh7lXL7LD1PQqyijHajFL0GbmZGNB88PA2WskbQn_s,1066
 ctools/metrics.py,sha256=vq9Fnq2fhmhS4yoHS4gO7ArKS033Eou8vpA779Uue0I,4414
 ctools/mqtt_utils.py,sha256=ZWSZiiNJLLlkHF95S6LmRmkYt-iIL4K73VdN3b1HaHw,10702
 ctools/obj.py,sha256=GYS1B8NyjtUIh0HlK9r8avC2eGbK2SJac4C1CGnfGhI,479
@@ -35,9 +34,10 @@ ctools/plan_area_tools.py,sha256=pySri43bVfkHjzlKujML-Nk8B3QLxuYv5KJMha-MLmU,331
 ctools/process_pool.py,sha256=1TuZySUbQjgYYcuwis54DIwQTimWvTLNahSra7Ia8Ps,951
 ctools/pty_tools.py,sha256=KI3dOyv2JLZmU1VfD1aLMq9r9d5VCu3TdtcezZayBEI,1622
 ctools/resource_bundle_tools.py,sha256=wA4fmD_ZEcrpcvUZKa60uDDX-nNQSVz1nBh0A2GVuTI,3796
+ctools/rsa.py,sha256=c0q7oStlpSfTxmn900XMDjyOGS1A7tVsUIocr0nL2UI,2259
 ctools/screenshot_tools.py,sha256=KoljfgqW5x9aLwKdIfz0vR6v-fX4XjE92HudkDxC2hE,4539
 ctools/sign.py,sha256=JOkgpgsMbk7T3c3MOj1U6eiEndUG9XQ-uIX9e615A_Y,566
-ctools/sm_tools.py,sha256=RwhTjuKw_TjaAJAui39wctzFFpbt79MQ3hjF0fhL638,1113
+ctools/sm_tools.py,sha256=CDfgupqs_nrZs-135ZvDu6QIx4aamJVdg7vuLs9_0yw,1678
 ctools/snow_id.py,sha256=hYinnRN-aOule4_9vfgXB7XnsU-56cIS3PhzAwWBc5E,2270
 ctools/strDiff.py,sha256=QUtXOfsRLTFozH_zByqsC39JeuG3eZtrwGVeLyaHYUI,429
 ctools/string_tools.py,sha256=p_O3HiqlHCgzJVXHUeeDYZK2_WrqetD0eYijQFXWkGg,1938
@@ -51,7 +51,7 @@ ctools/wordFill.py,sha256=dB1OLt6GLmWdkDV8H20VWbJmY4ggNNI8iHD1ocae2iM,875
 ctools/word_fill.py,sha256=xeo-P4DOjQUqd-o9XL3g66wQrE2diUPGwFywm8TdVyw,18210
 ctools/word_fill_entity.py,sha256=eX3G0Gy16hfGpavQSEkCIoKDdTnNgRRJrFvKliETZK8,985
 ctools/work_path.py,sha256=i4MTUobqNW2WMrT3mwEC_XYQ0_IhFmKoNpTX2W6A8Tc,1680
-gomyck_tools-1.2.1.dist-info/METADATA,sha256=E8dtyw8qYEen6Dc8ejI45xdC1TS5t85wn8W_hjb7mOA,1004
-gomyck_tools-1.2.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-gomyck_tools-1.2.1.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
-gomyck_tools-1.2.1.dist-info/RECORD,,
+gomyck_tools-1.2.2.dist-info/METADATA,sha256=CzDE6NMxpgyVbq_51yDC0b4mEE0IBkcuNI85aat7t7M,1004
+gomyck_tools-1.2.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+gomyck_tools-1.2.2.dist-info/top_level.txt,sha256=-MiIH9FYRVKp1i5_SVRkaI-71WmF1sZSRrNWFU9ls3s,7
+gomyck_tools-1.2.2.dist-info/RECORD,,

ctools/license.py

@@ -1,37 +0,0 @@
-import base64
-
-from Crypto.Cipher import PKCS1_OAEP
-from Crypto.PublicKey import RSA
-
-from ctools import work_path, cjson
-
-ENCRYPT_CHUNK_SIZE = 245
-decrypt_CHUNK_SIZE = 512
-
-
-# 加密函数
-def encrypt(msg, public_key):
-  parts = b''
-  private_key = RSA.import_key(public_key)
-  cipher = PKCS1_OAEP.new(private_key)
-  for i in range(0, len(msg), ENCRYPT_CHUNK_SIZE):
-    parts += cipher.encrypt(msg[i:i + ENCRYPT_CHUNK_SIZE].encode())
-  encrypted_base64 = base64.b64encode(parts)
-  return encrypted_base64.decode()
-
-
-# 解密函数
-def decrypt(msg, private_key):
-  parts = b''
-  public_key = RSA.import_key(private_key)
-  cipher = PKCS1_OAEP.new(public_key)
-  encrypted_bytes = base64.b64decode(msg)
-  for i in range(0, len(encrypted_bytes), decrypt_CHUNK_SIZE):
-    parts += cipher.decrypt(encrypted_bytes[i:i + decrypt_CHUNK_SIZE])
-  return parts.decode()
-
-
-def loadLicenseInfo(auth_code):
-  with open(work_path.get_app_path() + '/keys/license.key', 'r') as pri:
-    decrypt_message = decrypt(auth_code.strip(), pri.read())
-    return cjson.loads(decrypt_message)