Changeset 244 for binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

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)

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);
                 }