collective/nu-vpn-proxy
17
0
Fork 0
Code

log other resources loaded when verbosity > 1 (e.g. -vv flag)

Browse Source
This commit is contained in:
Daniel Lenski 2019-09-16 21:18:11 -07:00
parent d30ca2c960
commit f429acaa10
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gp-saml-gui.py
View File

@ -24,6 +24,7 @@ class SAMLLoginView:
# API reference: https://lazka.github.io/pgi-docs/#WebKit2-4.0 # API reference: https://lazka.github.io/pgi-docs/#WebKit2-4.0
self.success = False self.success = False
self.verbose = verbose
self.ctx = WebKit2.WebContext.get_default() self.ctx = WebKit2.WebContext.get_default()
self.cookies = self.ctx.get_cookie_manager() self.cookies = self.ctx.get_cookie_manager()
@ -38,18 +39,24 @@ class SAMLLoginView:
window.set_title("SAML Login") window.set_title("SAML Login")
window.connect('delete-event', Gtk.main_quit) window.connect('delete-event', Gtk.main_quit)
self.wview.connect('load-changed', self.get_saml_headers) self.wview.connect('load-changed', self.get_saml_headers)
self.wview.connect('resource-load-started', self.log_resources)
if html: if html:
self.wview.load_html(html, uri) self.wview.load_html(html, uri)
else: else:
self.wview.load_uri(uri) self.wview.load_uri(uri)
def log_resources(self, webview, resource, request):
if self.verbose > 1:
print('%s for resource %s' % (request.get_http_method() or 'Request', resource.get_uri()), file=stderr)
def get_saml_headers(self, webview, event): def get_saml_headers(self, webview, event):
if event != WebKit2.LoadEvent.FINISHED: if event != WebKit2.LoadEvent.FINISHED:
return return
mr = webview.get_main_resource() mr = webview.get_main_resource()
print("Finished loading %s..." % mr.get_uri(), file=stderr) if self.verbose:
print("Finished loading %s" % mr.get_uri(), file=stderr)
rs = mr.get_response() rs = mr.get_response()
h = rs.get_http_headers() h = rs.get_http_headers()
if h: if h:
@ -60,7 +67,8 @@ class SAMLLoginView:
h.foreach(listify) h.foreach(listify)
self.saml_result = d = dict(l) self.saml_result = d = dict(l)
if d: if d:
print("Got SAML relevant headers, done: %r" % d, file=stderr) if self.verbose:
print("Got SAML relevant headers, done: %r" % d, file=stderr)
self.success = True self.success = True
Gtk.main_quit() Gtk.main_quit()
@ -112,15 +120,15 @@ if __name__ == "__main__":
if sam is None or sr is None: if sam is None or sr is None:
p.error("This does not appear to be a SAML prelogin response (<saml-auth-method> or <saml-request> tags missing)") p.error("This does not appear to be a SAML prelogin response (<saml-auth-method> or <saml-request> tags missing)")
elif sam.text == 'POST': elif sam.text == 'POST':
print("Got SAML POST content, opening browser...", file=stderr)
html, uri = a2b_base64(sr.text).decode(), None html, uri = a2b_base64(sr.text).decode(), None
elif sam.text == 'REDIRECT': elif sam.text == 'REDIRECT':
print("Got SAML REDIRECT to %s, opening browser..." % sr.text, file=stderr)
uri, html = sr.text, None uri, html = sr.text, None
else: else:
p.error("Unknown SAML method (%s)" % sam.text) p.error("Unknown SAML method (%s)" % sam.text)
# spawn WebKit view to do SAML interactive login # spawn WebKit view to do SAML interactive login
if args.verbose:
print("Got SAML POST, opening browser...", file=stderr)
slv = SAMLLoginView(uri, html, verbose=args.verbose, cookies=args.cookies) slv = SAMLLoginView(uri, html, verbose=args.verbose, cookies=args.cookies)
Gtk.main() Gtk.main()
if not slv.success: if not slv.success: