Changeset 172

Timestamp:

Sep 5, 2014, 11:15:20 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs (modified) (4 diffs)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs

@@ -13 +13 @@
                 private readonly HttpListener _listener = new HttpListener ();
                 private Dictionary<string, PathHandler> handlers = new Dictionary<string, PathHandler> ();
+                private bool authEnabled = false;
+                private string realm = "7dtd Admin Panel";
 
                 public Web (int port)
@@ -26 +28 @@
 
                                 _listener.Prefixes.Add (String.Format ("http://*:{0}/", port));
-                                if (File.Exists (Application.dataPath + "/../webserver/protect"))
+                                authEnabled = File.Exists (Application.dataPath + "/../webserver/protect");
+                                if (authEnabled)
                                         _listener.AuthenticationSchemes = AuthenticationSchemes.Basic;
                                 _listener.Start ();
+                                _listener.Realm = realm;
 
                                 ThreadPool.QueueUserWorkItem ((o) =>
@@ -45 +49 @@
                                 );
 
-                                Log.Out ("Started Webserver on " + port + " (authentication " + (_listener.AuthenticationSchemes == AuthenticationSchemes.Basic ? "enabled" : "disabled") + ")");
+                                Log.Out ("Started Webserver on " + port + " (authentication " + (authEnabled ? "enabled" : "disabled") + ")");
                         } catch (Exception e) {
                                 Log.Out ("Error in Web.ctor: " + e);
@@ -58 +62 @@
                                 HttpListenerBasicIdentity user = Authorize (ctx);
 
-                                if (ctx.Request.Url.AbsolutePath.Length < 2) {
-                                        handlers ["/index.htm"].HandleRequest (ctx.Request, ctx.Response, user);
-                                        return;
-                                } else {
-                                        foreach (KeyValuePair<string, PathHandler> kvp in handlers) {
-                                                if (ctx.Request.Url.AbsolutePath.StartsWith (kvp.Key)) {
-                                                        kvp.Value.HandleRequest (ctx.Request, ctx.Response, user);
-                                                        return;
+                                if (!authEnabled || (user.Name.ToLower ().Equals ("admin") && user.Password.Equals (GamePrefs.GetString (EnumGamePrefs.ControlPanelPassword)))) {
+                                        if (ctx.Request.Url.AbsolutePath.Length < 2) {
+                                                handlers ["/index.htm"].HandleRequest (ctx.Request, ctx.Response, user);
+                                                return;
+                                        } else {
+                                                foreach (KeyValuePair<string, PathHandler> kvp in handlers) {
+                                                        if (ctx.Request.Url.AbsolutePath.StartsWith (kvp.Key)) {
+                                                                kvp.Value.HandleRequest (ctx.Request, ctx.Response, user);
+                                                                return;
+                                                        }
                                                 }
                                         }
+
+                                        Log.Out ("Error in Web.HandleRequest(): No handler found for path \"" + ctx.Request.Url.AbsolutePath + "\"");
+                                        ctx.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                                } else {
+                                        ctx.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+                                        ctx.Response.Headers ["WWW-Authenticate"] = "Basic realm=\"" + realm + "\"";
                                 }
-
-                                Log.Out ("Error in Web.HandleRequest(): No handler found for path \"" + ctx.Request.Url.AbsolutePath + "\"");
-                                ctx.Response.StatusCode = (int)HttpStatusCode.NotFound;
 
 //                              byte[] buf = Encoding.UTF8.GetBytes ("Hello World");

binary-improvements/bin/Release/7dtd-server-fixes_version.txt

@@ -1 @@
-Version:       0.92.5361.28833
+Version:       0.92.5361.41834