Changeset 154 for binary-improvements/7dtd-server-fixes/src

Timestamp:

Sep 2, 2014, 9:32:25 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes/src

Files:

• JSON (added)
• JSON/JSONArray.cs (added)
• JSON/JSONBoolean.cs (added)
• JSON/JSONNode.cs (added)
• JSON/JSONNumber.cs (added)
• JSON/JSONObject.cs (added)
• JSON/JSONString.cs (added)
• NetConnections/Servers/Web/API (added)
• NetConnections/Servers/Web/API/GetPlayersLocation.cs (added)
• NetConnections/Servers/Web/API/GetPlayersOnline.cs (added)
• NetConnections/Servers/Web/API/WebAPI.cs (added)
• NetConnections/Servers/Web/ApiHandler.cs (added)
• NetConnections/Servers/Web/PathHandler.cs (modified) (1 diff)
• NetConnections/Servers/Web/StaticHandler.cs (modified) (3 diffs)
• NetConnections/Servers/Web/Web.cs (modified) (3 diffs)
• PersistentData/Player.cs (modified) (2 diffs)

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

@@ -6 +6 @@
         public abstract class PathHandler
         {
-                public abstract void HandleRequest(HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user);
+                public abstract void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user);
         }
 }

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

@@ -34 +34 @@
                                                 if (!fileCache.ContainsKey (fn)) {
                                                         if (!File.Exists (datapath + "/" + fn)) {
-                                                                resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                                                if (logMissingFiles)
-                                                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + fn + "\"");
-                                                                return;
+                                                                throw new FileNotFoundException ();
                                                         }
 
@@ -49 +46 @@
                                 } else {
                                         if (!File.Exists (datapath + "/" + fn)) {
-                                                resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                                if (logMissingFiles)
-                                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + fn + "\"");
-                                                return;
+                                                throw new FileNotFoundException ();
                                         }
 
@@ -61 +55 @@
                                 resp.ContentLength64 = content.Length;
                                 resp.OutputStream.Write (content, 0, content.Length);
+                        } catch (FileNotFoundException e) {
+                                resp.StatusCode = (int)HttpStatusCode.NotFound;
+                                if (logMissingFiles)
+                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
+                                return;
                         } catch (Exception e) {
                                 Log.Out ("Error in StaticHandler.HandleRequest: " + e);

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

@@ -19 +19 @@
                                         throw new NotSupportedException ("Needs Windows XP SP2, Server 2003 or later.");
  
-                                handlers.Add ("/index.", new SimpleRedirectHandler ("/static/index.html"));
+                                handlers.Add ("/index.htm", new SimpleRedirectHandler ("/static/index.html"));
                                 handlers.Add ("/static/", new StaticHandler ("/static/", Application.dataPath + "/../webserver", false/*true*/, true)); // TODO: Enable cache
                                 handlers.Add ("/map/", new StaticHandler ("/map/", StaticDirectories.GetSaveGameDir () + "/map", false, false));
+                                handlers.Add ("/api/", new ApiHandler ("/api/"));
 
                                 _listener.Prefixes.Add (String.Format ("http://*:{0}/", port));
@@ -53 +54 @@
                                 ctx.Response.ProtocolVersion = new Version ("1.1");
 
-                                HttpListenerBasicIdentity user;
+                                HttpListenerBasicIdentity user = Authorize (ctx);
 
-                                if (Authorize (ctx, out user)) {
-                                        if (ctx.Request.Url.AbsolutePath.Length < 2) {
-                                                handlers ["/index."].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 (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.AddHeader("WWW-Authenticate", "Basic 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");
@@ -87 +83 @@
                 }
 
-                private bool Authorize (HttpListenerContext ctx, out HttpListenerBasicIdentity user)
+                private HttpListenerBasicIdentity Authorize (HttpListenerContext ctx)
                 {
-                        user = null;
-                        return true;
                         try {
-                                user = (HttpListenerBasicIdentity)ctx.User.Identity;
-                                return user.Name.Equals ("admin") && user.Password.Equals (GamePrefs.GetString (EnumGamePrefs.ControlPanelPassword));
+                                return (HttpListenerBasicIdentity)ctx.User.Identity;
                         } catch (NullReferenceException) {
-                                user = null;
-                                return false;
+                                return null;
                         }
                 }

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -17 +17 @@
                         lastOnline;
                 private Inventory inventory;
+                [OptionalField]
+                private int
+                        lastPositionX, lastPositionY, lastPositionZ;
                 [NonSerialized]
                 private ClientInfo
@@ -82 +85 @@
                 }
 
+                public Vector3i LastPosition {
+                        get {
+                                if (IsOnline)
+                                        return new Vector3i (Entity.GetPosition ());
+                                else
+                                        return new Vector3i (lastPositionX, lastPositionY, lastPositionZ);
+                        }
+                }
+
                 public void SetOffline ()
                 {
                         Log.Out ("Player set to offline: " + steamId);
+                        Vector3i lastPos = new Vector3i (Entity.GetPosition ());
+                        lastPositionX = lastPos.x;
+                        lastPositionY = lastPos.y;
+                        lastPositionZ = lastPos.z;
                         totalPlayTime += (long)(Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
                         lastOnline = DateTime.Now;