Made AuthenticationHelper more robust.

IdentityServer · Jun 17, 2013 · 394b923 · 394b923
1 parent 25e5776
commit 394b923
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/Libraries/Thinktecture.IdentityServer.Protocols/Shared/AuthenticationHelper.cs b/src/Libraries/Thinktecture.IdentityServer.Protocols/Shared/AuthenticationHelper.cs
@@ -278,11 +278,20 @@ public RelyingParty GetRelyingPartyDetailsFromReturnUrl(string returnUrl)
             }
 
             var url = HttpUtility.UrlDecode(returnUrl);
-            var message = WSFederationMessage.CreateFromUri(new Uri("http://foo.com" + url, UriKind.Absolute)) as SignInRequestMessage;
+            Uri uri;
 
-            if (message != null)
+            if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out uri))
             {
-                return GetRelyingPartyDetails(message.Realm);
+                WSFederationMessage message;
+
+                if (WSFederationMessage.TryCreateFromUri(uri, out message))
+                {
+                    var signin = message as SignInRequestMessage;
+                    if (signin != null)
+                    {
+                        return GetRelyingPartyDetails(signin.Realm);
+                    }
+                }
             }
 
             return null;