Return the InternalURL if ExternalURL is empty

Author: staaldraad

README.md

@@ -39,7 +39,7 @@ Ruler has multiple functions, these have their own documentation that can be fou
 
 # Attacking Exchange
 
-The library included with Ruler allows for the creation of custom message using MAPI. This along with the Exchnage documentation is a great starting point for new research. For an example of using this library in another project, see [SensePost Liniaal].
+The library included with Ruler allows for the creation of custom message using MAPI. This along with the Exchange documentation is a great starting point for new research. For an example of using this library in another project, see [SensePost Liniaal].
 
 # License
 [![License: CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-lightgrey.svg)](http://creativecommons.org/licenses/by-nc-sa/4.0/)

mapi/mapi.go

@@ -33,7 +33,10 @@ var AuthSession *utils.Session
 func ExtractMapiURL(resp *utils.AutodiscoverResp) string {
 	for _, v := range resp.Response.Account.Protocol {
 		if v.TypeAttr == "mapiHttp" {
-			return v.MailStore.ExternalUrl
+			if v.MailStore.ExternalUrl != "" {
+				return v.MailStore.ExternalUrl
+			}
+			return v.MailStore.InternalUrl
 		}
 	}
 	return ""
@@ -43,7 +46,10 @@ func ExtractMapiURL(resp *utils.AutodiscoverResp) string {
 func ExtractRPCURL(resp *utils.AutodiscoverResp) string {
 	for _, v := range resp.Response.Account.Protocol {
 		if v.TypeAttr == "rpcHttp" {
-			return v.MailStore.ExternalUrl
+			if v.MailStore.ExternalUrl != "" {
+				return v.MailStore.ExternalUrl
+			}
+			return v.MailStore.InternalUrl
 		}
 	}
 	return ""

ruler.go

@@ -1133,7 +1133,7 @@ func main() {
 
 	app.Name = "ruler"
 	app.Usage = "A tool to abuse Exchange Services"
-	app.Version = "2.1.10"
+	app.Version = "2.2.0"
 	app.Author = "Etienne Stalmans <[email protected]>, @_staaldraad"
 	app.Description = `         _
  _ __ _   _| | ___ _ __