admin/0xZDH-o365spray
1
0
Fork 0
mirror of https://github.com/0xZDH/o365spray synced 2026-06-08 10:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
160 Commits 2 Branches 0 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ZedH 28d8d1b18c Merge pull request #30 from babariviere/fix/strip-output-dir 
fix: only strip output dir from right side
 2024-08-26 07:23:23 -04:00
ZedH 0e506cafc7 Merge pull request #29 from Macmod/master 
Fixed mistake from PR#27 and added better logging for error messages
 2024-03-21 17:11:01 -04:00
ZedH e4a39d5c57 Merge pull request #27 from api0cradle/master 
Changed MFA message
 2024-03-20 09:37:43 -04:00
0xZDH b17b05628c Update CHANGELOG mentions 2023-11-20 10:12:51 -05:00
0xZDH 1593448648 Bump version and update CHANGELOG 2023-11-20 10:08:57 -05:00
ZDH 7cff71112a Merge pull request #25 from Macmod/upstream_issue21_fix 
Resolve #21
 2023-11-19 21:56:34 -05:00
ZDH a794c97d0e Module and code updates (#19) 
* Add scope, resource, and client_id randomization for the oauth2 enumeration and spraying modules
* Several code tweaks for general clean up
 2022-11-14 16:06:29 -05:00
ZDH 5a42a9d1e2 Merge pull request #18 from 0xZDH/useragent 
Add User-Agent randomization handling
 2022-11-12 12:35:41 -05:00
0xZDH 38275bc64f Tweak banner method conditionals 2022-11-12 12:33:38 -05:00
0xZDH 281e005fd1 Add support for user agent randomization 2022-11-03 17:28:08 -04:00
ZDH 14659a77b6 Update README 2022-09-23 15:25:04 -04:00
ZDH da78dd2a90 Merge pull request #14 from 0xZDH/dev 
v3.0.0

- Add/update modules
- Code overhaul
- Add support for FireProx proxying via Enum and Spraying
- Several bug fixes
 2022-09-23 15:14:11 -04:00
ZDH 6ad4dd40ac Update README 2022-09-23 14:30:00 -04:00
0xZDH 6906145218 Update README 2022-08-12 00:09:33 -04:00
0xZDH e259374b77 Remove fireprox handling from validation module 
For now, don't use fireprox handling when validating a domain as
it can cause conflicts if the spray/enum module differe from the
validation module base domain
 2022-08-11 21:00:36 -04:00
ZDH 54f088bd4a Update setup.cfg 
Update find package method from find: to find_namespace: in order to fix setuptools install method
 2022-08-09 13:08:13 -04:00
ZDH ce1f7d26fc Update setup.cfg 
Update the version attribute to allow proper import during pipx installations
 2022-08-09 01:18:05 -04:00
0xZDH eb0f409c45 Update oAuth2 enumeration client ID to be valid 2022-08-06 04:02:42 -04:00
0xZDH d2225ce2d6 Update README.md 2022-08-06 03:44:14 -04:00
0xZDH b295e961e8 Add support for FireProx handling 2022-08-06 03:43:24 -04:00
0xZDH 62dc0fb915 Update README.md 2022-08-06 01:31:51 -04:00
0xZDH 4ad33630f4 Fix docstring typo 2022-08-06 01:28:36 -04:00
0xZDH 0fdc83d6d4 v3.0.0 updates 2022-08-06 01:25:28 -04:00
ZDH a585432f26 Bump version: v2.0.4 2021-08-30 23:31:53 -04:00
ZDH 252c50aa12 Update list of valid of AADSTS codes 
When spraying, check against a more complete list of valid AADSTS
codes that indicate valid credentials
 2021-08-30 23:25:52 -04:00
ZDH 447f3e5310 Merge pull request #10 from 0xZDH/module-updates 
v2.0.3
 2021-08-12 00:51:51 -04:00
ZDH b7a6cf7274 Fix errors in disabled module 2021-08-12 00:18:19 -04:00
ZDH a2e58ed287 Update CHANGELOG 2021-08-11 23:57:49 -04:00
ZDH 98de05695a Clean up AADSTS error code handling during spraying 2021-08-11 23:50:41 -04:00
ZDH 1ea437bb33 Update enum module 
- Tweak the onedrive enum module to better handle tenant parsing,
but still mark as TODO for further testing
 2021-08-11 23:29:01 -04:00
ZDH d8a2561f4e Add proper internal exit handling 
- When an invalid client is identified, handle internal exitting
properly
 2021-08-11 23:05:47 -04:00
ZDH 891b96018a Fix adfs spray module 
- Fix error in regex logic that was breaking valid auth
 2021-08-11 22:52:28 -04:00
ZDH 84d23eacf9 Add note about federated spraying and oAuth2 2021-08-11 14:17:16 -04:00
ZDH 17cfce9bd4 Fix format strings in handlers 2021-08-11 12:52:27 -04:00
ZDH 8d5fd53540 Use valid client_id for oAuth2 spraying 2021-08-11 10:42:35 -04:00
ZDH 61048f485a Clean up spray modules 
- Change module naming of 'msol' to 'oauth2'
- Default oauth2 module for spraying
 2021-08-11 10:25:34 -04:00
ZDH 4f02271f36 Disable activesync enum module based on testing 2021-08-11 09:15:06 -04:00
ZDH fc6f00c666 Add handling if the DesktopSsoEnabled key doesnt exist 2021-08-11 08:07:56 -04:00
ZDH a7440243c3 Bump version 2021-08-09 06:09:28 -04:00
ZDH a720da79fc Add better handling for office enum module 2021-08-09 06:00:35 -04:00
ZDH 8e2bf32584 Merge pull request #9 from 0xZDH/new-modules 
New spray module and bug fixes
 2021-08-01 22:16:47 -04:00
ZDH 26ba53bf7d Fix variable name typos 
- Handle emptied user lists during spraying
- Fix invalid data type
 2021-08-01 22:13:47 -04:00
ZDH 8ba1a3287c Add O365 reporting API password spraying module 
Via:
https://danielchronlund.com/2020/03/17/azure-ad-password-spray-attacks-with-powershell-and-how-to-defend-your-tenant/
https://github.com/xFreed0m/ADFSpray
 2021-07-20 03:30:14 -04:00
ZDH a4d1647a6d Merge pull request #6 from 0xZDH/updates 
Code overhaul and module updates
 2021-07-15 21:21:41 -04:00
ZDH 52c2f679b0 Update CHANGELOG 2021-07-15 21:19:27 -04:00
ZDH 117fd70f73 Include oAuth2 enum module for lockout resetting 2021-07-15 21:16:47 -04:00
ZDH 6f30847214 Update README 2021-07-15 21:12:20 -04:00
ZDH b2786fe843 Add oAuth2 user enumeration module 
Via AADInternals: https://github.com/Gerenios/AADInternals/blob/master/KillChain_utils.ps1#L112
 2021-07-15 14:47:54 -04:00
ZDH 97962eaba8 Fix bug in sprayer handler 
When using cycle() with a single password while zipping users ->
passwords, we need to make sure the single password is within a
list() object otherwise cycle will iterate over each charactr of
the password instead of cycling the whole password with each
username.
 2021-06-18 23:21:56 -04:00
ZDH 03f8c9d931 Fix enum var reference 2021-06-17 17:17:59 -04:00
ZDH 3b49865e76 Add o365spray.py script 
Allow tool to be run from script instead of pip install to keep
backwards compatibility on systems like BlackArch:
https://github.com/BlackArch/blackarch/blob/master/packages/o365spray/PKGBUILD
 2021-06-14 12:45:15 -04:00
ZDH 23e65966b8 Fix variable name reference 2021-06-14 02:06:05 -04:00
ZDH 830742a43d Fix randint() call to start at 1 
When randomizing sleep, set random range between 1 and 120 seconds
since the assumption is if randomizing we want to enable throttling
 2021-06-13 23:34:34 -04:00
ZDH 6b781e9292 Add sleep and jitter handling based on #5 2021-06-13 23:31:34 -04:00
ZDH c7a545bb8e Several updates and clean ups 
- Add unit testing
- Catch manually raised exceptions
- Clean up comments
- Update README
 2021-06-13 22:52:02 -04:00
ZDH 7b0bd628d7 Initial rewrite of tool 
Still multiple a work in progress -- enumerator and sprayer handlers
need further validation and stress testing.
 2021-06-13 05:55:09 -04:00
ZDH e235abdceb Fix Autodiscover spraying lockout handling 
Fix the way the Autodiscover spraying module handles locked
accounts as testing showed that the locked account indication is
no longer reliable.
 2020-08-05 17:38:41 -04:00
ZDH a3429db70e Merge pull request #4 from 0xZDH/office-update 
Merge office-update branch
 2020-08-05 01:25:51 -04:00
ZDH f4ffeedaf1 Code cleanup 
Clean up of code and commenting throughout tool. Updated the
--paired flag to handle username:password files correctly.
 2020-08-05 01:20:20 -04:00
ZDH 02104b63dd Update formatting in README 2020-07-24 22:44:34 -04:00
ZDH 3f83434dad Add office enumeration module 
Implement an office.com enumeration module and set it as the
default enumeration module for Managed realms.
 2020-07-24 22:41:13 -04:00
ZDH 55e3d515b6 Update forced ADFS handling 2020-07-09 14:31:55 -04:00
ZDH 2ca09af72e Update ADFS enumeration handling using OneDrive 2020-07-09 14:26:51 -04:00
ZDH 334b791671 Fix typos in README 2020-07-01 10:11:54 -04:00
ZDH 3e722325eb Fix typos in the tool help 2020-07-01 10:09:46 -04:00
ZDH bc730c4eaf Merge pull request #3 from 0xZDH/ms-fixes 
Merge ms-fixes -> master
 2020-06-24 11:51:37 -04:00
ZDH 0c9add7ded Update README 2020-06-24 01:50:03 -04:00
ZDH 3fcf044962 Add start time in banner 2020-06-21 12:12:15 -04:00
ZDH 322ca584f6 Fix conditional handling in spray module 
Fix if/else conditional to make sure invalid is indicated during a
spray. Also, add some notes about Autodiscover spraying/enum
 2020-06-18 14:17:52 -04:00
ZDH a01497b0e4 Fix prompt_question helper function call 2020-06-18 10:49:24 -04:00
ZDH 7323b545f1 Update README 
Update tool usage spacing
 2020-06-17 19:27:06 -04:00
ZDH bb01eae472 Fix ADFS spraying 
Since we pull the AuthUrl for ADFS during domain validation, we
need to update the URL for each user instead of leaving the default
bogus username in the GET param
 2020-06-17 17:16:28 -04:00
ZDH 0358252f3a Update handling of ADFS context switching 2020-06-17 14:39:45 -04:00
ZDH 05972f284f Update README 
Update notes and Acknowledgments
 2020-06-17 01:40:20 -04:00
ZDH 0edf652dec Update Acknowledgments 2020-06-16 21:48:49 -04:00
ZDH 1e14a90aa5 Update Acknowledgments 2020-06-16 21:47:57 -04:00
ZDH d0770aad69 Update validation handling 
Handle domain validation when an ADFS url has not already been
specified. If the realm is federeated, switch contexts to perform
ADFS spraying and prompt the user to continue so they are aware
of the switch
 2020-06-16 21:46:06 -04:00
ZDH 46e35901b5 Update Acknowledgments 2020-06-16 21:13:18 -04:00
ZDH b5b4262748 Minor fixes + Update README 2020-06-16 21:10:22 -04:00
ZDH 5f86e95b4d ADFS: Add support for federated sprays 
If the realm of the target is Federated, grab the AuthUrl, force
skipping enumeration since this does not currently work against a
federated realm, and spray the direct ADFS server - if spraying is
enabled.
 2020-06-16 21:02:26 -04:00
ZDH 7e1ca67890 Remove ActiveSync 403/404 check 
Default all non-200/401 responses as bad users based on the new
fixes MS put in place
 2020-06-16 18:22:29 -04:00
ZDH 8ff876830b Update README and help 
Fix help and README references to remove Autodiscover enum and
default spray/enum types
 2020-06-16 16:33:36 -04:00
ZDH 1f8a2798b5 Update enum and spray module outputs 
Fix overlap error with invalid vs valid print statements where
invalid was too long and leaving characters on valid print lines.
 2020-06-16 16:29:51 -04:00
ZDH a08fbed9e4 Update versioning and fix validation check 
AuthUrl is only a valid field when the realm is federated
 2020-06-16 16:21:34 -04:00
ZDH 382d42c495 Add fixes for breaking changes that MS did 
Add some ActiveSyn changes that are aimed at bypassing the new
fixes that MS put in place to prevent enumeration/spraying.
 2020-06-16 16:15:51 -04:00
ZDH 64a1e1a028 Fix missing args for msol spray handler 2020-05-25 17:49:09 -04:00
ZDH 34ec678f4f Fix logging output of sprayed and valid credentials to avoid overwriting data 2020-05-07 16:13:27 -04:00
ZDH 8b54d66b77 Merge pull request #2 from 0xZDH/asyncio-rewrite 
Merge asyncio rewrite branch
 2020-04-29 20:03:37 -04:00
ZDH 7a7a2bdf03 Add OneDrive enum method via https://github.com/nyxgeek/onedrive_user_enum 2020-04-29 18:15:29 -04:00
ZDH 3046903213 Fix comment 2020-04-29 11:25:44 -04:00
ZDH 7eca270539 Update autodiscover enum checks - remove X-MailGuid for now 2020-04-29 11:24:50 -04:00
ZDH 34d8e857cf Update config output at start of tool execution 2020-04-25 03:11:27 -04:00
ZDH 8458f02e7a Update Autodiscover enum output status 2020-04-24 23:50:41 -04:00
ZDH 9fae37ac60 Add verbose banner with config settings -- clean up spacing 2020-04-12 00:16:46 -04:00
ZDH 4441294f4b Clean up comments 2020-04-05 01:03:31 -04:00
ZDH 16eae31c67 Remove aiohttp requirement as this now uses asyncio threading 2020-04-03 17:38:30 -04:00
ZDH df5a814a04 Fix logic to stop password spray on locked account threshold 2020-04-03 17:33:53 -04:00
ZDH 5bec535f35 Update README 2020-04-03 15:33:41 -04:00
ZDH ad6e626a98 Update README 2020-04-03 15:28:37 -04:00
ZDH f382df439c Update README 2020-04-03 15:26:09 -04:00