增加新支持

支持Argon2Id算法支持解密组织数据预留API登录接口（但没卵用）
BoringCat · Dec 28, 2023 · 6dd36dc · 6dd36dc
1 parent 9beea80
commit 6dd36dc
Show file tree

Hide file tree

Showing 8 changed files with 931 additions and 251 deletions.
diff --git a/README.md b/README.md
@@ -6,23 +6,26 @@
 
 ## 依赖要求
 注：requirement.txt 附带的版本号为开发使用的版本  
-- python >= 3
-  请根据 pycrypto 支持情况自行决定Python版本
+- python>=3
 - requests>=2.31.0
 - passlib>=1.7.4
 - hkdf>=0.0.3
 - cryptography>=41.0.5
+- argon2-cffi>=23.1.0
 
 ## 使用方法
 ```python
-from api import VaultwardenAPI
-vapi = VaultwardenAPI(baseUrl, email, masterPassword) # 配置服务器与账号消息
-vapi.fullLogin() # 登录
-vapi.sync(86400) # 如果与上次同步间隔小于86400秒（一天）则不同步
-alist = vapi.searchByName('somename') # 模糊搜索
-blist = vapi.searchByName('JustThisName', equal = True) # 全匹配搜索
-allItemInFolders = vapi.getListByFolder('somefoldername') # 模糊搜索目录
-allItemInOneFolder = vapi.getListByFolder('JustThisFolder', equal = True) # 全匹配目录
-allCiphers = vapi.decryptedCiphers # 拿所有解密后的 Ciphers
-allFolders = vapi.decryptedFolders # 拿所有解密后的 Folders
+from vaultwarden import *                                                 # VaultwardenAPI, UriMatchType
+with VaultwardenAPI(baseUrl, email, masterPassword) as vapi:              # 配置服务器与账号消息
+    vapi.fullLogin()                                                      # 登录
+    vapi.sync(86400)                                                      # 如果与上次同步间隔小于86400秒（一天）则不同步
+    alist = list(vapi.searchCiphers(name = 'somename'))                   # 模糊搜索
+    blist = list(vapi.searchCiphers(name = 'JustThisName', equal = True)) # 全匹配搜索
+    blist = list(vapi.searchCiphers(domain = 'http://github.com', domain_type = UriMatchType.Host))
+                                                                          # 匹配域名查询
+    allItemInFolders = list(vapi.searchFolders(name = 'somefoldername'))  # 模糊搜索目录
+    allItemInOneFolder = list(vapi.searchFolders(name = 'JustThisFolder', equal = True)) 
+                                                                          # 全匹配目录
+    allCiphers = vapi.Ciphers                                             # 拿所有解密后的 Ciphers
+    allFolders = vapi.Folders                                             # 拿所有解密后的 Folders
 ```
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 requests>=2.31.0
 passlib>=1.7.4
 hkdf>=0.0.3
-cryptography>=41.0.5
+cryptography>=41.0.5
+argon2-cffi>=23.1.0
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name="python-vaultwarden",
-    version="0.0.3",
+    version="0.0.4",
     author="BoringCat",
     author_email="[email protected]",
     description="Simple VaultWarden API for Python",
@@ -17,6 +17,7 @@
         'passlib>=1.7.4',
         'hkdf>=0.0.3',
         'cryptography>=41.0.5',
+        'argon2-cffi>=23.1.0',
     ],
     python_requires='>=3',
 )
diff --git a/vaultwarden/__init__.py b/vaultwarden/__init__.py
@@ -0,0 +1,4 @@
+from .api import VaultwardenAPI
+from .types import UriMatchType
+
+__all__ = ['VaultwardenAPI', 'UriMatchType']