Merge branch '0.8.1.0-dev' of https://github.com/rcmaehl/MSEdgeRedirect into 0.8.1.0-dev

Author: rcmaehl

Includes/_Security.au3

@@ -165,6 +165,8 @@ Func _IsSafeFlag(ByRef $sCommandLine)
 				Case "--windows-store-app"
 					ContinueCase
 				Case "--winrt-background-task-event"
+					ContinueCase
+				Case "--profile-directory=Default"
 					$bSafe = True
 				Case Else
 					$bSafe = False
@@ -206,8 +208,8 @@ Func _IsSafeURL(ByRef $sURL)
 	Local $bSafe = False
 
 	If $sURL = "" Or StringRegExp($sURL, "\s+") Then
-		_Log($hLogs[$AppSecurity], "Received Blank Micorsoft Edge Call, droppping..." & @CRLF)
-		Return False
+		_Log($hLogs[$AppSecurity], "Received Blank Microsoft Edge Call." & @CRLF)
+		Return SetError(1, 0, 0)
 	Else
 		$aURL = StringSplit($sURL, ":")
 		If $aURL[0] < 2 Then

Includes/_URLModifications.au3

@@ -147,6 +147,7 @@ Func _ChangeNewsProvider($sURL)
 		$sURL = ""
 
 		For $iLoop = 1 To $aURL[0] - 1 Step 1 ; Get longest section (Article Title)
+			If Not StringInStr($aURL[$iLoop], "-") Then ContinueLoop
 			If StringLen($aURL[$iLoop]) > StringLen($sURL) Then $sURL = $aURL[$iLoop]
 		Next
 

MSEdgeRedirect.au3

@@ -63,7 +63,7 @@ Func ActiveMode(ByRef $aCMDLine)
 
 	$aCMDLine = FixTreeIntegrity($aCMDLine)
 	CheckEdgeIntegrity($aCMDLine[1])
-	$aCMDLine[1] = StringReplace($aCMDLine[1], "msedge.exe", "msedge_IFEO.exe")
+	$aCMDLine[1] = StringReplace($aCMDLine[1], "msedge.exe", "IFEO\msedge.exe")
 
 	Select
 		Case $aCMDLine[0] = 1 ; No Parameters
@@ -130,7 +130,7 @@ Func CheckEdgeIntegrity($sLocation)
 		Exit
 	Else
 		Select
-			Case Not FileExists(StringReplace($sLocation, "\msedge.exe", "\msedge_IFEO.exe"))
+			Case Not FileExists(StringReplace($sLocation, "\msedge.exe", "\IFEO\msedge.exe"))
 				If WinExists(_Translate($aMUI[1], "Admin File Copy Required")) Then
 					_LogClose()
 					Exit ; #202
@@ -643,6 +643,7 @@ EndFunc
 Func _DecodeAndRun($sEdge = $aEdges[1], $sCMDLine = "")
 
 	Local $sURL = ""
+	Local $bIsSafe
 	Local $aCMDLine
 
 	Select
@@ -762,7 +763,9 @@ Func _DecodeAndRun($sEdge = $aEdges[1], $sCMDLine = "")
 			$sCMDLine = StringReplace($sCMDLine, "?url=", "")
 			If StringInStr($sCMDLine, "%2F") Then $sCMDLine = _WinAPI_UrlUnescape($sCMDLine)
 			_Log($hLogs[$AppGeneral], "Caught Other Edge Call:" & @CRLF & $sCMDLine & @CRLF)
-			If _IsSafeURL($sCMDLine) Then
+			$bIsSafe = _IsSafeURL($sCMDLine)
+			If @error Then _SafeRun($sEdge) ; Empty URL
+			If $bIsSafe Then
 				$sCMDLine = _ModifyURL($sCMDLine)
 				ShellExecute($sCMDLine)
 			Else

MSEdgeRedirect_Wrapper.au3

@@ -230,6 +230,10 @@ Func RunRemoval($bUpdate = False)
 			If FileExists(StringReplace($aEdges[$iLoop], "\msedge.exe", "\msedge_IFEO.exe")) Then ; 0.8.0.0+
 				FileDelete(StringReplace($aEdges[$iLoop], "\msedge.exe", "\msedge_IFEO.exe"))
 			EndIf
+			If FileExists(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\msedge.exe")) Then ; 0.8.1.0+
+				FileDelete(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\msedge.exe"))
+				DirRemove(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\"))
+			EndIf
 		Next
 	EndIf
 
@@ -260,7 +264,10 @@ Func RunRepair()
 					;;;
 				Else
 					_Log($hLogs[$Install], "Repairing SymLinks." & @CRLF)
-					_WinAPI_CreateSymbolicLink(StringReplace($aEdges[$iLoop], "\msedge.exe", "\msedge_IFEO.exe"), $aEdges[$iLoop])
+					If Not FileExists(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\")) Then
+						DirCreate(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\"))
+					EndIf
+					_WinAPI_CreateSymbolicLink(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\msedge.exe"), $aEdges[$iLoop])
 				EndIf
 			EndIf
 		Next
@@ -1422,7 +1429,8 @@ Func SetIFEORegistry(ByRef $aChannels)
 			If $iLoop = $aEdges[0] Then
 				;;;
 			Else
-				_WinAPI_CreateSymbolicLink(StringReplace($aEdges[$iLoop], "\msedge.exe", "\msedge_IFEO.exe"), $aEdges[$iLoop])
+				DirCreate(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\"))
+				_WinAPI_CreateSymbolicLink(StringReplace($aEdges[$iLoop], "\msedge.exe", "\IFEO\msedge.exe"), $aEdges[$iLoop])
 			EndIf
 		EndIf
 	Next