Changeset 404 for binary-improvements2/WebServer/src/UrlHandlers

Timestamp:

Feb 16, 2023, 3:50:53 PM (21 months ago)

Author:

alloc

Message:

Latest state including reworking to the permissions system

Location:

binary-improvements2/WebServer/src/UrlHandlers

Files:

• AbsHandler.cs (modified) (3 diffs)
• ApiHandler.cs (modified) (4 diffs)
• SessionHandler.cs (modified) (7 diffs)
• SseHandler.cs (modified) (4 diffs)
• UserStatusHandler.cs (modified) (3 diffs)

binary-improvements2/WebServer/src/UrlHandlers/AbsHandler.cs

@@ +1 @@
+using Webserver.Permissions;
+
 namespace Webserver.UrlHandlers {
         public abstract class AbsHandler {
@@ -10 +12 @@
                 protected AbsHandler (string _moduleName, int _defaultPermissionLevel = 0) {
                         moduleName = _moduleName;
-                        WebPermissions.Instance.AddKnownModule (_moduleName, _defaultPermissionLevel);
+                        AdminWebModules.Instance.AddKnownModule (_moduleName, _defaultPermissionLevel);
                 }
 
@@ -16 +18 @@
 
                 public virtual bool IsAuthorizedForHandler (WebConnection _user, int _permissionLevel) {
-                        return moduleName == null || WebPermissions.Instance.ModuleAllowedWithLevel (moduleName, _permissionLevel);
+                        return moduleName == null || AdminWebModules.Instance.ModuleAllowedWithLevel (moduleName, _permissionLevel);
                 }
 

binary-improvements2/WebServer/src/UrlHandlers/ApiHandler.cs

@@ -3 +3 @@
 using System.Net;
 using System.Reflection;
+using Webserver.Permissions;
 using Webserver.WebAPI;
 
@@ -10 +11 @@
 
                 public ApiHandler () : base (null) {
-
                 }
+                
+                private static readonly Type[] apiWithParentCtorTypes = { typeof (Web) };
+                private static readonly object[] apiWithParentCtorArgs = new object[1];
+                private static readonly Type[] apiEmptyCtorTypes = { };
+                private static readonly object[] apiEmptyCtorArgs = { };
 
                 public override void SetBasePathAndParent (Web _parent, string _relativePath) {
                         base.SetBasePathAndParent (_parent, _relativePath);
 
-                        Type[] apiWithParentCtorTypes = { typeof (Web) };
-                        object[] apiWithParentCtorArgs = { _parent };
+                        apiWithParentCtorArgs[0] = _parent;
 
-                        Type[] apiEmptyCtorTypes = { };
-                        object[] apiEmptyCtorArgs = { };
-                        
-                        
-                        ReflectionHelpers.FindTypesImplementingBase (typeof (AbsWebAPI), _type => {
-                                ConstructorInfo ctor = _type.GetConstructor (apiWithParentCtorTypes);
-                                if (ctor != null) {
-                                        AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiWithParentCtorArgs);
-                                        addApi (apiInstance);
-                                        return;
-                                }
-                                        
-                                ctor = _type.GetConstructor (apiEmptyCtorTypes);
-                                if (ctor != null) {
-                                        AbsWebAPI apiInstance = (AbsWebAPI) ctor.Invoke (apiEmptyCtorArgs);
-                                        addApi (apiInstance);
-                                }
-                        });
+                        ReflectionHelpers.FindTypesImplementingBase (typeof (AbsWebAPI), apiFoundCallback);
 
                         // Permissions that don't map to a real API
@@ -43 +30 @@
                 }
 
+                private void apiFoundCallback (Type _type) {
+                        ConstructorInfo ctor = _type.GetConstructor (apiWithParentCtorTypes);
+                        if (ctor != null) {
+                                AbsWebAPI apiInstance = (AbsWebAPI)ctor.Invoke (apiWithParentCtorArgs);
+                                addApi (apiInstance);
+                                return;
+                        }
+
+                        ctor = _type.GetConstructor (apiEmptyCtorTypes);
+                        if (ctor != null) {
+                                AbsWebAPI apiInstance = (AbsWebAPI)ctor.Invoke (apiEmptyCtorArgs);
+                                addApi (apiInstance);
+                        }
+                }
+
                 private void addApi (AbsWebAPI _api) {
                         apis.Add (_api.Name, _api);
-                        WebPermissions.Instance.AddKnownModule ($"webapi.{_api.Name}", _api.DefaultPermissionLevel ());
+                        AdminWebModules.Instance.AddKnownModule ($"webapi.{_api.Name}", _api.DefaultPermissionLevel ());
                 }
 
@@ -92 +94 @@
 
                 private bool IsAuthorizedForApi (string _apiName, int _permissionLevel) {
-                        return WebPermissions.Instance.ModuleAllowedWithLevel ($"webapi.{_apiName}", _permissionLevel);
+                        return AdminWebModules.Instance.ModuleAllowedWithLevel ($"webapi.{_apiName}", _permissionLevel);
                 }
         }

binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs

@@ -5 +5 @@
 using Platform.Steam;
 using Utf8Json;
+using Webserver.Permissions;
 
 namespace Webserver.UrlHandlers {
@@ -10 +11 @@
                 private const string pageBasePath = "/app";
                 private const string pageErrorPath = "/app/error/";
-                
+
                 private const string steamOpenIdVerifyUrl = "verifysteamopenid";
                 private const string steamLoginUrl = "loginsteam";
+                private const string steamLoginFailedPage = "SteamLoginFailed";
+
                 private const string userPassLoginUrl = "login";
 
@@ -29 +32 @@
                         string subpath = _context.RequestPath.Remove (0, urlBasePath.Length);
 
+                        string remoteEndpointString = _context.Request.RemoteEndPoint!.ToString ();
+
                         if (subpath.StartsWith (steamOpenIdVerifyUrl)) {
-                                HandleSteamVerification (_context);
+                                HandleSteamVerification (_context, remoteEndpointString);
                                 return;
                         }
@@ -43 +48 @@
                                 return;
                         }
-                        
+
                         if (subpath.StartsWith (userPassLoginUrl)) {
-                                HandleUserPassLogin (_context);
+                                HandleUserPassLogin (_context, remoteEndpointString);
                                 return;
                         }
@@ -52 +57 @@
                 }
 
-                private void HandleUserPassLogin (RequestContext _context) {
+                private void HandleUserPassLogin (RequestContext _context, string _remoteEndpointString) {
                         if (!_context.Request.HasEntityBody) {
                                 _context.Response.Redirect (pageErrorPath + "NoLoginData");
@@ -83 +88 @@
                         }
 
-                        // TODO: Apply login
+                        AdminWebUsers.WebUser? webUser = AdminWebUsers.Instance.GetUser (username, password);
 
-                        string remoteEndpointString = _context.Request.RemoteEndPoint!.ToString ();
-
-                        if (username != "test" || password != "123") {
-                                // TODO: failed login
-                                Log.Out ($"[Web] User/pass login failed from {remoteEndpointString}");
+                        if (!webUser.HasValue) {
+                                Log.Out ($"[Web] User/pass login failed from {_remoteEndpointString}");
                                 _context.Response.Redirect (pageErrorPath + "UserPassInvalid");
                                 return;
                         }
-                        
-                        try {
-                                // TODO: Match username/password to UserIdentifierAbs / serveradmins.xml
-                                
-                                WebConnection con = connectionHandler.LogIn (new UserIdentifierSteam (76561198066968172ul), _context.Request.RemoteEndPoint.Address);
-                                int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
-                                Log.Out ($"[Web] User/pass login from {remoteEndpointString} with ID {con.UserId}, permission level {level}");
 
-                                Cookie cookie = new Cookie ("sid", con.SessionID, "/") {
-                                        Expired = false,
-                                        Expires = DateTime.MinValue,
-                                        HttpOnly = true,
-                                        Secure = false
-                                };
-                                _context.Response.AppendCookie (cookie);
-                                _context.Response.Redirect (pageBasePath);
-
-                                return;
-                        } catch (Exception e) {
-                                Log.Error ("[Web] Error during user/pass login:");
-                                Log.Exception (e);
-                        }
-
-                        _context.Response.Redirect (pageErrorPath + "UserPassLoginFailed");
+                        HandleUserIdLogin (_context, _remoteEndpointString, "user/pass", "UserPassLoginFailed", webUser.Value.Name, webUser.Value.PlatformUser, webUser.Value.CrossPlatformUser);
                 }
 
@@ -140 +120 @@
                 }
 
-                private void HandleSteamVerification (RequestContext _context) {
-                        string remoteEndpointString = _context.Request.RemoteEndPoint!.ToString ();
-
+                private void HandleSteamVerification (RequestContext _context, string _remoteEndpointString) {
+                        ulong id;
                         try {
-                                ulong id = OpenID.Validate (_context.Request);
-                                if (id > 0) {
-                                        WebConnection con = connectionHandler.LogIn (new UserIdentifierSteam (id), _context.Request.RemoteEndPoint.Address);
-                                        int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
-                                        Log.Out ($"[Web] Steam OpenID login from {remoteEndpointString} with ID {con.UserId}, permission level {level}");
-
-                                        Cookie cookie = new Cookie ("sid", con.SessionID, "/") {
-                                                Expired = false,
-                                                Expires = DateTime.MinValue,
-                                                HttpOnly = true,
-                                                Secure = false
-                                        };
-                                        _context.Response.AppendCookie (cookie);
-                                        _context.Response.Redirect (pageBasePath);
-
-                                        return;
-                                }
+                                id = OpenID.Validate (_context.Request);
                         } catch (Exception e) {
-                                Log.Error ("[Web] Error validating Steam login:");
+                                Log.Error ($"[Web] Error validating Steam login from {_remoteEndpointString}:");
                                 Log.Exception (e);
+                                _context.Response.Redirect (pageErrorPath + steamLoginFailedPage);
+                                return;
                         }
 
-                        Log.Out ($"[Web] Steam OpenID login failed from {remoteEndpointString}");
-                        _context.Response.Redirect (pageErrorPath + "SteamLoginFailed");
+                        if (id <= 0) {
+                                Log.Out ($"[Web] Steam OpenID login failed (invalid ID) from {_remoteEndpointString}");
+                                _context.Response.Redirect (pageErrorPath + steamLoginFailedPage);
+                                return;
+                        }
+
+                        UserIdentifierSteam userId = new UserIdentifierSteam (id);
+                        HandleUserIdLogin (_context, _remoteEndpointString, "Steam OpenID", steamLoginFailedPage, userId.ToString (), userId);
                 }
 
+                private void HandleUserIdLogin (RequestContext _context, string _remoteEndpointString, string _loginName, string _errorPage, string _username,
+                        PlatformUserIdentifierAbs _userId, PlatformUserIdentifierAbs _crossUserId = null) {
+                        try {
+                                WebConnection con = connectionHandler.LogIn (_context.Request.RemoteEndPoint!.Address, _username, _userId, _crossUserId);
+
+                                int level1 = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_userId);
+                                int level2 = int.MaxValue;
+                                if (_crossUserId != null) {
+                                        level2 = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_crossUserId);
+                                }
+
+                                int higherLevel = Math.Min (level1, level2);
+
+                                Log.Out ($"[Web] {_loginName} login from {_remoteEndpointString}, name {_username} with ID {_userId}, CID {(_crossUserId != null ? _crossUserId : "none")}, permission level {higherLevel}");
+                                Cookie cookie = new Cookie ("sid", con.SessionID, "/") {
+                                        Expired = false,
+                                        Expires = DateTime.MinValue,
+                                        HttpOnly = true,
+                                        Secure = false
+                                };
+                                _context.Response.AppendCookie (cookie);
+                                _context.Response.Redirect (pageBasePath);
+                        } catch (Exception e) {
+                                Log.Error ($"[Web] Error during {_loginName} login:");
+                                Log.Exception (e);
+                                _context.Response.Redirect (pageErrorPath + _errorPage);
+                        }
+                }
         }
 }

binary-improvements2/WebServer/src/UrlHandlers/SseHandler.cs

@@ -4 +4 @@
 using System.Reflection;
 using System.Threading;
+using Webserver.Permissions;
 using Webserver.SSE;
 
@@ -17 +18 @@
                 private bool shutdown;
 
+                private static readonly Type[] ctorTypes = { typeof (SseHandler) };
+                private static readonly object[] ctorParams = new object[1];
+
                 public SseHandler (string _moduleName = null) : base (_moduleName) {
-                        Type[] ctorTypes = { typeof (SseHandler) };
-                        object[] ctorParams = { this };
+                        ctorParams[0] = this;
 
-                        foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) {
-                                if (t.IsAbstract || !t.IsSubclassOf (typeof (AbsEvent))) {
-                                        continue;
-                                }
+                        ReflectionHelpers.FindTypesImplementingBase (typeof (AbsEvent), apiFoundCallback);
+                }
 
-                                ConstructorInfo ctor = t.GetConstructor (ctorTypes);
-                                if (ctor == null) {
-                                        continue;
-                                }
+                private void apiFoundCallback (Type _type) {
+                        ConstructorInfo ctor = _type.GetConstructor (ctorTypes);
+                        if (ctor == null) {
+                                return;
+                        }
 
-                                AbsEvent apiInstance = (AbsEvent)ctor.Invoke (ctorParams);
-                                AddEvent (apiInstance.Name, apiInstance);
-                        }
+                        AbsEvent apiInstance = (AbsEvent)ctor.Invoke (ctorParams);
+                        AddEvent (apiInstance.Name, apiInstance);
                 }
 
@@ -52 +53 @@
                 public void AddEvent (string _eventName, AbsEvent _eventInstance) {
                         events.Add (_eventName, _eventInstance);
-                        WebPermissions.Instance.AddKnownModule ($"webevent.{_eventName}", _eventInstance.DefaultPermissionLevel ());
+                        AdminWebModules.Instance.AddKnownModule ($"webevent.{_eventName}", _eventInstance.DefaultPermissionLevel ());
                 }
 
@@ -89 +90 @@
 
                 private bool IsAuthorizedForEvent (string _eventName, int _permissionLevel) {
-                        return WebPermissions.Instance.ModuleAllowedWithLevel ($"webevent.{_eventName}", _permissionLevel);
+                        return AdminWebModules.Instance.ModuleAllowedWithLevel ($"webevent.{_eventName}", _permissionLevel);
                 }
 

binary-improvements2/WebServer/src/UrlHandlers/UserStatusHandler.cs

@@ +1 @@
+using System.Collections.Generic;
 using Utf8Json;
+using Webserver.Permissions;
 
 namespace Webserver.UrlHandlers {
@@ -8 +10 @@
                 private static readonly byte[] jsonLoggedInKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("loggedIn");
                 private static readonly byte[] jsonUsernameKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("username");
+                private static readonly byte[] jsonPermissionLevelKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("permissionLevel");
                 private static readonly byte[] jsonPermissionsKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("permissions");
 
@@ -20 +23 @@
                         
                         writer.WriteRaw (jsonUsernameKey);
-                        writer.WriteString (_context.Connection != null ? _context.Connection.UserId.ToString () : string.Empty);
+                        writer.WriteString (_context.Connection != null ? _context.Connection.Username : string.Empty);
+                        
+                        writer.WriteRaw (jsonPermissionLevelKey);
+                        writer.WriteInt32 (_context.PermissionLevel);
                         
                         writer.WriteRaw (jsonPermissionsKey);
                         writer.WriteBeginArray ();
 
-                        bool first = true;
-                        foreach (WebPermissions.WebModulePermission perm in WebPermissions.Instance.GetModules ()) {
-                                if (!first) {
+                        List<AdminWebModules.WebModule> list = AdminWebModules.Instance.GetModules ();
+                        for (int i = 0; i < list.Count; i++) {
+                                AdminWebModules.WebModule perm = list [i];
+                                
+                                if (i > 0) {
                                         writer.WriteValueSeparator ();
                                 }
 
-                                first = false;
-                                
                                 writer.WriteRaw (jsonModuleKey);
-                                writer.WriteString (perm.module);
-                                
+                                writer.WriteString (perm.Name);
+
                                 writer.WriteRaw (jsonAllowedKey);
-                                writer.WriteBoolean (perm.permissionLevel >= _context.PermissionLevel);
-                                
+                                writer.WriteBoolean (perm.PermissionLevel >= _context.PermissionLevel);
+
                                 writer.WriteEndObject ();
                         }