Replacing old force option by the new force block

wazuh · Nov 3, 2021 · d0babf2 · d0babf2
1 parent 2e67d6f
commit d0babf2
Show file tree

Hide file tree

Showing 5 changed files with 149 additions and 124 deletions.
diff --git a/tests/integration/test_authd/data/enroll_messages.yaml b/tests/integration/test_authd/data/enroll_messages.yaml
@@ -9,7 +9,7 @@
 -
  name: "Single Group - Valid group"
  description: "Check single group enrollment"
- groups: 
+ groups:
  - 'Group1'
  - 'Group2'
  test_case:
@@ -27,7 +27,7 @@
 -
  name: "Single Group - Name too long"
  description: "Check group does not exist"
- groups: 
+ groups:
  - 'sltqohmjeltdihvfvolvfeazekpdmgdusyprzwtwhptfnxsgwhoumythxhubnbhtqpmaojadpypupryblaiqdutylohhtjcalblytmbboiunldafzjghpmqlrwmhpwtoxflabdfzpsosfmniwyymhkurgelfzpewmftksbkrmzqoibsgatoqgmsidtailhleghqybdqjikdmcjfktyofscfowszjilwjmfdxwojshpimwkmmafmpiciouybmldkdf'
  test_case:
  -
@@ -36,7 +36,7 @@
 -
  name: "Single Group - Invalid Characters"
  description: "Check group does not exist"
- groups: 
+ groups:
  - "Group\\"
  - "Group?1"
  - "Group<3"
@@ -57,7 +57,7 @@
 -
  name: "Single Group - Empty Group"
  description: "Check Error message when groups is empty"
- groups: 
+ groups:
  - "GroupA"
  - "GroupB"
  test_case:
@@ -67,7 +67,7 @@
 -
  name: "Multiple Group - Valid groups"
  description: "Check Multiple groups enrollment"
- groups: 
+ groups:
  - 'Group1'
  - 'Group2'
  test_case:
@@ -77,7 +77,7 @@
 -
  name: "Multiple Group - One group is invalid"
  description: "Check Multiple groups enrollment"
- groups: 
+ groups:
  - 'Group1'
  - 'Group2'
  test_case:
@@ -87,7 +87,7 @@
 -
  name: "Multiple Group - Name too long"
  description: "Check group does not exist"
- groups: 
+ groups:
  - 'Group1'
  - 'sltqohmjeltdihvfvolvfeazekpdmgdusyprzwtwhptfnxsgwhoumythxhubnbhtqpmaojadpypupryblaiqdutylohhtjcalblytmbboiunldafzjghpmqlrwmhpwtoxflabdfzpsosfmniwyymhkurgelfzpewmftksbkrmzqoibsgatoqgmsidtailhleghqybdqjikdmcjfktyofscfowszjilwjmfdxwojshpimwkmmafmpiciouybmldkdf'
  test_case:
@@ -97,7 +97,7 @@
 -
  name: "Multiple Group - Invalid Characters"
  description: "Check groups with invalid characters"
- groups: 
+ groups:
  - "Group\\"
 
  - "Group?1"
@@ -110,7 +110,7 @@
 -
  name: "Multiple Group - Empty List"
  description: "Check empty group list"
- groups: 
+ groups:
  - "GroupA"
  - "GroupB"
  test_case:

diff --git a/tests/integration/test_authd/data/enroll_ssl_options_tests.yaml b/tests/integration/test_authd/data/enroll_ssl_options_tests.yaml
@@ -88,7 +88,7 @@
  name: "Valid Certificates - Manager verification without host"
  description: "Enables CA Certificate and validates that conneciton is acepted when valid certs are provided"
  test_case:
- - 
+ -
  ciphers: "HIGH:!ADH:!EXP:!MD5:!RC4:!3DES:!CAMELLIA:@STRENGTH"
  protocol: "ssl_tlsv1_2"
  expect: "output"

diff --git a/tests/integration/test_authd/data/wazuh_authd_configuration.yaml b/tests/integration/test_authd/data/wazuh_authd_configuration.yaml
@@ -14,10 +14,18 @@
  value: 1515
  - use_source_ip:
  value: 'no'
- - force_insert:
- value: 'yes'
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'yes'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - use_password:
@@ -80,10 +88,18 @@
  value: 1515
  - use_source_ip:
  value: 'no'
- - force_insert:
- value: 'yes'
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'no'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - use_password:
@@ -114,10 +130,18 @@
  value: 1515
  - use_source_ip:
  value: 'no'
- - force_insert:
- value: 'yes'
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'no'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - use_password:
@@ -162,10 +186,18 @@
  value: 1515
  - use_source_ip:
  value: 'no'
- - force_insert:
- value: 'yes'
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'no'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - use_password:
@@ -217,10 +249,18 @@
  value: 1515
  - use_source_ip:
  value: USE_SOURCE_IP
- - force_insert:
- value: 'yes'
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'no'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - limit_maxagents:
@@ -246,8 +286,18 @@
  value: 'no'
  - port:
  value: 1515
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'no'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - use_password:
@@ -277,10 +327,18 @@
  value: 1515
  - use_source_ip:
  value: 'no'
- - force_insert:
- value: 'yes'
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'no'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - use_password:
@@ -310,10 +368,18 @@
  value: 1515
  - use_source_ip:
  value: 'no'
- - force_insert:
- value: 'yes'
- - force_time:
- value: 0
+ - force:
+ elements:
+ - enabled:
+ value: 'yes'
+ - key_mismatch:
+ value: 'no'
+ - after_registration_time:
+ value: '0h'
+ - disconnected_time:
+ attributes:
+ - enabled: 'yes'
+ value: '0h'
  - purge:
  value: 'yes'
  - use_password:

diff --git a/tests/integration/test_authd/test_authd_agents_ctx.py b/tests/integration/test_authd/test_authd_agents_ctx.py
@@ -288,7 +288,9 @@ def register_agent_main_server(Name, Group=None, IP=None):
 
 
 def register_agent_local_server(Name, Group=None, IP=None):
- message = '{{"arguments":{{"force":0,"name":"{}"'.format(Name)
+ message = ('{"arguments":{"force":{"enabled":true,"disconnected_time":{"enabled":true,"value":"0"},'
+ '"key_mismatch":true,"after_registration_time":"0"}')
+ message += ',"name":"{}"'.format(Name)
  if Group:
  message += ',"groups":"{}"'.format(Group)
  if IP: