Some pylint fixes.

This commit is contained in:
Andris Raugulis
2020-05-26 02:08:21 +00:00
parent d801a6e91e
commit 18b0ea085f
+15 -25
View File
@@ -177,7 +177,7 @@ def parse_rjson(r):
except Exception as e: except Exception as e:
err('failed to parse json: {0}'.format(e)) err('failed to parse json: {0}'.format(e))
def parse_form(html, current_url = None): def parse_form(html, current_url=None):
# type: (etree._Element, Optional[str]) -> Tuple[str, Dict[str, str]] # type: (etree._Element, Optional[str]) -> Tuple[str, Dict[str, str]]
xform = html.find('.//form') xform = html.find('.//form')
url = xform.attrib.get('action', '').strip() url = xform.attrib.get('action', '').strip()
@@ -270,6 +270,7 @@ class Conf(object):
return self._lines[name] return self._lines[name]
return 0 return 0
# pylint: disable=protected-access
@classmethod @classmethod
def from_data(cls, content): def from_data(cls, content):
# type: (str) -> Conf # type: (str) -> Conf
@@ -359,7 +360,7 @@ def get_state_token(conf, c):
state_token = to_n(to_b(rx_state_token.group(1)).decode('unicode_escape').strip()) state_token = to_n(to_b(rx_state_token.group(1)).decode('unicode_escape').strip())
return state_token return state_token
def get_redirect_url(conf, c, current_url = None): def get_redirect_url(conf, c, current_url=None):
# type: (Conf, str, Optional[str]) -> Optional[str] # type: (Conf, str, Optional[str]) -> Optional[str]
rx_base_url = re.search(r'var\s*baseUrl\s*=\s*\'([^\']+)\'', c) rx_base_url = re.search(r'var\s*baseUrl\s*=\s*\'([^\']+)\'', c)
rx_from_uri = re.search(r'var\s*fromUri\s*=\s*\'([^\']+)\'', c) rx_from_uri = re.search(r'var\s*fromUri\s*=\s*\'([^\']+)\'', c)
@@ -463,14 +464,13 @@ def okta_saml(conf, saml_xml):
log('okta saml request [okta_url]') log('okta saml request [okta_url]')
url, data = parse_form(saml_xml) url, data = parse_form(saml_xml)
dbg_form(conf, 'okta.saml request', data) dbg_form(conf, 'okta.saml request', data)
_, _h, c = send_req(conf, 'okta', 'saml', url, data, _, _h, c = send_req(conf, 'okta', 'saml', url, data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
redirect_url = get_redirect_url(conf, c, url) redirect_url = get_redirect_url(conf, c, url)
if redirect_url is None: if redirect_url is None:
err('did not find redirect url') err('did not find redirect url')
return redirect_url return redirect_url
def okta_auth(conf, stateToken = None): def okta_auth(conf, stateToken=None):
# type: (Conf, Optional[str]) -> Any # type: (Conf, Optional[str]) -> Any
log('okta auth request [okta_url]') log('okta auth request [okta_url]')
url = '{0}/api/v1/authn'.format(conf.okta_url) url = '{0}/api/v1/authn'.format(conf.okta_url)
@@ -507,8 +507,7 @@ def okta_transaction_state(conf, j):
if len(state_token) == 0: if len(state_token) == 0:
err('empty state token') err('empty state token')
data = {'stateToken': state_token} data = {'stateToken': state_token}
_, _h, j = send_json_req(conf, 'okta', 'skip', url, data, _, _h, j = send_json_req(conf, 'okta', 'skip', url, data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
return False, j return False, j
# status: password_expired # status: password_expired
# status: recovery # status: recovery
@@ -593,8 +592,7 @@ def okta_mfa_totp(conf, factor, state_token):
'passCode': code 'passCode': code
} }
log('mfa {0} totp request: {1} [okta_url]'.format(provider, code)) log('mfa {0} totp request: {1} [okta_url]'.format(provider, code))
_, _h, j = send_json_req(conf, 'okta', 'totp mfa', factor.get('url', ''), data, _, _h, j = send_json_req(conf, 'okta', 'totp mfa', factor.get('url', ''), data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
return j return j
def okta_mfa_sms(conf, factor, state_token): def okta_mfa_sms(conf, factor, state_token):
@@ -605,15 +603,13 @@ def okta_mfa_sms(conf, factor, state_token):
'stateToken': state_token 'stateToken': state_token
} }
log('mfa {0} sms request [okta_url]'.format(provider)) log('mfa {0} sms request [okta_url]'.format(provider))
_, _h, j = send_json_req(conf, 'okta', 'sms mfa (1)', factor.get('url', ''), data, _, _h, j = send_json_req(conf, 'okta', 'sms mfa (1)', factor.get('url', ''), data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
code = input('{0} SMS verification code: '.format(provider)).strip() code = input('{0} SMS verification code: '.format(provider)).strip()
if len(code) == 0: if len(code) == 0:
return None return None
data['passCode'] = code data['passCode'] = code
log('mfa {0} sms request [okta_url]'.format(provider)) log('mfa {0} sms request [okta_url]'.format(provider))
_, _h, j = send_json_req(conf, 'okta', 'sms mfa (2)', factor.get('url', ''), data, _, _h, j = send_json_req(conf, 'okta', 'sms mfa (2)', factor.get('url', ''), data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
return j return j
def okta_mfa_push(conf, factor, state_token): def okta_mfa_push(conf, factor, state_token):
@@ -627,9 +623,7 @@ def okta_mfa_push(conf, factor, state_token):
status = 'MFA_CHALLENGE' status = 'MFA_CHALLENGE'
counter = 0 counter = 0
while status == 'MFA_CHALLENGE': while status == 'MFA_CHALLENGE':
_, _h, j = send_json_req(conf, 'okta', 'push mfa ({0})'.format(counter), _, _h, j = send_json_req(conf, 'okta', 'push mfa ({0})'.format(counter), factor.get('url', ''), data, expected_url=conf.okta_url)
factor.get('url', ''), data,
expected_url=conf.okta_url)
status = j.get('status', '').strip() status = j.get('status', '').strip()
dbg(conf.debug, 'status', status) dbg(conf.debug, 'status', status)
if status == 'MFA_CHALLENGE': if status == 'MFA_CHALLENGE':
@@ -649,8 +643,7 @@ def okta_mfa_webauthn(conf, factor, state_token):
data = { data = {
'stateToken': state_token 'stateToken': state_token
} }
_, _h, j = send_json_req(conf, 'okta', 'webauthn mfa challenge', factor.get('url', ''), data, _, _h, j = send_json_req(conf, 'okta', 'webauthn mfa challenge', factor.get('url', ''), data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
rfactor = j['_embedded']['factor'] rfactor = j['_embedded']['factor']
profile = rfactor['profile'] profile = rfactor['profile']
purl = parse_url(conf.okta_url) purl = parse_url(conf.okta_url)
@@ -678,8 +671,7 @@ def okta_mfa_webauthn(conf, factor, state_token):
'authenticatorData': to_n((base64.b64encode(assertion.auth_data)).decode('ascii')) 'authenticatorData': to_n((base64.b64encode(assertion.auth_data)).decode('ascii'))
} }
log('mfa {0} signature request [okta_url]'.format(provider)) log('mfa {0} signature request [okta_url]'.format(provider))
_, _h, j = send_json_req(conf, 'okta', 'uf2 mfa signature', j['_links']['next']['href'], data, _, _h, j = send_json_req(conf, 'okta', 'uf2 mfa signature', j['_links']['next']['href'], data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
return j return j
def okta_redirect(conf, session_token, redirect_url, gateway_url=None): def okta_redirect(conf, session_token, redirect_url, gateway_url=None):
@@ -736,7 +728,7 @@ def okta_redirect(conf, session_token, redirect_url, gateway_url=None):
dbg(conf.debug, 'saml prop', [saml_auth_status, saml_slo]) dbg(conf.debug, 'saml prop', [saml_auth_status, saml_slo])
return saml_username, prelogin_cookie return saml_username, prelogin_cookie
def paloalto_getconfig(conf, username = None, prelogin_cookie = None, can_fail = False): def paloalto_getconfig(conf, username=None, prelogin_cookie=None, can_fail=False):
# type: (Conf, Optional[str], Optional[str], bool) -> Tuple[int, str, Dict[str, str]] # type: (Conf, Optional[str], Optional[str], bool) -> Tuple[int, str, Dict[str, str]]
log('getconfig request [vpn_url]') log('getconfig request [vpn_url]')
url = '{0}/global-protect/getconfig.esp'.format(conf.vpn_url) url = '{0}/global-protect/getconfig.esp'.format(conf.vpn_url)
@@ -789,14 +781,12 @@ def okta_saml_2(conf, gateway_url, saml_xml):
log('okta saml request (2) [okta_url]') log('okta saml request (2) [okta_url]')
url, data = parse_form(saml_xml) url, data = parse_form(saml_xml)
dbg_form(conf, 'okta.saml request(2)', data) dbg_form(conf, 'okta.saml request(2)', data)
_, h, c = send_req(conf, 'okta', 'okta saml request (2)', url, data, _, h, c = send_req(conf, 'okta', 'okta saml request (2)', url, data, expected_url=conf.okta_url)
expected_url=conf.okta_url)
xhtml = parse_html(c) xhtml = parse_html(c)
url, data = parse_form(xhtml) url, data = parse_form(xhtml)
dbg_form(conf, 'okta.saml request(2)', data) dbg_form(conf, 'okta.saml request(2)', data)
log('okta redirect form request (2) [gateway]') log('okta redirect form request (2) [gateway]')
_, h, c = send_req(conf, 'gateway', 'okta redirect form (2)', url, data, _, h, c = send_req(conf, 'gateway', 'okta redirect form (2)', url, data, expected_url=gateway_url)
expected_url=gateway_url)
saml_username = h.get('saml-username', '').strip() saml_username = h.get('saml-username', '').strip()
if len(saml_username) == 0: if len(saml_username) == 0:
err('saml-username empty') err('saml-username empty')