Changeset 244 for binary-improvements/MapRendering/Web/Handlers

Timestamp:

Jul 21, 2015, 9:51:32 PM (9 years ago)

Author:

alloc

Message:

Fixes intermediate state

Location:

binary-improvements/MapRendering/Web/Handlers

Files:

• . (added)
• ApiHandler.cs (moved) (moved from binary-improvements/MapRendering/Web/ApiHandler.cs ) (2 diffs)
• ItemIconHandler.cs (moved) (moved from binary-improvements/MapRendering/Web/ItemIconHandler.cs ) (2 diffs)
• PathHandler.cs (moved) (moved from binary-improvements/MapRendering/Web/PathHandler.cs ) (1 diff)
• SessionHandler.cs (added)
• SimpleRedirectHandler.cs (moved) (moved from binary-improvements/MapRendering/Web/SimpleRedirectHandler.cs ) (2 diffs)
• StaticHandler.cs (moved) (moved from binary-improvements/MapRendering/Web/StaticHandler.cs ) (3 diffs)
• UserStatusHandler.cs (added)

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

@@ -6 +6 @@
 using System.Threading;
 
-namespace AllocsFixes.NetConnections.Servers.Web
+namespace AllocsFixes.NetConnections.Servers.Web.Handlers
 {
-        public class ApiHandler : PathHandler
-        {
+        public class ApiHandler : PathHandler {
                 private string staticPart;
                 private Dictionary<String, WebAPI> apis = new Dictionary<string, WebAPI> ();
 
-                public ApiHandler (string staticPart)
-                {
+                public ApiHandler (string staticPart, string moduleName = null) : base(moduleName) {
                         this.staticPart = staticPart;
-                        apis.Add ("getlandclaims", new GetLandClaims ());
-                        apis.Add ("getplayersonline", new GetPlayersOnline ());
-                        apis.Add ("getplayerslocation", new GetPlayersLocation ());
-                        apis.Add ("getplayerinventory", new GetPlayerInventory ());
+                        addApi ("getlandclaims", new GetLandClaims ());
+                        addApi ("getplayersonline", new GetPlayersOnline ());
+                        addApi ("getplayerslocation", new GetPlayersLocation ());
+                        addApi ("getplayerinventory", new GetPlayerInventory ());
+                        addApi ("getstats", new GetStats ());
                 }
 
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user)
-                {
+                private void addApi (string _apiName, WebAPI _api) {
+                        apis.Add (_apiName, _api);
+                        WebPermissions.Instance.AddKnownModule ("webapi." + _apiName);
+                }
+
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel) {
                         string apiName = req.Url.AbsolutePath.Remove (0, staticPart.Length);
-                        if (!AuthorizeForCommand (apiName, user)) {
+                        if (!AuthorizeForCommand (apiName, user, permissionLevel)) {
                                 resp.StatusCode = (int)HttpStatusCode.Forbidden;
+                                if (user != null) {
+                                        Log.Out ("ApiHandler: user '{0}' not allowed to execute '{1}'", user.SteamID, apiName);
+                                } else {
+                                        Log.Out ("ApiHandler: unidentified user from '{0}' not allowed to execute '{1}'", req.RemoteEndPoint.Address, apiName);
+                                }
+                                return;
                         } else {
                                 foreach (KeyValuePair<string, WebAPI> kvp in apis) {
                                         try {
                                                 if (apiName.StartsWith (kvp.Key)) {
-                                                        kvp.Value.HandleRequest (req, resp, user);
+                                                        kvp.Value.HandleRequest (req, resp, user, permissionLevel);
                                                         return;
                                                 }
@@ -46 +55 @@
                 }
 
-                private bool AuthorizeForCommand (string apiName, HttpListenerBasicIdentity user)
-                {
-                        return true;
+                private bool AuthorizeForCommand (string apiName, WebConnection user, int permissionLevel) {
+                        return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + apiName, permissionLevel);
                 }
 

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

@@ -7 +7 @@
 using UnityEngine;
 
-namespace AllocsFixes.NetConnections.Servers.Web
+namespace AllocsFixes.NetConnections.Servers.Web.Handlers
 {
         public class ItemIconHandler : PathHandler
@@ -16 +16 @@
                 private bool loaded = false;
 
-                public ItemIconHandler (string staticPart, bool logMissingFiles) {
+                public ItemIconHandler (string staticPart, bool logMissingFiles, string moduleName = null) : base(moduleName) {
                         this.staticPart = staticPart;
                         this.logMissingFiles = logMissingFiles;
                 }
 
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user) {
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel) {
                         if (!loaded) {
                                 if (!LoadIcons ()) {

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

@@ -2 +2 @@
 using System.Net;
 
-namespace AllocsFixes.NetConnections.Servers.Web
+namespace AllocsFixes.NetConnections.Servers.Web.Handlers
 {
         public abstract class PathHandler
         {
-                public abstract void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user);
+                private string moduleName = null;
+                public string ModuleName {
+                        get { return moduleName; }
+                }
+
+                protected PathHandler (string _moduleName) {
+                        this.moduleName = _moduleName;
+                        WebPermissions.Instance.AddKnownModule (_moduleName);
+                }
+
+                public abstract void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel);
+
+                public bool IsAuthorizedForHandler (WebConnection user, int permissionLevel) {
+                        if (moduleName != null) {
+                                return WebPermissions.Instance.ModuleAllowedWithLevel (moduleName, permissionLevel);
+                        } else {
+                                return true;
+                        }
+                }
         }
 }

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

@@ -2 +2 @@
 using System.Net;
 
-namespace AllocsFixes.NetConnections.Servers.Web
+namespace AllocsFixes.NetConnections.Servers.Web.Handlers
 {
         public class SimpleRedirectHandler : PathHandler
@@ -8 +8 @@
                 string target;
 
-                public SimpleRedirectHandler (string target)
+                public SimpleRedirectHandler (string target, string moduleName = null) : base(moduleName)
                 {
                         this.target = target;
                 }
 
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user)
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
                 {
                         resp.Redirect (target);

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

@@ -5 +5 @@
 using System.Threading;
 
-namespace AllocsFixes.NetConnections.Servers.Web
+namespace AllocsFixes.NetConnections.Servers.Web.Handlers
 {
         public class StaticHandler : PathHandler
@@ -14 +14 @@
                 private bool logMissingFiles;
 
-                public StaticHandler (string staticPart, string filePath, AllocsFixes.FileCache.AbstractCache cache, bool logMissingFiles)
+                public StaticHandler (string staticPart, string filePath, AllocsFixes.FileCache.AbstractCache cache, bool logMissingFiles, string moduleName = null) : base(moduleName)
                 {
                         this.staticPart = staticPart;
@@ -22 +22 @@
                 }
 
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user)
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel)
                 {
                         string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length);