Index: binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs (revision 332) +++ binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs (revision 351) @@ -11,6 +11,6 @@ private readonly string staticPart; - public ApiHandler (string staticPart, string moduleName = null) : base (moduleName) { - this.staticPart = staticPart; + public ApiHandler (string _staticPart, string _moduleName = null) : base (_moduleName) { + staticPart = _staticPart; foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) { @@ -45,10 +45,18 @@ #endif - 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, permissionLevel)) { - resp.StatusCode = (int) HttpStatusCode.Forbidden; - if (user != null) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + string apiName = _req.Url.AbsolutePath.Remove (0, staticPart.Length); + + WebAPI api; + if (!apis.TryGetValue (apiName, out api)) { + Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\""); + _resp.StatusCode = (int) HttpStatusCode.NotFound; + return; + } + + 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); } @@ -57,29 +65,21 @@ } - WebAPI api; - if (apis.TryGetValue (apiName, out api)) { - try { + try { #if ENABLE_PROFILER - apiHandlerSampler.Begin (); + apiHandlerSampler.Begin (); #endif - api.HandleRequest (req, resp, user, permissionLevel); + api.HandleRequest (_req, _resp, _user, _permissionLevel); #if ENABLE_PROFILER - apiHandlerSampler.End (); + apiHandlerSampler.End (); #endif - return; - } catch (Exception e) { - Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", api.Name); - Log.Exception (e); - resp.StatusCode = (int) HttpStatusCode.InternalServerError; - return; - } + } catch (Exception e) { + Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", api.Name); + Log.Exception (e); + _resp.StatusCode = (int) HttpStatusCode.InternalServerError; } - - Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\""); - resp.StatusCode = (int) HttpStatusCode.NotFound; } - private bool AuthorizeForCommand (string apiName, WebConnection user, int permissionLevel) { - return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + apiName, permissionLevel); + private bool AuthorizeForCommand (string _apiName, WebConnection _user, int _permissionLevel) { + return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + _apiName, _permissionLevel); } } Index: binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs (revision 332) +++ binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs (revision 351) @@ -18,7 +18,7 @@ } - public ItemIconHandler (string staticPart, bool logMissingFiles, string moduleName = null) : base (moduleName) { - this.staticPart = staticPart; - this.logMissingFiles = logMissingFiles; + public ItemIconHandler (string _staticPart, bool _logMissingFiles, string _moduleName = null) : base (_moduleName) { + staticPart = _staticPart; + logMissingFiles = _logMissingFiles; Instance = this; } @@ -26,26 +26,26 @@ public static ItemIconHandler Instance { get; private set; } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { if (!loaded) { - resp.StatusCode = (int) HttpStatusCode.InternalServerError; + _resp.StatusCode = (int) HttpStatusCode.InternalServerError; Log.Out ("Web:IconHandler: Icons not loaded"); return; } - string requestFileName = req.Url.AbsolutePath.Remove (0, staticPart.Length); + string requestFileName = _req.Url.AbsolutePath.Remove (0, staticPart.Length); requestFileName = requestFileName.Remove (requestFileName.LastIndexOf ('.')); - if (icons.ContainsKey (requestFileName) && req.Url.AbsolutePath.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) { - resp.ContentType = MimeType.GetMimeType (".png"); + if (icons.ContainsKey (requestFileName) && _req.Url.AbsolutePath.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) { + _resp.ContentType = MimeType.GetMimeType (".png"); byte[] itemIconData = icons [requestFileName]; - resp.ContentLength64 = itemIconData.Length; - resp.OutputStream.Write (itemIconData, 0, itemIconData.Length); + _resp.ContentLength64 = itemIconData.Length; + _resp.OutputStream.Write (itemIconData, 0, itemIconData.Length); } else { - resp.StatusCode = (int) HttpStatusCode.NotFound; + _resp.StatusCode = (int) HttpStatusCode.NotFound; if (logMissingFiles) { - Log.Out ("Web:IconHandler:FileNotFound: \"" + req.Url.AbsolutePath + "\" "); + Log.Out ("Web:IconHandler:FileNotFound: \"" + _req.Url.AbsolutePath + "\" "); } } Index: binary-improvements/MapRendering/Web/Handlers/PathHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/PathHandler.cs (revision 332) +++ binary-improvements/MapRendering/Web/Handlers/PathHandler.cs (revision 351) @@ -14,10 +14,10 @@ } - public abstract void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel); + public abstract void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel); - public bool IsAuthorizedForHandler (WebConnection user, int permissionLevel) { + public bool IsAuthorizedForHandler (WebConnection _user, int _permissionLevel) { if (moduleName != null) { - return WebPermissions.Instance.ModuleAllowedWithLevel (moduleName, permissionLevel); + return WebPermissions.Instance.ModuleAllowedWithLevel (moduleName, _permissionLevel); } Index: binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs (revision 332) +++ binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs (revision 351) @@ -10,6 +10,6 @@ private readonly string staticPart; - public SessionHandler (string _staticPart, string _dataFolder, Web _parent, string moduleName = null) : - base (moduleName) { + public SessionHandler (string _staticPart, string _dataFolder, Web _parent, string _moduleName = null) : + base (_moduleName) { staticPart = _staticPart; parent = _parent; @@ -24,7 +24,7 @@ } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - string subpath = req.Url.AbsolutePath.Remove (0, staticPart.Length); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + string subpath = _req.Url.AbsolutePath.Remove (0, staticPart.Length); StringBuilder result = new StringBuilder (); @@ -32,6 +32,6 @@ if (subpath.StartsWith ("verify")) { - if (user != null) { - resp.Redirect ("/static/index.html"); + if (_user != null) { + _resp.Redirect ("/static/index.html"); return; } @@ -40,10 +40,10 @@ "

Login failed, click to return to main page.

"); } else if (subpath.StartsWith ("logout")) { - if (user != null) { - parent.connectionHandler.LogOut (user.SessionID); + if (_user != null) { + parent.connectionHandler.LogOut (_user.SessionID); Cookie cookie = new Cookie ("sid", "", "/"); cookie.Expired = true; - resp.AppendCookie (cookie); - resp.Redirect ("/static/index.html"); + _resp.AppendCookie (cookie); + _resp.Redirect ("/static/index.html"); return; } @@ -52,7 +52,7 @@ "

Not logged in, click to return to main page.

"); } else if (subpath.StartsWith ("login")) { - string host = (Web.isSslRedirected (req) ? "https://" : "http://") + req.UserHostName; + string host = (Web.isSslRedirected (_req) ? "https://" : "http://") + _req.UserHostName; string url = OpenID.GetOpenIdLoginUrl (host, host + "/session/verify"); - resp.Redirect (url); + _resp.Redirect (url); return; } else { @@ -63,9 +63,9 @@ result.Append (footer); - resp.ContentType = MimeType.GetMimeType (".html"); - resp.ContentEncoding = Encoding.UTF8; + _resp.ContentType = MimeType.GetMimeType (".html"); + _resp.ContentEncoding = Encoding.UTF8; byte[] buf = Encoding.UTF8.GetBytes (result.ToString ()); - resp.ContentLength64 = buf.Length; - resp.OutputStream.Write (buf, 0, buf.Length); + _resp.ContentLength64 = buf.Length; + _resp.OutputStream.Write (buf, 0, buf.Length); } } Index: binary-improvements/MapRendering/Web/Handlers/SimpleRedirectHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/SimpleRedirectHandler.cs (revision 332) +++ binary-improvements/MapRendering/Web/Handlers/SimpleRedirectHandler.cs (revision 351) @@ -5,11 +5,11 @@ private readonly string target; - public SimpleRedirectHandler (string target, string moduleName = null) : base (moduleName) { - this.target = target; + public SimpleRedirectHandler (string _target, string _moduleName = null) : base (_moduleName) { + target = _target; } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - resp.Redirect (target); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + _resp.Redirect (target); } } Index: binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs (revision 332) +++ binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs (revision 351) @@ -10,26 +10,26 @@ private readonly string staticPart; - public StaticHandler (string staticPart, string filePath, AbstractCache cache, bool logMissingFiles, - string moduleName = null) : base (moduleName) { - this.staticPart = staticPart; - datapath = filePath + (filePath [filePath.Length - 1] == '/' ? "" : "/"); - this.cache = cache; - this.logMissingFiles = logMissingFiles; + public StaticHandler (string _staticPart, string _filePath, AbstractCache _cache, bool _logMissingFiles, + string _moduleName = null) : base (_moduleName) { + staticPart = _staticPart; + datapath = _filePath + (_filePath [_filePath.Length - 1] == '/' ? "" : "/"); + cache = _cache; + logMissingFiles = _logMissingFiles; } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + string fn = _req.Url.AbsolutePath.Remove (0, staticPart.Length); byte[] content = cache.GetFileContent (datapath + fn); if (content != null) { - resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn)); - resp.ContentLength64 = content.Length; - resp.OutputStream.Write (content, 0, content.Length); + _resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn)); + _resp.ContentLength64 = content.Length; + _resp.OutputStream.Write (content, 0, content.Length); } else { - resp.StatusCode = (int) HttpStatusCode.NotFound; + _resp.StatusCode = (int) HttpStatusCode.NotFound; if (logMissingFiles) { - Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + fn + "\""); + Log.Out ("Web:Static:FileNotFound: \"" + _req.Url.AbsolutePath + "\" @ \"" + datapath + fn + "\""); } } Index: binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs (revision 332) +++ binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs (revision 351) @@ -5,13 +5,13 @@ namespace AllocsFixes.NetConnections.Servers.Web.Handlers { public class UserStatusHandler : PathHandler { - public UserStatusHandler (string moduleName = null) : base (moduleName) { + public UserStatusHandler (string _moduleName = null) : base (_moduleName) { } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONObject result = new JSONObject (); - result.Add ("loggedin", new JSONBoolean (user != null)); - result.Add ("username", new JSONString (user != null ? user.SteamID.ToString () : string.Empty)); + result.Add ("loggedin", new JSONBoolean (_user != null)); + result.Add ("username", new JSONString (_user != null ? _user.SteamID.ToString () : string.Empty)); JSONArray perms = new JSONArray (); @@ -19,5 +19,5 @@ JSONObject permObj = new JSONObject (); permObj.Add ("module", new JSONString (perm.module)); - permObj.Add ("allowed", new JSONBoolean (perm.permissionLevel >= permissionLevel)); + permObj.Add ("allowed", new JSONBoolean (perm.permissionLevel >= _permissionLevel)); perms.Add (permObj); } @@ -25,5 +25,5 @@ result.Add ("permissions", perms); - WebAPI.WriteJSON (resp, result); + WebAPI.WriteJSON (_resp, result); } }