pyntcli 0.1.47__py3-none-any.whl → 0.1.48__py3-none-any.whl

build/lib/build/lib/build/lib/pyntcli/main.py

@@ -0,0 +1,74 @@
+from sys import argv, exit
+import signal
+
+from pyntcli.commands import pynt_cmd
+from pyntcli.pynt_docker import pynt_container
+from pyntcli.ui import ui_thread
+from pyntcli.ui import pynt_errors
+from pyntcli.auth import login 
+from pyntcli.analytics import send as analytics
+from requests.exceptions import SSLError
+from pyntcli.transport.pynt_requests import InvalidPathException, InvalidCertFormat
+from pyntcli.commands.util import HtmlReportNotCreatedException
+import os
+
+def signal_handler(signal_number, frame):
+    ui_thread.print(ui_thread.PrinterText("Exiting..."))
+    
+    analytics.stop()
+    pynt_container.PyntContainerRegistery.instance().stop_all_containers() 
+    ui_thread.stop()
+
+    exit(0)
+
+def check_for_dependecies():
+    pynt_container.get_docker_type()
+
+def print_header():
+    ui_thread.print(ui_thread.PrinterText(*ui_thread.pynt_header()) \
+                             .with_line(*ui_thread.pynt_version()) \
+                             .with_line(""))
+def start_analytics():
+    user_id = login.user_id()
+    if user_id:
+       analytics.set_user_id(user_id)
+    
+def main():
+    print_header()
+    try:
+        start_analytics()
+        check_for_dependecies()
+        signal.signal(signal.SIGINT, signal_handler)
+        cli = pynt_cmd.PyntCommand()
+        cli.run_cmd(cli.parse_args(argv[1:]))
+        analytics.stop()
+    except pynt_cmd.PyntCommandException:
+       pynt_cmd.root.usage()
+    except pynt_container.DockerNotAvailableException:
+        ui_thread.print(ui_thread.PrinterText("Docker was unavailable, please make sure docker is installed and running.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "docker unavailable"})
+    except SSLError: 
+        ui_thread.print(ui_thread.PrinterText("We encountered SSL issues and could not proceed, this may be the cause of a VPN or a Firewall in place.", ui_thread.PrinterText.WARNING))
+    except login.Timeout: 
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to incomplete registration, please try again.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "login timeout"})
+    except login.InvalidTokenInEnvVarsException:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to malformed credentials provided in env vars.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "invalid pynt cli credentials in env vars"})
+    except pynt_container.ImageUnavailableException:
+        analytics.emit(analytics.ERROR,{"error": "Couldnt pull pynt image and no local image found"})
+        pynt_errors.unexpected_error()
+    except HtmlReportNotCreatedException:
+        analytics.emit(analytics.ERROR,{"error": "Html report was not created"})
+        pynt_errors.unexpected_error()
+    except InvalidPathException as e:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA path: {}".format(e), ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR,{"error": "Host CA path provided was invalid"})
+    except InvalidCertFormat as e:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA. Please provide a file in PEM format: {}".format(e), ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR,{"error": "Host CA provided was not in valid pem format"})
+    finally:
+        ui_thread.stop()
+
+if __name__ == "__main__":
+    main()

build/lib/build/lib/build/lib/tests/auth/test_login.py

@@ -0,0 +1,96 @@
+from urllib.parse import urlparse
+import json
+from _pytest.monkeypatch import monkeypatch
+import pytest
+import requests
+import requests_mock
+import datetime
+import jwt
+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_CREDENTIALS
+from pyntcli.store import CredStore
+
+
+class TestLogin():
+    @pytest.fixture
+    def mock_webbrowser(self, mocker):
+        try:
+            mocker.patch("webbrowser.open", return_value=None)
+            yield
+        finally:
+            pass
+    
+    def get_request_url_parameters(self, req: requests.PreparedRequest) :
+        u = req.url
+        parsed_url = urlparse(u)
+        return parsed_url.query
+
+    def poll_matcher(self, request: requests.PreparedRequest):
+        assert "request_id" in self.get_request_url_parameters(request)
+
+        resp = requests.Response()
+        self.login_request_cnt += 1
+        if self.login_request_cnt < 2:
+            resp.status_code = 404
+            return resp
+        
+        resp.status_code = 200
+        resp._content = json.dumps({"token": "testToken"}).encode()
+        return resp
+
+    def test_login(self, mock_webbrowser, mock_sleep, mock_expanduser):
+        l = Login()
+        self.login_request_cnt = 0
+        with requests_mock.mock() as m: 
+            m.add_matcher(self.poll_matcher)
+            l.login() 
+
+        assert self.login_request_cnt == 2
+        c = CredStore()
+        assert c.get("token") == {"token": "testToken"}
+
+    def test_login_timeout(self, mock_webbrowser, mock_sleep, mock_expanduser):
+        l = Login() 
+        l.login_wait_period = 0
+        self.login_request_cnt = 0
+        with pytest.raises(Timeout):
+            with requests_mock.mock() as m:
+                m.add_matcher(self.poll_matcher)
+                l.get_token_using_request_id("some_id")
+    
+    
+    def test_is_jwt_expired(self):
+
+        private_key = rsa.generate_private_key(
+            public_exponent=65537,
+            key_size=2048
+        ).private_bytes(encoding=serialization.Encoding.PEM,
+                        format=serialization.PrivateFormat.PKCS8, 
+                        encryption_algorithm=serialization.NoEncryption())
+
+
+        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")
+        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")
+        assert is_jwt_expired(token) == False
+
+    def test_login_using_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()

build/lib/build/lib/build/lib/tests/conftest.py

@@ -0,0 +1,24 @@
+import tempfile
+import pytest
+import shutil
+
+import sys 
+sys.path.append("../")
+
+@pytest.fixture
+def mock_expanduser( mocker):
+    dir = tempfile.mkdtemp() 
+    try:
+        mocker.patch("os.path.expanduser", return_value=dir)
+        yield
+    finally:
+        shutil.rmtree(dir)
+
+@pytest.fixture
+def mock_sleep( mocker):
+    try:
+        mocker.patch("time.sleep", return_value=None)
+        yield
+    finally:
+        pass
+

build/lib/build/lib/build/lib/tests/store/test_cred_store.py

@@ -0,0 +1,11 @@
+import tempfile
+import shutil
+import pytest
+
+from pyntcli.store import CredStore
+
+class TestCredStore():
+    def test_get_credentials(self, mock_expanduser):
+        c = CredStore()
+        c.put("data", "value")
+        assert c.get("data") == "value" 

build/lib/build/lib/pyntcli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.48"

build/lib/build/lib/pyntcli/main.py

@@ -0,0 +1,74 @@
+from sys import argv, exit
+import signal
+
+from pyntcli.commands import pynt_cmd
+from pyntcli.pynt_docker import pynt_container
+from pyntcli.ui import ui_thread
+from pyntcli.ui import pynt_errors
+from pyntcli.auth import login 
+from pyntcli.analytics import send as analytics
+from requests.exceptions import SSLError
+from pyntcli.transport.pynt_requests import InvalidPathException, InvalidCertFormat
+from pyntcli.commands.util import HtmlReportNotCreatedException
+import os
+
+def signal_handler(signal_number, frame):
+    ui_thread.print(ui_thread.PrinterText("Exiting..."))
+    
+    analytics.stop()
+    pynt_container.PyntContainerRegistery.instance().stop_all_containers() 
+    ui_thread.stop()
+
+    exit(0)
+
+def check_for_dependecies():
+    pynt_container.get_docker_type()
+
+def print_header():
+    ui_thread.print(ui_thread.PrinterText(*ui_thread.pynt_header()) \
+                             .with_line(*ui_thread.pynt_version()) \
+                             .with_line(""))
+def start_analytics():
+    user_id = login.user_id()
+    if user_id:
+       analytics.set_user_id(user_id)
+    
+def main():
+    print_header()
+    try:
+        start_analytics()
+        check_for_dependecies()
+        signal.signal(signal.SIGINT, signal_handler)
+        cli = pynt_cmd.PyntCommand()
+        cli.run_cmd(cli.parse_args(argv[1:]))
+        analytics.stop()
+    except pynt_cmd.PyntCommandException:
+       pynt_cmd.root.usage()
+    except pynt_container.DockerNotAvailableException:
+        ui_thread.print(ui_thread.PrinterText("Docker was unavailable, please make sure docker is installed and running.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "docker unavailable"})
+    except SSLError: 
+        ui_thread.print(ui_thread.PrinterText("We encountered SSL issues and could not proceed, this may be the cause of a VPN or a Firewall in place.", ui_thread.PrinterText.WARNING))
+    except login.Timeout: 
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to incomplete registration, please try again.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "login timeout"})
+    except login.InvalidTokenInEnvVarsException:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to malformed credentials provided in env vars.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "invalid pynt cli credentials in env vars"})
+    except pynt_container.ImageUnavailableException:
+        analytics.emit(analytics.ERROR,{"error": "Couldnt pull pynt image and no local image found"})
+        pynt_errors.unexpected_error()
+    except HtmlReportNotCreatedException:
+        analytics.emit(analytics.ERROR,{"error": "Html report was not created"})
+        pynt_errors.unexpected_error()
+    except InvalidPathException as e:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA path: {}".format(e), ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR,{"error": "Host CA path provided was invalid"})
+    except InvalidCertFormat as e:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA. Please provide a file in PEM format: {}".format(e), ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR,{"error": "Host CA provided was not in valid pem format"})
+    finally:
+        ui_thread.stop()
+
+if __name__ == "__main__":
+    main()

build/lib/build/lib/tests/auth/test_login.py

@@ -0,0 +1,96 @@
+from urllib.parse import urlparse
+import json
+from _pytest.monkeypatch import monkeypatch
+import pytest
+import requests
+import requests_mock
+import datetime
+import jwt
+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_CREDENTIALS
+from pyntcli.store import CredStore
+
+
+class TestLogin():
+    @pytest.fixture
+    def mock_webbrowser(self, mocker):
+        try:
+            mocker.patch("webbrowser.open", return_value=None)
+            yield
+        finally:
+            pass
+    
+    def get_request_url_parameters(self, req: requests.PreparedRequest) :
+        u = req.url
+        parsed_url = urlparse(u)
+        return parsed_url.query
+
+    def poll_matcher(self, request: requests.PreparedRequest):
+        assert "request_id" in self.get_request_url_parameters(request)
+
+        resp = requests.Response()
+        self.login_request_cnt += 1
+        if self.login_request_cnt < 2:
+            resp.status_code = 404
+            return resp
+        
+        resp.status_code = 200
+        resp._content = json.dumps({"token": "testToken"}).encode()
+        return resp
+
+    def test_login(self, mock_webbrowser, mock_sleep, mock_expanduser):
+        l = Login()
+        self.login_request_cnt = 0
+        with requests_mock.mock() as m: 
+            m.add_matcher(self.poll_matcher)
+            l.login() 
+
+        assert self.login_request_cnt == 2
+        c = CredStore()
+        assert c.get("token") == {"token": "testToken"}
+
+    def test_login_timeout(self, mock_webbrowser, mock_sleep, mock_expanduser):
+        l = Login() 
+        l.login_wait_period = 0
+        self.login_request_cnt = 0
+        with pytest.raises(Timeout):
+            with requests_mock.mock() as m:
+                m.add_matcher(self.poll_matcher)
+                l.get_token_using_request_id("some_id")
+    
+    
+    def test_is_jwt_expired(self):
+
+        private_key = rsa.generate_private_key(
+            public_exponent=65537,
+            key_size=2048
+        ).private_bytes(encoding=serialization.Encoding.PEM,
+                        format=serialization.PrivateFormat.PKCS8, 
+                        encryption_algorithm=serialization.NoEncryption())
+
+
+        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")
+        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")
+        assert is_jwt_expired(token) == False
+
+    def test_login_using_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()

build/lib/build/lib/tests/conftest.py

@@ -0,0 +1,24 @@
+import tempfile
+import pytest
+import shutil
+
+import sys 
+sys.path.append("../")
+
+@pytest.fixture
+def mock_expanduser( mocker):
+    dir = tempfile.mkdtemp() 
+    try:
+        mocker.patch("os.path.expanduser", return_value=dir)
+        yield
+    finally:
+        shutil.rmtree(dir)
+
+@pytest.fixture
+def mock_sleep( mocker):
+    try:
+        mocker.patch("time.sleep", return_value=None)
+        yield
+    finally:
+        pass
+

build/lib/build/lib/tests/store/test_cred_store.py

@@ -0,0 +1,11 @@
+import tempfile
+import shutil
+import pytest
+
+from pyntcli.store import CredStore
+
+class TestCredStore():
+    def test_get_credentials(self, mock_expanduser):
+        c = CredStore()
+        c.put("data", "value")
+        assert c.get("data") == "value" 

build/lib/pyntcli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.48"

build/lib/pyntcli/main.py

@@ -0,0 +1,74 @@
+from sys import argv, exit
+import signal
+
+from pyntcli.commands import pynt_cmd
+from pyntcli.pynt_docker import pynt_container
+from pyntcli.ui import ui_thread
+from pyntcli.ui import pynt_errors
+from pyntcli.auth import login 
+from pyntcli.analytics import send as analytics
+from requests.exceptions import SSLError
+from pyntcli.transport.pynt_requests import InvalidPathException, InvalidCertFormat
+from pyntcli.commands.util import HtmlReportNotCreatedException
+import os
+
+def signal_handler(signal_number, frame):
+    ui_thread.print(ui_thread.PrinterText("Exiting..."))
+    
+    analytics.stop()
+    pynt_container.PyntContainerRegistery.instance().stop_all_containers() 
+    ui_thread.stop()
+
+    exit(0)
+
+def check_for_dependecies():
+    pynt_container.get_docker_type()
+
+def print_header():
+    ui_thread.print(ui_thread.PrinterText(*ui_thread.pynt_header()) \
+                             .with_line(*ui_thread.pynt_version()) \
+                             .with_line(""))
+def start_analytics():
+    user_id = login.user_id()
+    if user_id:
+       analytics.set_user_id(user_id)
+    
+def main():
+    print_header()
+    try:
+        start_analytics()
+        check_for_dependecies()
+        signal.signal(signal.SIGINT, signal_handler)
+        cli = pynt_cmd.PyntCommand()
+        cli.run_cmd(cli.parse_args(argv[1:]))
+        analytics.stop()
+    except pynt_cmd.PyntCommandException:
+       pynt_cmd.root.usage()
+    except pynt_container.DockerNotAvailableException:
+        ui_thread.print(ui_thread.PrinterText("Docker was unavailable, please make sure docker is installed and running.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "docker unavailable"})
+    except SSLError: 
+        ui_thread.print(ui_thread.PrinterText("We encountered SSL issues and could not proceed, this may be the cause of a VPN or a Firewall in place.", ui_thread.PrinterText.WARNING))
+    except login.Timeout: 
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to incomplete registration, please try again.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "login timeout"})
+    except login.InvalidTokenInEnvVarsException:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to malformed credentials provided in env vars.", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "invalid pynt cli credentials in env vars"})
+    except pynt_container.ImageUnavailableException:
+        analytics.emit(analytics.ERROR,{"error": "Couldnt pull pynt image and no local image found"})
+        pynt_errors.unexpected_error()
+    except HtmlReportNotCreatedException:
+        analytics.emit(analytics.ERROR,{"error": "Html report was not created"})
+        pynt_errors.unexpected_error()
+    except InvalidPathException as e:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA path: {}".format(e), ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR,{"error": "Host CA path provided was invalid"})
+    except InvalidCertFormat as e:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA. Please provide a file in PEM format: {}".format(e), ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR,{"error": "Host CA provided was not in valid pem format"})
+    finally:
+        ui_thread.stop()
+
+if __name__ == "__main__":
+    main()

build/lib/tests/auth/test_login.py

@@ -0,0 +1,96 @@
+from urllib.parse import urlparse
+import json
+from _pytest.monkeypatch import monkeypatch
+import pytest
+import requests
+import requests_mock
+import datetime
+import jwt
+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_CREDENTIALS
+from pyntcli.store import CredStore
+
+
+class TestLogin():
+    @pytest.fixture
+    def mock_webbrowser(self, mocker):
+        try:
+            mocker.patch("webbrowser.open", return_value=None)
+            yield
+        finally:
+            pass
+    
+    def get_request_url_parameters(self, req: requests.PreparedRequest) :
+        u = req.url
+        parsed_url = urlparse(u)
+        return parsed_url.query
+
+    def poll_matcher(self, request: requests.PreparedRequest):
+        assert "request_id" in self.get_request_url_parameters(request)
+
+        resp = requests.Response()
+        self.login_request_cnt += 1
+        if self.login_request_cnt < 2:
+            resp.status_code = 404
+            return resp
+        
+        resp.status_code = 200
+        resp._content = json.dumps({"token": "testToken"}).encode()
+        return resp
+
+    def test_login(self, mock_webbrowser, mock_sleep, mock_expanduser):
+        l = Login()
+        self.login_request_cnt = 0
+        with requests_mock.mock() as m: 
+            m.add_matcher(self.poll_matcher)
+            l.login() 
+
+        assert self.login_request_cnt == 2
+        c = CredStore()
+        assert c.get("token") == {"token": "testToken"}
+
+    def test_login_timeout(self, mock_webbrowser, mock_sleep, mock_expanduser):
+        l = Login() 
+        l.login_wait_period = 0
+        self.login_request_cnt = 0
+        with pytest.raises(Timeout):
+            with requests_mock.mock() as m:
+                m.add_matcher(self.poll_matcher)
+                l.get_token_using_request_id("some_id")
+    
+    
+    def test_is_jwt_expired(self):
+
+        private_key = rsa.generate_private_key(
+            public_exponent=65537,
+            key_size=2048
+        ).private_bytes(encoding=serialization.Encoding.PEM,
+                        format=serialization.PrivateFormat.PKCS8, 
+                        encryption_algorithm=serialization.NoEncryption())
+
+
+        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")
+        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")
+        assert is_jwt_expired(token) == False
+
+    def test_login_using_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()

build/lib/tests/conftest.py

@@ -0,0 +1,24 @@
+import tempfile
+import pytest
+import shutil
+
+import sys 
+sys.path.append("../")
+
+@pytest.fixture
+def mock_expanduser( mocker):
+    dir = tempfile.mkdtemp() 
+    try:
+        mocker.patch("os.path.expanduser", return_value=dir)
+        yield
+    finally:
+        shutil.rmtree(dir)
+
+@pytest.fixture
+def mock_sleep( mocker):
+    try:
+        mocker.patch("time.sleep", return_value=None)
+        yield
+    finally:
+        pass
+

build/lib/tests/store/test_cred_store.py

@@ -0,0 +1,11 @@
+import tempfile
+import shutil
+import pytest
+
+from pyntcli.store import CredStore
+
+class TestCredStore():
+    def test_get_credentials(self, mock_expanduser):
+        c = CredStore()
+        c.put("data", "value")
+        assert c.get("data") == "value" 

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.47"
+__version__ = "0.1.48"

pyntcli/auth/login.py

@@ -21,6 +21,7 @@ class InvalidTokenInEnvVarsException(LoginException):
     pass
 
 PYNT_CREDENTIALS = "PYNT_CREDENTIALS"
+PYNT_SAAS = "PYNT_SAAS_URL"
 
 class Login():
     def __init__(self) -> None:
@@ -59,6 +60,8 @@ class Login():
 
 
 def refresh_request(refresh_token):
+    if os.environ.get(PYNT_SAAS): 
+        return pynt_requests.post(os.environ[PYNT_SAAS] + "/auth/refresh", json={"refresh_token": refresh_token})
     return pynt_requests.post("https://auth.pynt.io/default/refresh", json={"refresh_token": refresh_token})
 
 def refresh_token():

pyntcli/commands/postman.py

@@ -32,6 +32,10 @@ class PostmanSubCommand(sub_command.PyntSubCommand):
         return postman_cmd
 
     def run_cmd(self, args: argparse.Namespace):
+        if "application_id" in args and args.application_id: 
+            ui_thread.print("application-id is not supported in postman integration, use the request body in the start scan request")
+            args.application_id = ""
+
         container = pynt_container.get_container_with_arguments(args ,pynt_container.PyntDockerPort("5001", args.port, name="--port"))        
        
         if util.is_port_in_use(args.port):

pyntcli/commands/root.py

@@ -37,6 +37,7 @@ class BaseCommand():
         parser.add_argument("--insecure", default=False, required=False, action='store_true',help="use when target uses self signed certificates")
         parser.add_argument("--dev-flags", type=str,default="",  help=argparse.SUPPRESS)
         parser.add_argument("--host-ca", type=str, default="")
+        parser.add_argument("--application-id", type=str, default="", required=False)
 
     def get_subparser(self) -> argparse._SubParsersAction:
         if self.subparser is None: