Changeset 316 for binary-improvements/MapRendering

Timestamp:

Apr 6, 2018, 3:30:17 PM (7 years ago)

Author:

alloc

Message:

Fixed: Steam OpenID login

Location:

binary-improvements/MapRendering

Files:

• ModInfo.xml (modified) (1 diff)
• Web/OpenID.cs (modified) (2 diffs)

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Render the game map to image map tiles as it is uncovered" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="23" />
+                <Version value="24" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/MapRendering/Web/OpenID.cs

@@ -14 +14 @@
         public static class OpenID {
                 private const string STEAM_LOGIN = "https://steamcommunity.com/openid/login";
-                private static Regex steamIdUrlMatcher = new Regex (@"^http:\/\/steamcommunity\.com\/openid\/id\/([0-9]{17,18})");
+                private static Regex steamIdUrlMatcher = new Regex (@"^https?:\/\/steamcommunity\.com\/openid\/id\/([0-9]{17,18})");
 
                 private static readonly X509Certificate2 caCert = new X509Certificate2 (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) + "/steam-rootca.cer");
@@ -111 +111 @@
 
                 public static ulong Validate (HttpListenerRequest _req) {
-                        if (getValue (_req, "openid.mode") == "cancel") {
+                        string mode = getValue (_req, "openid.mode");
+                        if (mode == "cancel") {
                                 Log.Warning ("Steam OpenID login canceled");
+                                return 0;
+                        }
+                        if (mode == "error") {
+                                Log.Warning ("Steam OpenID login error: " + getValue (_req, "openid.error"));
                                 return 0;
                         }