Changeset 427

Timestamp:

Apr 25, 2023, 7:41:10 PM (19 months ago)

Author:

alloc

Message:

*Save inherited per-method permission as "inherit" instead of the actual int.minValue string

Location:

binary-improvements2

Files:

• CommandExtensions/ModInfo.xml (modified) (1 diff)
• MapRendering/ModInfo.xml (modified) (1 diff)
• MarkersMod/ModInfo.xml (modified) (1 diff)
• WebServer/ModInfo.xml (modified) (1 diff)
• WebServer/src/Permissions/AdminWebModules.cs (modified) (3 diffs)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.dll (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/CommandExtensions.pdb (modified) ( previous)
• bin/Mods/TFP_CommandExtensions/ModInfo.xml (modified) (1 diff)
• bin/Mods/TFP_MapRendering/MapRendering.dll (modified) ( previous)
• bin/Mods/TFP_MapRendering/MapRendering.pdb (modified) ( previous)
• bin/Mods/TFP_MapRendering/ModInfo.xml (modified) (1 diff)
• bin/Mods/TFP_WebServer/ModInfo.xml (modified) (1 diff)
• bin/Mods/TFP_WebServer/SpaceWizards.HttpListener.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/SpaceWizards.HttpListener.pdb (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.dll (modified) ( previous)
• bin/Mods/TFP_WebServer/WebServer.pdb (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.dll (modified) ( previous)
• bin/Mods/Xample_MarkersMod/MarkersMod.pdb (modified) ( previous)
• bin/Mods/Xample_MarkersMod/ModInfo.xml (modified) (1 diff)

binary-improvements2/CommandExtensions/ModInfo.xml

@@ -5 +5 @@
         <Description value="Additional commands for server operation" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>

binary-improvements2/MapRendering/ModInfo.xml

@@ -5 +5 @@
         <Description value="Render the game map to image map tiles as it is uncovered" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>

binary-improvements2/MarkersMod/ModInfo.xml

@@ -5 +5 @@
         <Description value="Allows placing custom markers on the web map" />
         <Author value="Catalysm and Alloc" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>

binary-improvements2/WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>

binary-improvements2/WebServer/src/Permissions/AdminWebModules.cs

@@ -82 +82 @@
                 
                 public struct WebModule {
+                        private const string methodLevelInheritKeyword = "inherit";
+
                         public string Name;
                         public int LevelGlobal;
@@ -134 +136 @@
                                         permissionElement.AddXmlElement ("method")
                                                 .SetAttrib ("name", method.ToStringCached ())
-                                                .SetAttrib ("permission_level", level.ToString ());
+                                                .SetAttrib ("permission_level", level == MethodLevelInheritGlobal ? methodLevelInheritKeyword : level.ToString ());
                                 }
                         }
@@ -193 +195 @@
                                         }
 
-                                        if (!int.TryParse (permissionLevelString, out int methodPermissionLevel)) {
+                                        int methodPermissionLevel;
+                                        if (permissionLevelString.EqualsCaseInsensitive (methodLevelInheritKeyword)) {
+                                                methodPermissionLevel = MethodLevelInheritGlobal;
+                                        } else if (!int.TryParse (permissionLevelString, out methodPermissionLevel)) {
                                                 Log.Warning (
                                                         $"[Web] [Perms] Ignoring module child element, invalid (non-numeric) value for 'permission_level' attribute: {childElem.OuterXml}");

binary-improvements2/bin/Mods/TFP_CommandExtensions/ModInfo.xml

@@ -5 +5 @@
         <Description value="Additional commands for server operation" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>

binary-improvements2/bin/Mods/TFP_MapRendering/ModInfo.xml

@@ -5 +5 @@
         <Description value="Render the game map to image map tiles as it is uncovered" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>

binary-improvements2/bin/Mods/TFP_WebServer/ModInfo.xml

@@ -5 +5 @@
         <Description value="Integrated Webserver for the Web Dashboard and server APIs" />
         <Author value="The Fun Pimps LLC" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>

binary-improvements2/bin/Mods/Xample_MarkersMod/ModInfo.xml

@@ -5 +5 @@
         <Description value="Allows placing custom markers on the web map" />
         <Author value="Catalysm and Alloc" />
-        <Version value="21.0.270.0" />
+        <Version value="21.0.271.0" />
         <Website value="" />
 </xml>