Skip to content

Fixed following O365 update #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xenov-X wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed following O365 update #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4ad61
Fixing detection of O365 use and accomodating edge case where randomi…
Xenov-X Apr 16, 2020
f449bfd
Added accomodation for federated login detection
Xenov-X Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions UhOh365.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,26 @@ def thread_worker(args):
if domain not in domain_is_o365.keys():
junk_user = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(20))
r = requests.get('https://outlook.office365.com/autodiscover/autodiscover.json/v1.0/{}@{}?Protocol=Autodiscoverv1'.format(junk_user, domain), headers=headers, verify=args.nossl, allow_redirects=False, proxies=proxies)
if 'outlook.office365.com' in r.text:
if r.status_code == 302 and 'outlook.com/autodiscover' in r.text:
domain_is_o365[domain] = True
elif r.status_code == 302 and 'https://outlook.office365.com/autodiscover' in r.text:
domain_is_o365[domain] = True
elif r.status_code == 200 and 'https://outlook.office.com/api' in r.text:
domain_is_o365[domain] = True
elif r.status_code == 200 and 'https://outlook.office365.com' in r.text:
domain_is_o365[domain] = True
else:
if args.verbose:
print("It doesn't look like '{}' uses o365".format(domain))
domain_is_o365[domain] = False
r = requests.get('https://outlook.office365.com/autodiscover/autodiscover.json/v1.0/{}?Protocol=Autodiscoverv1'.format(email), headers=headers, verify=args.nossl, allow_redirects=False, proxies=proxies)
if r.status_code == 200 and "X-MailboxGuid" in r.headers.keys():
if r.status_code == 200:
print("VALID: ", email)
if args.output is not None:
print_queue.put(email)
elif r.status_code == 302:
if domain_is_o365[domain] and 'outlook.office365.com' not in r.text:
print("VALID: ", email)
print("INVALID: ", email)
if args.output is not None:
print_queue.put(email)
else:
Expand Down