os-mnemo/pan-globalprotect-okta
1
0
Fork 0
mirror of https://github.com/os-mnemo/pan-globalprotect-okta synced 2026-07-31 07:44:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from supertylerc/fix-8/raw-input

Browse Source 
Fix `raw_input` for py3
This commit is contained in:
Andris Raugulis
2019-01-22 13:37:30 +02:00
committed by GitHub
parent 1f8db7d309 bc77639d3a
commit c2e6663a60
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gp-okta.py
+3 -2
View File
@@ -34,6 +34,7 @@ if sys.version_info >= (3,):
else: else:
text_type = unicode text_type = unicode
binary_type = str binary_type = str
input = raw_input
to_b = lambda v: v if isinstance(v, binary_type) else v.encode('utf-8') to_b = lambda v: v if isinstance(v, binary_type) else v.encode('utf-8')
to_u = lambda v: v if isinstance(v, text_type) else v.decode('utf-8') to_u = lambda v: v if isinstance(v, text_type) else v.decode('utf-8')
@@ -116,7 +117,7 @@ def load_conf(cf):
continue continue
conf[k] = v.strip() conf[k] = v.strip()
if len(conf.get('username', '').strip()) == 0: if len(conf.get('username', '').strip()) == 0:
conf['username'] = raw_input('username: ').strip() conf['username'] = input('username: ').strip()
if len(conf.get('password', '').strip()) == 0: if len(conf.get('password', '').strip()) == 0:
conf['password'] = getpass.getpass('password: ').strip() conf['password'] = getpass.getpass('password: ').strip()
for k in keys: for k in keys:
@@ -244,7 +245,7 @@ def okta_mfa_totp(conf, s, factors, state_token):
secret = conf.get('totp.{0}'.format(provider), '') or '' secret = conf.get('totp.{0}'.format(provider), '') or ''
code = None code = None
if len(secret) == 0: if len(secret) == 0:
code = raw_input('{0} TOTP: '.format(provider)).strip() code = input('{0} TOTP: '.format(provider)).strip()
else: else:
import pyotp import pyotp
totp = pyotp.TOTP(secret) totp = pyotp.TOTP(secret)