Skip to content

Commit

Permalink
Merge pull request #54 from JeremJR/master
Browse files Browse the repository at this point in the history 
Handle challenge selection and iap challenge
  • Loading branch information
@stevemac007
stevemac007 committed Feb 22, 2018
2 parents c4dac37 + 4781294 commit 4b05f45
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 0 deletions.
5 changes: 5 additions & 0 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ by this tool are:
| SMS (or voice | ``.../signin/challenge/ipp/2?...`` |
| call) | |
+------------------+-------------------------------------+
| SMS (or voice | ``.../signin/challenge/iap/...`` |
| call) with | |
| number | |
| submission | |
+------------------+-------------------------------------+
| Google Prompt | ``.../signin/challenge/az/2?...`` |
| (phone app) | |
+------------------+-------------------------------------+
Expand Down
97 changes: 97 additions & 0 deletions aws_google_auth/google.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ def do_login(self):

self.session.headers['Referer'] = sess.url

if "selectchallenge/" in sess.url:
sess = self.handle_selectchallenge(sess)

# Was there an MFA challenge?
if "challenge/totp/" in sess.url:
sess = self.handle_totp(sess)
Expand All @@ -136,6 +139,8 @@ def do_login(self):
sess = self.handle_prompt(sess)
elif "challenge/sk/" in sess.url:
sess = self.handle_sk(sess)
elif "challenge/iap/" in sess.url:
sess = self.handle_iap(sess)

# ... there are different URLs for backup codes (printed)
# and security keys (eg yubikey) as well
Expand Down Expand Up @@ -309,3 +314,95 @@ def handle_totp(self, sess):
sess.raise_for_status()

return sess

def handle_iap(self, sess):
response_page = BeautifulSoup(sess.text, 'html.parser')
challenge_url = sess.url.split("?")[0]
try:
phone_number = raw_input('Enter your phone number:') or None
except NameError:
phone_number = input('Enter your phone number:') or None

while True:
try:
choice = int(input('Type 1 to receive a code by SMS or 2 for a voice call:'))
except ValueError:
print("Not an integer! Try again.")
continue
else:
if choice == 1:
send_method = 'SMS'
elif choice == 2:
send_method = 'VOICE'
else:
continue
break

payload = {
'challengeId': response_page.find('input', {'name': 'challengeId'}).get('value'),
'challengeType': response_page.find('input', {'name': 'challengeType'}).get('value'),
'continue': self.cont,
'scc': response_page.find('input', {'name': 'scc'}).get('value'),
'sarp': response_page.find('input', {'name': 'sarp'}).get('value'),
'checkedDomains': response_page.find('input', {'name': 'checkedDomains'}).get('value'),
'pstMsg': response_page.find('input', {'name': 'pstMsg'}).get('value'),
'TL': response_page.find('input', {'name': 'TL'}).get('value'),
'gxf': response_page.find('input', {'name': 'gxf'}).get('value'),
'phoneNumber': phone_number,
'sendMethod': send_method,
}

# Submit phone number and desired method (SMS or voice call)
sess = self.session.post(challenge_url, data=payload)
sess.raise_for_status()

response_page = BeautifulSoup(sess.text, 'html.parser')
challenge_url = sess.url.split("?")[0]

try:
token = raw_input("Enter " + send_method + " token: G-") or None
except NameError:
token = input("Enter " + send_method + " token: G-") or None

payload = {
'challengeId': response_page.find('input', {'name': 'challengeId'}).get('value'),
'challengeType': response_page.find('input', {'name': 'challengeType'}).get('value'),
'continue': response_page.find('input', {'name': 'continue'}).get('value'),
'scc': response_page.find('input', {'name': 'scc'}).get('value'),
'sarp': response_page.find('input', {'name': 'sarp'}).get('value'),
'checkedDomains': response_page.find('input', {'name': 'checkedDomains'}).get('value'),
'pstMsg': response_page.find('input', {'name': 'pstMsg'}).get('value'),
'TL': response_page.find('input', {'name': 'TL'}).get('value'),
'gxf': response_page.find('input', {'name': 'gxf'}).get('value'),
'pin': token,
}

# Submit SMS/VOICE token
sess = self.session.post(challenge_url, data=payload)
sess.raise_for_status()

return sess

def handle_selectchallenge(self, sess):
response_page = BeautifulSoup(sess.text, 'html.parser')
challenge_id = response_page.find('input', {'name': 'challengeId'}).get('value')

payload = {
'challengeId': challenge_id,
'challengeType': response_page.find('input', {'name': 'challengeType'}).get('value'),
'continue': response_page.find('input', {'name': 'continue'}).get('value'),
'scc': response_page.find('input', {'name': 'scc'}).get('value'),
'sarp': response_page.find('input', {'name': 'sarp'}).get('value'),
'checkedDomains': response_page.find('input', {'name': 'checkedDomains'}).get('value'),
'pstMsg': response_page.find('input', {'name': 'pstMsg'}).get('value'),
'TL': response_page.find('input', {'name': 'TL'}).get('value'),
'gxf': response_page.find('input', {'name': 'gxf'}).get('value'),
'subAction': 'selectChallenge',
'SendMethod': 'SMS',
}

# Choose SMS challenge
sess = self.session.post('https://accounts.google.com/signin/challenge/ipp/' + str(challenge_id), data=payload)
sess.raise_for_status()

return sess

0 comments on commit 4b05f45

Please sign in to comment.