fix too-hurried ambiguity warnings, fix b64 encoding for SAML REDIRECT too

diff --git a/gp-saml-gui.py b/gp-saml-gui.py
index a49a751fb67158765d9c0d88282bea0f60ef7c29..4029a09dfadcbeaa272550f3e4d1e299db45a27a 100755 (executable)
--- a/gp-saml-gui.py
+++ b/gp-saml-gui.py
@@ -253,22 +253,20 @@ if __name__ == "__main__":
     if args.verbose:
         # Warn about ambiguities
         if server != args.server and not args.uri:
     if args.verbose:
         # Warn about ambiguities
         if server != args.server and not args.uri:

-            print('''IMPORTANT: During the SAML auth, you were redirected from {} to {}. This probably'''
-                  '''means you should specify {} as the server for final connection, but we're not 100%'''
+            print('''IMPORTANT: During the SAML auth, you were redirected from {} to {1}. This probably '''
+                  '''means you should specify {1} as the server for final connection, but we're not 100% '''

                   '''sure about this. You should probably try both.\n'''.format(args.server, server), file=stderr)
         if ifh != args.interface and not args.uri:
                   '''sure about this. You should probably try both.\n'''.format(args.server, server), file=stderr)
         if ifh != args.interface and not args.uri:

-            print('''IMPORTANT: We started with SAML auth to the {} interface, but received a cookie'''
+            print('''IMPORTANT: We started with SAML auth to the {} interface, but received a cookie '''

                   '''that's associated with the {} interface. You should probably try both.\n'''.format(args.interface, ifh),
                   file=stderr)
                   '''that's associated with the {} interface. You should probably try both.\n'''.format(args.interface, ifh),
                   file=stderr)

-

         print('''\nSAML response converted to OpenConnect command line invocation:\n''', file=stderr)
         print('''    echo {} |\n        openconnect --protocol=gp --user={} --usergroup={}:{} --passwd-on-stdin {}'''.format(
             quote(cv), quote(un), quote(ifh), quote(cn), quote(server)), file=stderr)
 
         print('''\nSAML response converted to test-globalprotect-login.py invocation:\n''', file=stderr)
         print('''\nSAML response converted to OpenConnect command line invocation:\n''', file=stderr)
         print('''    echo {} |\n        openconnect --protocol=gp --user={} --usergroup={}:{} --passwd-on-stdin {}'''.format(
             quote(cv), quote(un), quote(ifh), quote(cn), quote(server)), file=stderr)
 
         print('''\nSAML response converted to test-globalprotect-login.py invocation:\n''', file=stderr)

-        print('''    test-globalprotect-login.py --user={} -p '' \\\n         https://{}{} {}={}\n'''.format(
+        print('''    test-globalprotect-login.py --user={} -p '' \\\n         https://{}/{} {}={}\n'''.format(

             quote(un), quote(server), quote(if2auth[ifh]), quote(cn), quote(cv)), file=stderr)
             quote(un), quote(server), quote(if2auth[ifh]), quote(cn), quote(cv)), file=stderr)

-

     varvals = {
         'HOST': quote('https://%s/%s:%s' % (server, if2auth[ifh], cn)),
         'USER': quote(un), 'COOKIE': quote(cv),
     varvals = {
         'HOST': quote('https://%s/%s:%s' % (server, if2auth[ifh], cn)),
         'USER': quote(un), 'COOKIE': quote(cv),

diff --git a/test-globalprotect-login.py b/test-globalprotect-login.py
index 81ae8b753b87da95630dd2136b51a494f8d7be63..4c325b2b2015fbc6cfb55c0860333934aa05a9b8 100755 (executable)
--- a/test-globalprotect-login.py
+++ b/test-globalprotect-login.py
@@ -114,10 +114,10 @@ Extracted connection cookie from <jnlp>. Use this to connect:
 elif xml is not None and xml.tag == 'prelogin-response' and None not in (xml.find('saml-auth-method'), xml.find('saml-request')):
     import webbrowser
     sam = xml.find('saml-auth-method').text
 elif xml is not None and xml.tag == 'prelogin-response' and None not in (xml.find('saml-auth-method'), xml.find('saml-request')):
     import webbrowser
     sam = xml.find('saml-auth-method').text

-    sr = xml.find('saml-request').text
+    sr = a2b_base64(xml.find('saml-request').text)

     if sam == 'POST':
         with NamedTemporaryFile(delete=False, suffix='.html') as tf:
     if sam == 'POST':
         with NamedTemporaryFile(delete=False, suffix='.html') as tf:

-            tf.write(a2b_base64(sr))
+            tf.write(sr)

         if args.browse:
             print("Got SAML POST, browsing to %s" % tf.name)
             webbrowser.open('file://' + tf.name)
         if args.browse:
             print("Got SAML POST, browsing to %s" % tf.name)
             webbrowser.open('file://' + tf.name)