Changeset 311 for binary-improvements

Timestamp:

Aug 26, 2017, 8:00:09 PM (7 years ago)

Author:

alloc

Message:

Fixes 14_16_22

Location:

binary-improvements/MapRendering

Files:

• ModInfo.xml (modified) (1 diff)
• Web/Handlers/SessionHandler.cs (modified) (1 diff)
• Web/Web.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="21" />
+                <Version value="22" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs

@@ -52 +52 @@
                                 }
                         } else if (subpath.StartsWith ("login")) {
-                                string host = (parent.isSslRedirected ? "https://" : "http://") + req.UserHostName;
+                                string host = (Web.isSslRedirected (req) ? "https://" : "http://") + req.UserHostName;
                                 string url = OpenID.GetOpenIdLoginUrl (host, host + "/session/verify");
                                 resp.Redirect (url);

binary-improvements/MapRendering/Web/Web.cs

@@ -24 +24 @@
                 private bool useStaticCache = false;
 
-                public bool isSslRedirected {
-                        private set;
-                        get;
+                public static bool isSslRedirected (HttpListenerRequest req) {
+                        string proto = req.Headers ["X-Forwarded-Proto"];
+                        if (!string.IsNullOrEmpty (proto)) {
+                                return proto.Equals ("https", StringComparison.OrdinalIgnoreCase);
+                        }
+
+                        return false;
                 }
 
@@ -44 +48 @@
 
                                 // TODO: Read from config
-                                isSslRedirected = false;
                                 useStaticCache = false;