Version Update

Refactor Approved Verbs Add CllientID option for refresh Add info to Readme for PRT use
rvrsh3ll · Jun 29, 2023 · 1e46bf2 · 1e46bf2
1 parent b715be9
commit 1e46bf2
Show file tree

Hide file tree

Showing 7 changed files with 171 additions and 156 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ You may also use these tokens with [AAD Internals](https://o365blog.com/aadinter
 
 ```Get-Help Get-Azure-Token```
 
-```RefreshTo-SubstrateToken```
+```Invoke-RefreshToSubstrateToken```
 
 ### Generate Device Code
 
@@ -29,43 +29,49 @@ Once the user has logged in, you'll be presented with the JWT and it will be sav
 
 ### Refresh or Switch Tokens
 
-```RefreshTo-OutlookToken -domain myclient.org -refreshToken ey..```
+```Invoke-RefreshToOutlookToken -domain myclient.org -refreshToken 0.A```
 
 ```$OutlookToken.access_token```
 
 ### Connect
 ```Connect-AzureAD -AadAccessToken $response.access_token -AccountId user@myclient.org```
 
+### Refresh a PRT
+
+Once a PRT has been captured, auth with roadrecon to obtain your access_token and refresh_token. When refreshing with TokenTactics, use ClientID 1b730954-1685-4b74-9bfd-dac224a7b894.
+
+```Invoke-RefreshToMSGraphToken -domain myclient.org -ClientId 1b730954-1685-4b74-9bfd-dac224a7b894 -refreshToken 0.A```
+
 ### Clear tokens
-```Clear-Token -Token All```
+```Invoke-ClearToken -Token All```
 
 ### Commands
 ```powershell
 Get-Command -Module TokenTactics
 
 CommandType     Name                                               Version    Source
 -----------     ----                                               -------    ------
-Function        Clear-Token                                        0.0.1      TokenTactics
-Function        Dump-OWAMailboxViaMSGraphApi                       0.0.1      TokenTactics
-Function        Forge-UserAgent                                    0.0.1      TokenTactics
-Function        Get-AzureToken                                     0.0.1      TokenTactics
-Function        Get-TenantID                                       0.0.1      TokenTactics
-Function        Open-OWAMailboxInBrowser                           0.0.1      TokenTactics
-Function        Parse-JWTtoken                                     0.0.1      TokenTactics
-Function        RefreshTo-AzureCoreManagementToken                 0.0.1      TokenTactics
-Function        RefreshTo-AzureManagementToken                     0.0.1      TokenTactics
-Function        RefreshTo-DODMSGraphToken                          0.0.1      TokenTactics
-Function        RefreshTo-GraphToken                               0.0.1      TokenTactics
-Function        RefreshTo-MAMToken                                 0.0.1      TokenTactics
-Function        RefreshTo-MSGraphToken                             0.0.1      TokenTactics
-Function        RefreshTo-MSManageToken                            0.0.1      TokenTactics
-Function        RefreshTo-MSTeamsToken                             0.0.1      TokenTactics
-Function        RefreshTo-O365SuiteUXToken                         0.0.1      TokenTactics
-Function        RefreshTo-OfficeAppsToken                          0.0.1      TokenTactics
-Function        RefreshTo-OfficeManagementToken                    0.0.1      TokenTactics
-Function        RefreshTo-OutlookToken                             0.0.1      TokenTactics
-Function        RefreshTo-SubstrateToken                           0.0.1      TokenTactics
-Function        RefreshTo-YammerToken                           0.0.1      TokenTactics
+Function        Invoke-ClearToken                                        0.0.2      TokenTactics
+Function        Invoke-DumpOWAMailboxViaMSGraphApi                       0.0.2      TokenTactics
+Function        Invoke-ForgeUserAgent                                    0.0.2      TokenTactics
+Function        Get-AzureToken                                           0.0.2      TokenTactics
+Function        Get-TenantID                                             0.0.2      TokenTactics
+Function        Invoke-OpenOWAMailboxInBrowser                           0.0.2      TokenTactics
+Function        Invoke-ParseJWTtoken                                     0.0.2      TokenTactics
+Function        Invoke-RefreshToAzureCoreManagementToken                 0.0.2      TokenTactics
+Function        Invoke-RefreshToAzureManagementToken                     0.0.2      TokenTactics
+Function        Invoke-RefreshToDODMSGraphToken                          0.0.2      TokenTactics
+Function        Invoke-RefreshToGraphToken                               0.0.2      TokenTactics
+Function        Invoke-RefreshToMAMToken                                 0.0.2      TokenTactics
+Function        Invoke-RefreshToMSGraphToken                             0.0.2      TokenTactics
+Function        Invoke-RefreshToMSManageToken                            0.0.2      TokenTactics
+Function        Invoke-RefreshToMSTeamsToken                             0.0.2      TokenTactics
+Function        Invoke-RefreshToO365SuiteUXToken                         0.0.2      TokenTactics
+Function        Invoke-RefreshToOfficeAppsToken                          0.0.2      TokenTactics
+Function        Invoke-RefreshToOfficeManagementToken                    0.0.2      TokenTactics
+Function        Invoke-RefreshToOutlookToken                             0.0.2      TokenTactics
+Function        Invoke-RefreshToSubstrateToken                           0.0.2      TokenTactics
+Function        Invoke-RefreshToYammerToken                              0.0.2      TokenTactics
 ```
 
 ## Authors and contributors

diff --git a/TokenTactics.psd1 b/TokenTactics.psd1
@@ -3,7 +3,7 @@
 RootModule = 'TokenTactics.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.0.1'
+ModuleVersion = '0.0.2'
 
 # ID used to uniquely identify this module
 GUID = '1fd32d8d-69a8-4778-b5b7-7738f81f27f4'

diff --git a/TokenTactics.psm1 b/TokenTactics.psm1
@@ -25,30 +25,30 @@ foreach ($script in $scripts) {
 # Export functions
 $functions=@(
     # helpers.ps1
-    "Parse-JWTtoken"
-    "Get-TenantID"
+    "Invoke-ParseJWTtoken"
+    "Invoke-GetTenantID"
     # TokenHandler.ps1
     "Get-AzureToken"
-    "RefreshTo-SubstrateToken"
-    "RefreshTo-MSManageToken"
-    "RefreshTo-MSTeamsToken"
-    "RefreshTo-OfficeManagementToken"
-    "RefreshTo-OutlookToken"
-    "RefreshTo-MSGraphToken"
-    "RefreshTo-GraphToken"
-    "RefreshTo-OfficeAppsToken"
-    "RefreshTo-AzureCoreManagementToken"
-    "RefreshTo-AzureManagementToken"
-    "RefreshTo-MAMToken"
-    "RefreshTo-DODMSGraphToken"
-    "RefreshTo-O365SuiteUXToken"
-    "RefreshTo-YammerToken"
-    "Clear-Token"
+    "Invoke-RefreshToSubstrateToken"
+    "Invoke-RefreshToMSManageToken"
+    "Invoke-RefreshToMSTeamsToken"
+    "Invoke-RefreshToOfficeManagementToken"
+    "Invoke-RefreshToOutlookToken"
+    "Invoke-RefreshToMSGraphToken"
+    "Invoke-RefreshToGraphToken"
+    "Invoke-RefreshToOfficeAppsToken"
+    "Invoke-RefreshToAzureCoreManagementToken"
+    "Invoke-RefreshToAzureManagementToken"
+    "Invoke-RefreshToMAMToken"
+    "Invoke-RefreshToDODMSGraphToken"
+    "Invoke-RefreshToO365SuiteUXToken"
+    "Invoke-RefreshToYammerToken"
+    "Invoke-ClearToken"
     # CapBypass.ps1
-    "Forge-UserAgent"
+    "Invoke-ForgeUserAgent"
     # OutlookEmailAbuse.ps1
-    "Open-OWAMailboxInBrowser"
-    "Dump-OWAMailboxViaMSGraphApi"
+    "Invoke-OpenOWAMailboxInBrowser"
+    "Invoke-DumpOWAMailboxViaMSGraphApi"
 )
 $c = 0
 foreach($function in $functions)

diff --git a/modules/CapBypass.ps1 b/modules/CapBypass.ps1
@@ -1,4 +1,4 @@
-function Forge-UserAgent
+function Invoke-ForgeUserAgent
 {
       <#
     .DESCRIPTION

diff --git a/modules/OutlookEmailAbuse.ps1 b/modules/OutlookEmailAbuse.ps1
@@ -1,4 +1,4 @@
-function Open-OWAMailboxInBrowser
+function Invoke-OpenOWAMailboxInBrowser
 {
     <#
     .DESCRIPTION
@@ -73,13 +73,13 @@ function Open-OWAMailboxInBrowser
         }
    }  
 }
-function Dump-OWAMailboxViaMSGraphApi
+function Invoke-DumpOWAMailboxViaMSGraphApi
 {
 <#
     .DESCRIPTION
         Dump the OWA Office 365 mailbox with a Graph.Microsoft.com access token.
     .EXAMPLE
-        Dump-OWAMailboxViaMSGraphApi -AccessToken $MSGraphToken.access_token -mailFolder AllItems -top 1
+        Invoke-DumpOWAMailboxViaMSGraphApi -AccessToken $MSGraphToken.access_token -mailFolder AllItems -top 1
         ...
     #>
     [cmdletbinding()]