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

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/Commands

Files:

• CreateWebUser.cs (added)
• ReloadWebPermissions.cs (deleted)
• WebPermissionsCmd.cs (modified) (5 diffs)
• WebTokens.cs (modified) (8 diffs)

binary-improvements2/WebServer/src/Commands/WebPermissionsCmd.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;
+using Webserver.Permissions;
 
 namespace Webserver.Commands {
@@ -44 +45 @@
                         }
 
-                        if (!WebPermissions.Instance.IsKnownModule (_params [1])) {
+                        if (!AdminWebModules.Instance.IsKnownModule (_params [1])) {
                                 SdtdConsole.Instance.Output ($"\"{_params [1]}\" is not a valid web function.");
                                 return;
@@ -54 +55 @@
                         }
 
-                        WebPermissions.Instance.AddModulePermission (_params [1], level);
+                        AdminWebModules.Instance.AddModule (_params [1], level);
                         SdtdConsole.Instance.Output ($"{_params [1]} added with permission level of {level}.");
                 }
@@ -64 +65 @@
                         }
 
-                        if (!WebPermissions.Instance.IsKnownModule (_params [1])) {
+                        if (!AdminWebModules.Instance.IsKnownModule (_params [1])) {
                                 SdtdConsole.Instance.Output ($"\"{_params [1]}\" is not a valid web function.");
                                 return;
                         }
 
-                        WebPermissions.Instance.RemoveModulePermission (_params [1]);
+                        AdminWebModules.Instance.RemoveModule (_params [1]);
                         SdtdConsole.Instance.Output ($"{_params [1]} removed from permissions list.");
                 }
@@ -76 +77 @@
                         SdtdConsole.Instance.Output ("Defined web function permissions:");
                         SdtdConsole.Instance.Output ("  Level: Web function");
-                        foreach (WebPermissions.WebModulePermission wmp in WebPermissions.Instance.GetModules ()) {
-                                SdtdConsole.Instance.Output ($"  {wmp.permissionLevel,5}: {wmp.module}");
+                        
+                        List<AdminWebModules.WebModule> wmps = AdminWebModules.Instance.GetModules ();
+                        for (int i = 0; i < wmps.Count; i++) {
+                                AdminWebModules.WebModule wmp = wmps [i];
+                                
+                                SdtdConsole.Instance.Output ($"  {wmp.PermissionLevel,5}: {wmp.Name}");
                         }
                 }

binary-improvements2/WebServer/src/Commands/WebTokens.cs

@@ -2 +2 @@
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
+using Webserver.Permissions;
 
 namespace Webserver.Commands {
@@ -19 +20 @@
                         return "Set/get webtoken permission levels. A level of 0 is maximum permission.\n" +
                                "Usage:\n" +
-                               "   webtokens add <username> <usertoken> <level>\n" +
-                               "   webtokens remove <username>\n" +
+                               "   webtokens add <tokenname> <tokensecret> <level>\n" +
+                               "   webtokens remove <tokenname>\n" +
                                "   webtokens list";
                 }
@@ -47 +48 @@
 
                         if (string.IsNullOrEmpty (_params [1])) {
-                                SdtdConsole.Instance.Output ("Argument 'username' is empty.");
+                                SdtdConsole.Instance.Output ("Argument 'tokenname' is empty.");
                                 return;
                         }
@@ -53 +54 @@
                         if (!validNameTokenMatcher.IsMatch (_params [1])) {
                                 SdtdConsole.Instance.Output (
-                                        "Argument 'username' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_).");
+                                        "Argument 'tokenname' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_).");
                                 return;
                         }
 
                         if (string.IsNullOrEmpty (_params [2])) {
-                                SdtdConsole.Instance.Output ("Argument 'usertoken' is empty.");
+                                SdtdConsole.Instance.Output ("Argument 'tokensecret' is empty.");
                                 return;
                         }
@@ -64 +65 @@
                         if (!validNameTokenMatcher.IsMatch (_params [2])) {
                                 SdtdConsole.Instance.Output (
-                                        "Argument 'usertoken' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_).");
+                                        "Argument 'tokensecret' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_).");
                                 return;
                         }
@@ -73 +74 @@
                         }
 
-                        WebPermissions.Instance.AddAdmin (_params [1], _params [2], level);
-                        SdtdConsole.Instance.Output ($"Web user with name={_params [1]} and password={_params [2]} added with permission level of {level}.");
+                        AdminApiTokens.Instance.AddToken (_params [1], _params [2], level);
+                        SdtdConsole.Instance.Output ($"Web API token with name={_params [1]} and secret={_params [2]} added with permission level of {level}.");
                 }
 
@@ -84 +85 @@
 
                         if (string.IsNullOrEmpty (_params [1])) {
-                                SdtdConsole.Instance.Output ("Argument 'username' is empty.");
+                                SdtdConsole.Instance.Output ("Argument 'tokenname' is empty.");
                                 return;
                         }
@@ -90 +91 @@
                         if (!validNameTokenMatcher.IsMatch (_params [1])) {
                                 SdtdConsole.Instance.Output (
-                                        "Argument 'username' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_).");
+                                        "Argument 'tokenname' may only contain characters (A-Z, a-z), digits (0-9) and underscores (_).");
                                 return;
                         }
 
-                        WebPermissions.Instance.RemoveAdmin (_params [1]);
-                        SdtdConsole.Instance.Output ($"{_params [1]} removed from web user permissions list.");
+                        AdminApiTokens.Instance.RemoveToken (_params [1]);
+                        SdtdConsole.Instance.Output ($"{_params [1]} removed from web API token permissions list.");
                 }
 
                 private void ExecuteList () {
-                        SdtdConsole.Instance.Output ("Defined webuser permissions:");
-                        SdtdConsole.Instance.Output ("  Level: Name / Token");
-                        foreach (WebPermissions.AdminToken at in WebPermissions.Instance.GetAdmins ()) {
-                                SdtdConsole.Instance.Output ($"  {at.permissionLevel,5}: {at.name} / {at.token}");
+                        SdtdConsole.Instance.Output ("Defined web API token permissions:");
+                        SdtdConsole.Instance.Output ("  Level: Name / Secret");
+                        foreach ((string _, AdminApiTokens.ApiToken apiToken) in AdminApiTokens.Instance.GetTokens ()) {
+                                SdtdConsole.Instance.Output ($"  {apiToken.PermissionLevel,5}: {apiToken.Name} / {apiToken.Secret}");
                         }
                 }