X-Git-Url: https://code.communitydata.science/nu-vpn-proxy.git/blobdiff_plain/b1c36bf95e8dba91c50b6e0b4a04c58b8de3188c..66438abc7cf5d17c1093610266fcc9b8319cd9d6:/test-globalprotect-login.py diff --git a/test-globalprotect-login.py b/test-globalprotect-login.py index a4b453f..4c325b2 100755 --- a/test-globalprotect-login.py +++ b/test-globalprotect-login.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 from __future__ import print_function -from sys import stderr, version_info +from sys import stderr, version_info, platform if (version_info >= (3, 0)): from urllib.parse import urlparse, urlencode raw_input = input @@ -18,15 +18,19 @@ from binascii import a2b_base64 from tempfile import NamedTemporaryFile from shlex import quote +clientos_map = dict(linux='Linux', darwin='Mac', win32='Windows', cygwin='Windows') +default_clientos = clientos_map.get(platform, 'Windows') + p = argparse.ArgumentParser() p.add_argument('-v','--verbose', default=0, action='count') -p.add_argument('endpoint', help='GlobalProtect server; can append /ssl-vpn/login.esp (default) or /global-protect/getconfig.esp') +p.add_argument('endpoint', help='GlobalProtect server; can append /ssl-vpn/login.esp (default) or /global-protect/getconfig.esp or /{ssl-vpn,global-protect}/prelogin.esp') p.add_argument('extra', nargs='*', help='Extra field to pass to include in the login query string (e.g. "portal-userauthcookie=deadbeef01234567")') g = p.add_argument_group('Login credentials') g.add_argument('-u','--user', help='Username (will prompt if unspecified)') g.add_argument('-p','--password', help='Password (will prompt if unspecified)') g.add_argument('-c','--cert', help='PEM file containing client certificate (and optionally private key)') g.add_argument('--computer', default=os.uname()[1], help="Computer name (default is `hostname`)") +g.add_argument('--clientos', choices=set(clientos_map.values()), default=default_clientos, help="clientos value to send (default is %(default)s)") g.add_argument('--key', help='PEM file containing client private key (if not included in same file as certificate)') p.add_argument('-b','--browse', action='store_true', help='Automatically spawn browser for SAML') p.add_argument('--no-verify', dest='verify', action='store_false', default=True, help='Ignore invalid server certificate') @@ -53,7 +57,13 @@ s.headers['User-Agent'] = 'PAN GlobalProtect' s.cert = cert if prelogin: - data = extra + data={ + # sent by many clients but not known to have any effect + 'tmp': 'tmp', 'clientVer': 4100, 'kerberos-support': 'yes', 'ipv6-support': 'yes', + # affects some clients' behavior (https://github.com/dlenski/gp-saml-gui/issues/6#issuecomment-599743060) + 'clientos': args.clientos, + **extra + } else: # same request params work for /global-protect/getconfig.esp as for /ssl-vpn/login.esp if args.user == None: @@ -104,10 +114,10 @@ Extracted connection cookie from . 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 - 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: - 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)