pyntcli 0.1.75__py3-none-any.whl → 0.1.76__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.75"
+__version__ = "0.1.76"

pyntcli/auth/login.py

@@ -25,10 +25,15 @@ class InvalidTokenInEnvVarsException(LoginException):
 
 
 PYNT_ID = "PYNT_ID"
-PYNT_SAAS = os.environ.get("PYNT_SAAS_URL") if os.environ.get("PYNT_SAAS_URL") else "https://api.pynt.io/v1"
-PYNT_BUCKET_NAME = os.environ.get("PYNT_BUCKET_NAME") if os.environ.get("PYNT_BUCKET_NAME") else ""
-PYNT_PARAM1 = os.environ.get("PYNT_PARAM1") if os.environ.get("PYNT_PARAM1") else ""
-PYNT_PARAM2 = os.environ.get("PYNT_PARAM2") if os.environ.get("PYNT_PARAM2") else ""
+PYNT_CREDENTIALS = "PYNT_CREDENTIALS"
+PYNT_SAAS = os.environ.get("PYNT_SAAS_URL") if os.environ.get(
+    "PYNT_SAAS_URL") else "https://api.pynt.io/v1"
+PYNT_BUCKET_NAME = os.environ.get(
+    "PYNT_BUCKET_NAME") if os.environ.get("PYNT_BUCKET_NAME") else ""
+PYNT_PARAM1 = os.environ.get(
+    "PYNT_PARAM1") if os.environ.get("PYNT_PARAM1") else ""
+PYNT_PARAM2 = os.environ.get(
+    "PYNT_PARAM2") if os.environ.get("PYNT_PARAM2") else ""
 
 
 class Login():
@@ -40,7 +45,9 @@ class Login():
 
     def create_login_request(self):
         request_id = uuid.uuid4()
-        request_url = self.base_authorization_url + urllib.parse.urlencode({"request_id": request_id, "utm_source": "cli"})
+        request_url = self.base_authorization_url + \
+            urllib.parse.urlencode(
+                {"request_id": request_id, "utm_source": "cli"})
         webbrowser.open(request_url)
 
         ui_thread.print(ui_thread.PrinterText("To continue, you need to log in to your account.")
@@ -54,7 +61,8 @@ class Login():
         with ui_thread.spinner("Waiting...", "point"):
             start = time.time()
             while start + self.login_wait_period > time.time():
-                response = pynt_requests.get(self.poll_url, params={"request_id": request_id})
+                response = pynt_requests.get(self.poll_url, params={
+                                             "request_id": request_id})
                 if response.status_code == 200:
                     return response.json()
                 time.sleep(self.delay)
@@ -153,6 +161,8 @@ def validate_creds_structure(data):
 
 def should_login():
     env_creds = os.environ.get(PYNT_ID, None)
+    if not env_creds:
+        env_creds = os.environ.get(PYNT_CREDENTIALS, None)
     if env_creds:
         validated_creds = validate_creds_structure(env_creds)
         with CredStore() as store:

{pyntcli-0.1.75.dist-info → pyntcli-0.1.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.75
+Version: 0.1.76
 Summary: Command line utility to handle all of Pynt's different integrations
 Author-email: Pynt-io <support@pynt.io>
 Project-URL: Homepage, https://pynt.io

{pyntcli-0.1.75.dist-info → pyntcli-0.1.76.dist-info}/RECORD

@@ -1,9 +1,9 @@
-pyntcli/__init__.py,sha256=FJWQjdyjCSq1G0xvL-leZBsVKT8Trwi_Y3BZDT0-Bus,23
+pyntcli/__init__.py,sha256=jVtRNUwef3C7goIQGYOlvZVl9Bl7_p_NJdso3mdhBCM,23
 pyntcli/main.py,sha256=7ZDeG3IO04T98D2NJ1vHWVAVJVm8y719NeV2Aom7tPY,5171
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=cKvMw4HIGJGLip5OMPqTv1AJDlKlc_Uk2Sfcl0e3QLE,2845
 pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/auth/login.py,sha256=CosHIB1HHWa3cGjpE4uHNxsi_7SPL-I6Da0zCq3OcmU,5012
+pyntcli/auth/login.py,sha256=TljsRXbEkNI1YUrKm5mlTw4YiecYScYUsit8Z8vstss,5228
 pyntcli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/commands/burp.py,sha256=tbGpKP4NEuEZYSuBxqvLJaC4kRqtv0GO6BpBfPX2DRM,10397
 pyntcli/commands/command.py,sha256=UvJEHv69iQ03R0pN2RCsi3my48xwSMoDBTvcnbg_XzE,9477
@@ -33,10 +33,10 @@ pyntcli/ui/pynt_errors.py,sha256=UAr8OV5EM4zLhfWSmK_qss8nal2Ezo66Dk8ZMvR_RTs,546
 pyntcli/ui/report.py,sha256=W-icPSZrGLOubXgam0LpOvHLl_aZg9Zx9qIkL8Ym5PE,1930
 pyntcli/ui/ui_thread.py,sha256=OVTbiIFMg2KgxAvHf7yy86xGm4RVS2vj_VYZkMi-SRY,4956
 tests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
-tests/auth/test_login.py,sha256=juYxYZWfNmAuwm-ygGEF5gjzaR9LcimonDr7pN5vgLI,3209
+tests/auth/test_login.py,sha256=KFlzWhXBAuwdi7GXf16gCB3ya94LQG2wjcSChE149rQ,3798
 tests/store/test_cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli-0.1.75.dist-info/METADATA,sha256=RC4dmb_LHLW2n3oSNK5--zOSaOJBC2Hcm-7LQrUakiU,463
-pyntcli-0.1.75.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pyntcli-0.1.75.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.75.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
-pyntcli-0.1.75.dist-info/RECORD,,
+pyntcli-0.1.76.dist-info/METADATA,sha256=JXoZK9xKFquRF05o6XSLXhLjQOpSgl8iNsFYHylrsHc,463
+pyntcli-0.1.76.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pyntcli-0.1.76.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.76.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
+pyntcli-0.1.76.dist-info/RECORD,,

tests/auth/test_login.py

@@ -10,7 +10,7 @@ import os
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
 
-from pyntcli.auth.login import Login, Timeout, InvalidTokenInEnvVarsException, is_jwt_expired, should_login, PYNT_ID
+from pyntcli.auth.login import Login, Timeout, InvalidTokenInEnvVarsException, is_jwt_expired, should_login, PYNT_ID, PYNT_CREDENTIALS
 from pyntcli.store import CredStore
 
 
@@ -74,17 +74,19 @@ class TestLogin():
             "exp": int((datetime.datetime.now() - datetime.timedelta(days=1)).timestamp())
         }
 
-        token = jwt.encode(token_data, private_key.decode(), algorithm="RS256").decode("utf-8")
+        token = jwt.encode(token_data, private_key.decode(),
+                           algorithm="RS256").decode("utf-8")
         assert is_jwt_expired(token) == True
 
         token_data = {
             "exp": int((datetime.datetime.now() + datetime.timedelta(days=1)).timestamp())
         }
 
-        token = jwt.encode(token_data, private_key.decode(), algorithm="RS256").decode("utf-8")
+        token = jwt.encode(token_data, private_key.decode(),
+                           algorithm="RS256").decode("utf-8")
         assert is_jwt_expired(token) == False
 
-    def test_login_using_env_vars(self, mocker, mock_expanduser):
+    def test_login_using_pynt_id_env_vars(self, mocker, mock_expanduser):
         creds = json.dumps({"token": {"refresh_token": "some data"}})
         mocker.patch.dict(os.environ, {PYNT_ID: creds})
         assert should_login() == False
@@ -92,3 +94,15 @@ class TestLogin():
         os.environ[PYNT_ID] = "some bad credentials"
         with pytest.raises(InvalidTokenInEnvVarsException):
             should_login()
+
+    def test_login_using_pynt_cred_env_vars(self, mocker, mock_expanduser):
+        creds = json.dumps({"token": {"refresh_token": "some data"}})
+        mocker.patch.dict(os.environ, {PYNT_CREDENTIALS: creds})
+        assert should_login() == False
+
+        os.environ[PYNT_CREDENTIALS] = "some bad credentials"
+        with pytest.raises(InvalidTokenInEnvVarsException):
+            should_login()
+
+    def test_should_login_no_env_var(self, mocker, mock_expanduser):
+        assert should_login() == True