Merge pull request #3 from DirectEmployers/fix-whitespace-and-b64-com…

…parison fix b64 comparison
DirectEmployers · Mar 8, 2021 · a1bae76 · a1bae76
2 parents 26c19a7 + ea201e0
commit a1bae76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = vaultpy
-version = 0.0.3
+version = 0.0.4
 author = Tim Loyer
 author_email = [email protected]
 description = A module to parse injected Vault secrets and track their usage with Datadog.

diff --git a/vault/__init__.py b/vault/__init__.py
@@ -15,7 +15,7 @@ def _is_base64(s):
     Checks whether a sting has been base 64 encoded.
     """
     try:
-        return b64encode(b64decode(s)) == s
+        return b64encode(b64decode(s)) == bytes(s, "utf-8")
     except Exception:
         return False
 
@@ -35,7 +35,7 @@ def _load_vault_secrets() -> Dict:
     should not be called anywhere except within this module!
     """
     with open(environ["VAULT_SECRETS_PATH"]) as file:
-        contents = file.read()
+        contents = file.read().strip()
 
     if _is_base64(contents):
         contents = b64decode(contents)