xenoslib 0.1.29.19__py3-none-any.whl → 0.1.29.21__py3-none-any.whl

xenoslib/about.py

@@ -4,4 +4,4 @@ __url__ = "https://github.com/XenosLu/xenoslib.git"
 __author__ = "Xenocider"
 __author_email__ = "xenos.lu@gmail.com"
 __license__ = "MIT License"
-__version__ = "0.1.29.19"
+__version__ = "0.1.29.21"

xenoslib/extend.py

@@ -221,10 +221,11 @@ class ConfigLoader(SingletonWithArgs):
         with open(config_file_path, "r") as f:
             self._raw_config = yaml.safe_load(f) or {}
 
-        if not self.vault_client and vault_secret_id is not None:
-            self._init_vault_client(vault_secret_id)
+        if vault_secret_id is not None:
+            self.vault_secret_id = vault_secret_id
+            self._check_and_renew_vault_client()
 
-    def _init_vault_client(self, vault_secret_id):
+    def _init_vault_client(self):
         """Initialize and authenticate the Vault client (imports hvac on demand).
 
         Args:
@@ -251,12 +252,19 @@ class ConfigLoader(SingletonWithArgs):
             if not all([vault_url, vault_space, vault_role_id]):
                 raise KeyError("Missing required Vault configuration in config.yml")
 
-            self.vault_client = hvac.Client(url=vault_url, namespace=vault_space)
-            self.vault_client.auth.approle.login(role_id=vault_role_id, secret_id=vault_secret_id)
+            self.vault_client = hvac.Client(url=vault_url, namespace=vault_space, timeout=45)
+            help(hvac.Client)
+            self.vault_client.auth.approle.login(role_id=vault_role_id, secret_id=self.vault_secret_id)
         except Exception as e:
             self.vault_client = None
             raise Exception(f"Failed to initialize Vault client: {str(e)}")
 
+    def _check_and_renew_vault_client(self):
+        # 检查当前Token的状态，包括过期时间和可续租性
+        if not self.vault_client or not self.vault_client.is_authenticated():
+            # 如果当前Token无效，则重新认证
+            self._init_vault_client()
+
     def get(self, section, key_name, use_cache=True):
         """Retrieve a configuration value.
 
@@ -366,5 +374,5 @@ if __name__ == "__main__":
 
     # This will only work if you provide a valid Vault secret ID
     # and hvac package is installed
-    config_with_vault = ConfigLoader("config.yml", vault_secret_id="your-secret-id")
+    config_with_vault = ConfigLoader("config.yml", vault_secret_id=os.getenv("VAULT_CF_LANDSCAPES_SECRET_ID"))
     print("With Vault:", config_with_vault.get("cis", "cis_client_id"))

{xenoslib-0.1.29.19.dist-info → xenoslib-0.1.29.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xenoslib
-Version: 0.1.29.19
+Version: 0.1.29.21
 Summary: Xenos' common lib
 Home-page: https://github.com/XenosLu/xenoslib.git
 Author: Xenocider

{xenoslib-0.1.29.19.dist-info → xenoslib-0.1.29.21.dist-info}/RECORD

@@ -1,17 +1,17 @@
 xenoslib/__init__.py,sha256=vlMWwdD2gTb9ztpm_orYAm_Y0Be0Es64ifvMQwrE1jU,310
 xenoslib/__main__.py,sha256=UpD3pl4l5ZUFxK6FzNMWRb1AZpEnwerulSFoPb_Pdgw,307
-xenoslib/about.py,sha256=GUgm9KLN0JxUTqSE5BA9bKeC0ne0qluGoOrVg0EPmWI,232
+xenoslib/about.py,sha256=kX9zQsM9EzSyXP_gpzz2GnM0L_XKceXzjm6hfHRfsHg,232
 xenoslib/base.py,sha256=rAXk71AsnWvQ7MaSad5Xxd9Lwucp-cZc15yyqoV5Dk4,12440
 xenoslib/dev.py,sha256=R6iwKuu-xvaYiBOUyP2gpePyvXss17TOZaCmQEihPCw,1236
-xenoslib/extend.py,sha256=RioMMG88w6-cKqP_pFfVrBGCGrwyUYPlM_OklxUhUyo,12485
+xenoslib/extend.py,sha256=XyoBqUrTX39ZSpUGOsGHkVWlJ_tc6_EE8nUgxFfCSw4,12853
 xenoslib/linux.py,sha256=EFCQBq_JsmNJc3wGlJlzH9W0tjOA7sSwx0u62R5Ut2k,1318
 xenoslib/mail.py,sha256=pkC4gpMSxKbuvNR-0CdwbJQEJNbBCp5oEYAJS-uxq9s,7286
 xenoslib/mock.py,sha256=iNIplO7clejqLWfpY4r0WQH5BULy9dCoolDenZEci0c,3572
 xenoslib/onedrive.py,sha256=-bJJ8Cd_RjJSlDynYqKoZlFKE1HHM34l6NXOQrWOwtg,7783
 xenoslib/win_trayicon.py,sha256=7GJwX3c2CS1XWQjsyDK5EfM-MmEHdzPJCTX2sGpWmuU,13115
 xenoslib/windows.py,sha256=lUTD7TowaPqYHgIL6b-GM9PLd-VyJNNGzkzC3K9vOxo,4080
-xenoslib-0.1.29.19.dist-info/licenses/LICENSE,sha256=lF6hjufhiR-xAje_Wo7ogxV5phz2d5TgkfL5SGshujg,1066
-xenoslib-0.1.29.19.dist-info/METADATA,sha256=bo4WrG1Jxeyz-nxXPSkccZ9E2X9ZX2JK-xpBhJVpYEs,914
-xenoslib-0.1.29.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xenoslib-0.1.29.19.dist-info/top_level.txt,sha256=Rfm4GdW0NyA2AHDNUF2wFQOfAo53mAPibddSHGd3X60,9
-xenoslib-0.1.29.19.dist-info/RECORD,,
+xenoslib-0.1.29.21.dist-info/licenses/LICENSE,sha256=lF6hjufhiR-xAje_Wo7ogxV5phz2d5TgkfL5SGshujg,1066
+xenoslib-0.1.29.21.dist-info/METADATA,sha256=ynaX_0Sf42nYWxivRIKxJ7WboYZr8iAxz7r8Ou5Ijsg,914
+xenoslib-0.1.29.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xenoslib-0.1.29.21.dist-info/top_level.txt,sha256=Rfm4GdW0NyA2AHDNUF2wFQOfAo53mAPibddSHGd3X60,9
+xenoslib-0.1.29.21.dist-info/RECORD,,