Merge remote-tracking branch 'origin/develop'

Author: László Vaskó

openconnect_sso/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 __description__ = (
     "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication"
 )

openconnect_sso/app.py

@@ -115,13 +115,18 @@ def authenticate_to(host, credentials):
 
 
 async def run_openconnect(auth_info, host, args):
-    proc = await asyncio.create_subprocess_exec(
+    command_line = [
         "sudo",
         "openconnect",
         "--cookie-on-stdin",
         "--servercert",
         auth_info.server_cert_hash,
         *args,
+    ]
+
+    logger.debug("Starting OpenConnect", command_line=command_line)
+    proc = await asyncio.create_subprocess_exec(
+        *command_line,
         host.vpn_url,
         stdin=asyncio.subprocess.PIPE,
         stdout=None,

openconnect_sso/cli.py

@@ -62,6 +62,7 @@ def create_argparser():
     parser.add_argument(
         "openconnect_args",
         help="Arguments passed to openconnect",
+        action=StoreOpenConnectArgs,
         nargs=argparse.REMAINDER,
     )
 
@@ -72,6 +73,13 @@ def create_argparser():
     return parser
 
 
+class StoreOpenConnectArgs(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string=None):
+        if "--" in values:
+            values.remove("--")
+        setattr(namespace, self.dest, values)
+
+
 class LogLevel(enum.IntEnum):
     ERROR = logging.ERROR
     WARNING = logging.WARNING

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openconnect-sso"
-version = "0.3.0"
+version = "0.3.1"
 description = "Wrapper script for OpenConnect supporting Azure AD (SAMLv2) authentication"
 authors = ["László Vaskó <[email protected]>"]
 readme = "README.md"

tests/test_openconnect_sso.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == '0.3.0'
+    assert __version__ == '0.3.1'