Merge pull request #1172 from wazuh/feat/1110-update-authd-options

Updated deprecated authd options
wazuh · Jan 19, 2022 · 63acd4e · 63acd4e
2 parents f8a32e6 + 764fb3d
commit 63acd4e
Show file tree

Hide file tree

Showing 4 changed files with 1,376 additions and 420 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to the Wazuh app for Splunk project will be documented in th
 ### Changed
 
 - Wazuh rebranding [#1186](https://github.com/wazuh/wazuh-splunk/pull/1186)
+- Updated deprecated authd options [#1172](https://github.com/wazuh/wazuh-splunk/pull/1172)
 
 ### Fixed
 

diff --git a/...ic/js/controllers/management/configuration/registration-service/registration-service.html b/...ic/js/controllers/management/configuration/registration-service/registration-service.html
@@ -21,7 +21,9 @@
   <div flex="auto" layout="row" ng-if="!load">
 
     <!-- No configuration section -->
-    <wz-no-config flex error="currentConfig['auth-auth']" ng-if="(currentConfig['auth-auth'] && isString(currentConfig['auth-auth'])) || !currentConfig['auth-auth'].auth"></wz-no-config>
+    <wz-no-config 
+      flex error="currentConfig['auth-auth']" 
+      ng-if="(currentConfig['auth-auth'] && isString(currentConfig['auth-auth'])) || !currentConfig['auth-auth'].auth"></wz-no-config>
     <!-- End no configuration section -->
 
     <!-- This section is the main content -->
@@ -47,21 +49,55 @@
           <!-- Configuration block -->
           <div class="wz-padding-top-10">
 
-            <wz-config-item label="Service status" value="currentConfig['auth-auth'].auth.disabled === 'yes'? 'disabled' : 'enabled'">
+            <wz-config-item 
+              label="Service status" 
+              value="currentConfig['auth-auth'].auth.disabled === 'yes'? 'disabled' : 'enabled'">
             </wz-config-item>
-            <wz-config-item label="Listen to connections at port" value="currentConfig['auth-auth'].auth.port">
+            <wz-config-item 
+              label="Listen to connections at port" 
+              value="currentConfig['auth-auth'].auth.port">
             </wz-config-item>
-            <wz-config-item label="Use client's source IP address" value="currentConfig['auth-auth'].auth.use_source_ip">
+            <wz-config-item 
+              label="Use client's source IP address" 
+              value="currentConfig['auth-auth'].auth.use_source_ip">
             </wz-config-item>
-            <wz-config-item label="Use a password to register agents" value="currentConfig['auth-auth'].auth.use_password">
+            <wz-config-item 
+              label="Use a password to register agents" 
+              value="currentConfig['auth-auth'].auth.use_password">
             </wz-config-item>
-            <wz-config-item label="Purge agents list when removing agents" value="currentConfig['auth-auth'].auth.purge">
+            <wz-config-item 
+              label="Purge agents list when removing agents" 
+              value="currentConfig['auth-auth'].auth.purge">
             </wz-config-item>
-            <wz-config-item label="Limit registration to maximum number of agents" value="currentConfig['auth-auth'].auth.limit_maxagents">
+            <wz-config-item 
+              label="Limit registration to maximum number of agents" 
+              value="currentConfig['auth-auth'].auth.limit_maxagents">
             </wz-config-item>
-            <wz-config-item label="Force registration when using an existing IP address" value="currentConfig['auth-auth'].auth.force_insert">
+            <wz-config-item 
+              label="Toggles forced insertion of an agent if there is a duplicate name or IP address. This will remove the old agent with same name or IP address" 
+              value="currentConfig['auth-auth'].auth.force.enabled"
+              ng-if="currentConfig['auth-auth'].auth.force">
+            </wz-config-item>
+            <wz-config-item 
+              label="Specifies that the agent replacement will be performed only when the time (seconds) passed since the agent registration is greater than the value configured in the setting" 
+              value="currentConfig['auth-auth'].auth.force.after_registration_time"
+              ng-if="currentConfig['auth-auth'].auth.force && currentConfig['auth-auth'].auth.force.after_registration_time != undefined">
+            </wz-config-item>
+            <wz-config-item 
+              label="Defines that the agent replacement occurs when the key held by the agent is different from the one registered by the manager" 
+              value="currentConfig['auth-auth'].auth.force.key_mismatch"
+              ng-if="currentConfig['auth-auth'].auth.force && currentConfig['auth-auth'].auth.force.key_mismatch != undefined">
+            </wz-config-item>
+            <wz-config-item 
+              label="Specifies that the replacement will be performed only for agents that have been disconnected longer than a certain time" 
+              value="currentConfig['auth-auth'].auth.force.disconnected_time.enabled"
+              ng-if="currentConfig['auth-auth'].auth.force && currentConfig['auth-auth'].auth.force.disconnected_time != undefined">
+            </wz-config-item>
+            <wz-config-item 
+              label="Seconds since an agent is in a disconnected state" 
+              value="currentConfig['auth-auth'].auth.force.disconnected_time.value"
+              ng-if="currentConfig['auth-auth'].auth.force && currentConfig['auth-auth'].auth.force.disconnected_time != undefined">
             </wz-config-item>
-
           </div>
           <!-- End configuration block -->
 
@@ -76,17 +112,29 @@
           <!-- Configuration block -->
           <div class="wz-padding-top-10">
 
-            <wz-config-item label="Verify agents using a CA certificate" value="currentConfig['auth-auth'].auth.ssl_verify_host">
+            <wz-config-item 
+              label="Verify agents using a CA certificate" 
+              value="currentConfig['auth-auth'].auth.ssl_verify_host">
             </wz-config-item>
-            <wz-config-item label="Auto-select the SSL negotiation method" value="currentConfig['auth-auth'].auth.ssl_auto_negotiate">
+            <wz-config-item 
+              label="Auto-select the SSL negotiation method" 
+              value="currentConfig['auth-auth'].auth.ssl_auto_negotiate">
             </wz-config-item>
-            <wz-config-item label="CA certificate location" value="currentConfig['auth-auth'].auth.ssl_agent_ca">
+            <wz-config-item 
+              label="CA certificate location" 
+              value="currentConfig['auth-auth'].auth.ssl_agent_ca">
             </wz-config-item>
-            <wz-config-item label="Server SSL certificate location" value="currentConfig['auth-auth'].auth.ssl_manager_cert">
+            <wz-config-item 
+              label="Server SSL certificate location" 
+              value="currentConfig['auth-auth'].auth.ssl_manager_cert">
             </wz-config-item>
-            <wz-config-item label="Server SSL key location" value="currentConfig['auth-auth'].auth.ssl_manager_key">
+            <wz-config-item 
+              label="Server SSL key location" 
+              value="currentConfig['auth-auth'].auth.ssl_manager_key">
             </wz-config-item>
-            <wz-config-item label="Use the following SSL ciphers" value="currentConfig['auth-auth'].auth.ciphers">
+            <wz-config-item 
+              label="Use the following SSL ciphers" 
+              value="currentConfig['auth-auth'].auth.ciphers">
             </wz-config-item>
 
           </div>
@@ -95,7 +143,11 @@
       </md-card>
       <!-- End main card with all the settings -->
 
-      <wz-config-viewer flex getjson="getJSON()" getxml="getXML()" jsoncontent="JSONContent" xmlcontent="XMLContent" />
+      <wz-config-viewer 
+        flex getjson="getJSON()" 
+        getxml="getXML()" 
+        jsoncontent="JSONContent" 
+        xmlcontent="XMLContent" />
 
     </div>
     <!-- End main content section -->