Skip to content

Commit d6f7a46

Browse files
mlcsecmlcsec
committed
Updates
1 parent 63e0136 commit d6f7a46

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

‎.github/getpermissionid.png‎

235 Bytes
Loading

‎.github/getserviceprincipalapproleassignments.png‎

1.32 KB
Loading

‎graphpython.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ def list_commands():
182182
["Wipe-Device", "Wipe managed device"],
183183
]
184184

185-
helper_commands = [
186-
["Find-ObjectID", "Find object ID and display object properties"],
187-
["Find-PermissionID", "Identify Graph permission details (application/delegated, description, admin consent required, ...) for ID"]
185+
locator_commands = [
186+
["Locate-ObjectID", "Locate object ID and display object properties"],
187+
["Locate-PermissionID", "Locate Graph permission details (application/delegated, description, admin consent required, ...) for ID"]
188188
]
189189

190190
print("\nOutsider")
@@ -216,9 +216,9 @@ def list_commands():
216216
print(tabulate(cleanup_commands, tablefmt="plain"))
217217
print("\n")
218218

219-
print("\nHelpers")
219+
print("\nLocators")
220220
print("=" * 80)
221-
print(tabulate(helper_commands, tablefmt="plain"))
221+
print(tabulate(locator_commands, tablefmt="plain"))
222222
print("\n")
223223

224224
def forge_user_agent(device=None, browser=None):
@@ -647,7 +647,7 @@ def main():
647647
"list-sharepointsites","list-sharepointurls", "list-externalconnections", "list-applications", "list-serviceprincipals", "list-tenants", "list-joinedteams",
648648
"list-chats", "list-chatmessages", "list-devices", "list-administrativeunits", "list-onedrives", "list-recentonedrivefiles", "list-onedriveurls",
649649
"list-sharedonedrivefiles", "invoke-customquery", "invoke-search", "find-privilegedroleusers", "find-updatablegroups", "find-dynamicgroups","find-securitygroups",
650-
"find-objectid", "update-userpassword", "add-applicationpassword", "add-usertap", "add-groupmember", "create-application",
650+
"locate-objectid", "update-userpassword", "add-applicationpassword", "add-usertap", "add-groupmember", "create-application",
651651
"create-newuser", "invite-guestuser", "assign-privilegedrole", "open-owamailboxinbrowser", "dump-owamailbox", "spoof-owaemailmessage",
652652
"delete-user", "delete-group", "remove-groupmember", "delete-application", "delete-device", "wipe-device", "retire-device",
653653
"get-manageddevices", "get-userdevices", "get-caps", "get-devicecategories", "get-devicecompliancepolicies",
@@ -657,7 +657,7 @@ def main():
657657
"get-roledefinitions", "get-roleassignments", "display-avpolicyrules", "display-asrpolicyrules", "display-diskencryptionpolicyrules",
658658
"display-firewallrulepolicyrules", "display-lapsaccountprotectionpolicyrules", "display-usergroupaccountprotectionpolicyrules",
659659
"display-edrpolicyrules","add-exclusiongrouptopolicy", "deploy-maliciousscript", "reboot-device", "shutdown-device", "lock-device",
660-
"add-applicationpermission", "new-signedjwt", "add-applicationcertificate", "get-application", "find-permissionid", "get-serviceprincipal"
660+
"add-applicationpermission", "new-signedjwt", "add-applicationcertificate", "get-application", "locate-permissionid", "get-serviceprincipal"
661661
]
662662

663663

@@ -730,7 +730,7 @@ def main():
730730
"list-applications", "list-serviceprincipals", "list-tenants", "list-joinedteams", "list-chats",
731731
"list-chatmessages", "list-devices", "list-administrativeunits", "list-onedrives", "list-recentonedrivefiles", "list-onedriveurls",
732732
"list-sharedonedrivefiles", "invoke-customquery", "invoke-search", "find-privilegedroleusers",
733-
"find-updatablegroups", "find-dynamicgroups","find-securitygroups", "find-objectid", "update-userpassword", "add-applicationpassword",
733+
"find-updatablegroups", "find-dynamicgroups","find-securitygroups", "locate-objectid", "update-userpassword", "add-applicationpassword",
734734
"add-usertap", "add-groupmember", "create-application", "create-newuser", "invite-guestuser",
735735
"assign-privilegedrole", "open-owamailboxinbrowser", "dump-owamailbox", "spoof-owaemailmessage",
736736
"delete-user", "delete-group", "remove-groupmember", "delete-application", "delete-device", "wipe-device", "retire-device",
@@ -2571,7 +2571,7 @@ def base64url_encode(data):
25712571

25722572
# get-serviceprincipalapproleassignments
25732573
elif args.command and args.command.lower() == "get-serviceprincipalapproleassignments":
2574-
print_yellow("\n[*] Get-PersonalContacts")
2574+
print_yellow("\n[*] Get-ServicePrincipalAppRoleAssignments")
25752575
print("=" * 80)
25762576
api_url = f"https://graph.microsoft.com/v1.0/servicePrincipals/{args.id}/appRoleAssignments"
25772577
if args.select:
@@ -5715,17 +5715,17 @@ def base64url_encode(data):
57155715
print("=" * 80)
57165716

57175717

5718-
##########
5719-
# Helper #
5720-
##########
5718+
#############
5719+
# Resolvers #
5720+
#############
57215721

5722-
# find-objectid
5723-
elif args.command and args.command.lower() == "find-objectid":
5722+
# locate-objectid
5723+
elif args.command and args.command.lower() == "locate-objectid":
57245724
if not args.id:
5725-
print_red("[-] Error: --id required for Find-ObjectID command")
5725+
print_red("[-] Error: --id required for Locate-ObjectID command")
57265726
return
57275727

5728-
print_yellow("\n[*] Find-ObjectID")
5728+
print_yellow("\n[*] Locate-ObjectID")
57295729
print("=" * 80)
57305730
graph_api_url = "https://graph.microsoft.com/v1.0"
57315731
object_url = f"{graph_api_url}/directoryObjects/{args.id}"
@@ -5808,13 +5808,13 @@ def base64url_encode(data):
58085808

58095809
print("=" * 80)
58105810

5811-
# find-permissionid
5812-
elif args.command and args.command.lower() == "find-permissionid":
5811+
# locate-permissionid
5812+
elif args.command and args.command.lower() == "locate-permissionid":
58135813
if not args.id:
5814-
print_red("[-] Error: --id argument is required for Find-PermissionID command")
5814+
print_red("[-] Error: --id argument is required for Locate-PermissionID command")
58155815
return
58165816

5817-
print_yellow("\n[*] Find-PermissionID")
5817+
print_yellow("\n[*] Locate-PermissionID")
58185818
print("=" * 80)
58195819
def parse_html(content):
58205820
soup = BeautifulSoup(content, 'html.parser')

0 commit comments

Comments
 (0)