should use shlex.quote() instead of repr()

[nu-vpn-proxy.git] / gp-saml-gui.py

diff --git a/gp-saml-gui.py b/gp-saml-gui.py
index 0bd42485db06ed1161454d3f3f4a7b5daf2b3366..0f14f87880601c9a834bd07e5b6dba4450c49992 100755 (executable)
--- a/gp-saml-gui.py
+++ b/gp-saml-gui.py
@@ -8,6 +8,7 @@ import requests
 import xml.etree.ElementTree as ET
 import os
 
+from shlex import quote
 from sys import stderr
 from binascii import a2b_base64, b2a_base64
 
@@ -18,7 +19,7 @@ gi.require_version('WebKit2', '4.0')
 from gi.repository import WebKit2
 
 class SAMLLoginView:
-    def __init__(self, uri, html=None, verbose=False, cookies=None):
+    def __init__(self, uri, html=None, verbose=False, cookies=None, verify=True):
         window = Gtk.Window()
 
         # API reference: https://lazka.github.io/pgi-docs/#WebKit2-4.0
@@ -28,6 +29,8 @@ class SAMLLoginView:
         self.verbose = verbose
 
         self.ctx = WebKit2.WebContext.get_default()
+        if not args.verify:
+            self.ctx.set_tls_errors_policy(WebKit2.TLSErrorsPolicy.IGNORE)
         self.cookies = self.ctx.get_cookie_manager()
         if args.cookies:
             self.cookies.set_accept_policy(WebKit2.CookieAcceptPolicy.ALWAYS)
@@ -150,7 +153,7 @@ if __name__ == "__main__":
     # spawn WebKit view to do SAML interactive login
     if args.verbose:
         print("Got SAML %s, opening browser..." % sam, file=stderr)
-    slv = SAMLLoginView(uri, html, verbose=args.verbose, cookies=args.cookies)
+    slv = SAMLLoginView(uri, html, verbose=args.verbose, cookies=args.cookies, verify=args.verify)
     Gtk.main()
     if not slv.success:
         p.error('''Login window closed without producing SAML cookie''')
@@ -164,9 +167,15 @@ if __name__ == "__main__":
     else:
         cn = None
 
+    fullpath = ('/global-protect/getconfig.esp' if args.portal else '/ssl-vpn/login.esp')
+    shortpath = ('portal' if args.portal else 'gateway')
     if args.verbose:
         print('''\n\nSAML response converted to OpenConnect command line invocation:\n''', file=stderr)
-        print('''    echo {!r} |\n        openconnect --protocol=gp --user={!r} --usergroup={}:{} --passwd-on-stdin {}\n'''.format(
-            cv, un, ('portal' if args.portal else 'gateway'), cn, args.server), file=stderr)
-
-    print("HOST={!r}\nUSER={!r}\nCOOKIE={!r}".format('https://%s/%s:%s' % (args.server, ('portal' if args.portal else 'gateway'), cn), un, cv))
+        print('''    echo {} |\n        openconnect --protocol=gp --user={} --usergroup={}:{} --passwd-on-stdin {}\n'''.format(
+            quote(cv), quote(un), quote(shortpath), quote(cn), quote(args.server)), file=stderr)
+
+    varvals = {
+        'HOST': quote('https://%s/%s:%s' % (args.server, shortpath, cn)),
+        'USER': quote(un), 'COOKIE': quote(cv),
+    }
+    print('\n'.join('%s=%s' % pair for pair in varvals.items()))