Skip to content

Commit 696df04

Browse files
mildasmildas
committed
Adjust test scenarios to use more generic approach.
Use rpm_verify_* rule changes as they are not expected to be templated because of their specificity.
1 parent a78fd0d commit 696df04

File tree

6 files changed

+30
-33
lines changed

6 files changed

+30
-33
lines changed

‎tests/ansible.bats

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ prepare_repository
55

66

77
@test "Add comment line" {
8-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
8+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
99
sed -i "\$a# comment" "$file"
1010

1111
git add "$file" && git commit -m "test commit" &>/dev/null
@@ -21,7 +21,7 @@ prepare_repository
2121
}
2222

2323
@test "Change metadata" {
24-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
24+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
2525
sed -i 's/# reboot = false/# reboot = true/' "$file"
2626
regex_check="build_product "
2727

@@ -38,8 +38,8 @@ prepare_repository
3838
}
3939

4040
@test "Change name" {
41-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
42-
sed -i 's/- name: Disable.*/- name: some name/' "$file"
41+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
42+
sed -i 's/- name: .*/- name: some name/' "$file"
4343

4444
git add "$file" && git commit -m "test commit" &>/dev/null
4545

@@ -54,10 +54,10 @@ prepare_repository
5454
}
5555

5656
@test "Change remediation part" {
57-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
58-
sed -i 's;path: .*;path: /some/path/;' "$file"
57+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
58+
sed -i 's/command: .*/command: ls/' "$file"
5959
regex_check_1="build_product "
60-
regex_check_2=".*test_suite\.py rule.*disable_prelink"
60+
regex_check_2=".*test_suite\.py rule.*rpm_verify_permissions"
6161

6262
git add "$file" && git commit -m "test commit" &>/dev/null
6363

@@ -98,7 +98,7 @@ prepare_repository
9898
}
9999

100100
@test "Remove ansible remediation" {
101-
file="./linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/ansible/shared.yml"
101+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
102102
rm -f "$file"
103103

104104
git add "$file" && git commit -m "test commit" &>/dev/null

‎tests/bash.bats

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ prepare_repository
55

66

77
@test "Add comment line" {
8-
file="./linux_os/guide/services/sssd/sssd_run_as_sssd_user/bash/shared.sh"
8+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/bash/shared.sh"
99
sed -i "\$a# comment" "$file"
1010

1111
git add "$file" && git commit -m "test commit" &>/dev/null
@@ -38,10 +38,10 @@ prepare_repository
3838
}
3939

4040
@test "Change remediation" {
41-
file="./linux_os/guide/services/sssd/sssd_run_as_sssd_user/bash/shared.sh"
42-
sed -i "s/chmod 600/chmod 744/" "$file"
41+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/bash/shared.sh"
42+
sed -i "s/rpm//" "$file"
4343
regex_check_1="build_product "
44-
regex_check_2="test_suite\.py rule.*sssd_run_as_sssd_user"
44+
regex_check_2="test_suite\.py rule.*rpm_verify_permissions"
4545

4646
git add "$file" && git commit -m "test commit" &>/dev/null
4747

@@ -83,7 +83,7 @@ prepare_repository
8383

8484

8585
@test "Remove bash remediation" {
86-
file="./linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/bash/shared.sh"
86+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/bash/shared.sh"
8787
rm -f "$file"
8888

8989
git add "$file" && git commit -m "test commit" &>/dev/null

‎tests/jinja.bats

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ prepare_repository
88
file="./shared/macros/10-bash.jinja"
99
sed -i "/macro bash_sshd_config_set/a echo 1" "$file"
1010
regex_check_1="build_product"
11-
regex_check_2="test_suite.py rule.*sshd_use_strong_macs"
12-
regex_check_3="test_suite.py rule.*sshd_set_idle_timeout"
13-
regex_check_4="test_suite.py rule.*sshd_use_priv_separation"
11+
regex_check_2="test_suite.py rule.*sshd_set_"
12+
regex_check_3="test_suite.py rule.*sshd_use_"
1413

1514
git add "$file" && git commit -m "test commit" &>/dev/null
1615

‎tests/json_ansible.bats

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ prepare_repository
55

66

77
@test "Add comment line" {
8-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
8+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
99
sed -i "\$a# comment" "$file"
1010

1111
git add "$file" && git commit -m "test commit" &>/dev/null
@@ -21,7 +21,7 @@ prepare_repository
2121
}
2222

2323
@test "Change metadata" {
24-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
24+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
2525
sed -i 's/# reboot = false/# reboot = true/' "$file"
2626
regex_check="build_product "
2727

@@ -38,8 +38,8 @@ prepare_repository
3838
}
3939

4040
@test "Change name" {
41-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
42-
sed -i 's/- name: Disable.*/- name: some name/' "$file"
41+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
42+
sed -i 's/- name: .*/- name: some name/' "$file"
4343

4444
git add "$file" && git commit -m "test commit" &>/dev/null
4545

@@ -54,9 +54,9 @@ prepare_repository
5454
}
5555

5656
@test "Change remediation part" {
57-
file="./linux_os/guide/system/software/integrity/disable_prelink/ansible/shared.yml"
58-
sed -i 's;path: .*;path: /some/path/;' "$file"
59-
regex_check='{.*"rules": \["disable_prelink"\].*"bash": "False".*"ansible": "True"}'
57+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
58+
sed -i 's/command: .*/command: ls/' "$file"
59+
regex_check='{.*"rules": \["rpm_verify_permissions"\].*"bash": "False".*"ansible": "True"}'
6060

6161
git add "$file" && git commit -m "test commit" &>/dev/null
6262

@@ -88,7 +88,7 @@ prepare_repository
8888
}
8989

9090
@test "Remove ansible remediation" {
91-
file="./linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/ansible/shared.yml"
91+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/ansible/shared.yml"
9292
rm -f "$file"
9393

9494
git add "$file" && git commit -m "test commit" &>/dev/null

‎tests/json_bash.bats

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ prepare_repository
55

66

77
@test "Add comment line" {
8-
file="./linux_os/guide/services/sssd/sssd_run_as_sssd_user/bash/shared.sh"
8+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/bash/shared.sh"
99
sed -i "\$a# comment" "$file"
1010

1111
git add "$file" && git commit -m "test commit" &>/dev/null
@@ -38,9 +38,9 @@ prepare_repository
3838
}
3939

4040
@test "Change remediation" {
41-
file="./linux_os/guide/services/sssd/sssd_run_as_sssd_user/bash/shared.sh"
42-
sed -i "s/chmod 600/chmod 744/" "$file"
43-
regex_check='{.*"rules": \["sssd_run_as_sssd_user"\].*"bash": "True".*"ansible": "False"}'
41+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/bash/shared.sh"
42+
sed -i "s/rpm//" "$file"
43+
regex_check='{.*"rules": \["rpm_verify_permissions"\].*"bash": "True".*"ansible": "False"}'
4444

4545
git add "$file" && git commit -m "test commit" &>/dev/null
4646

@@ -73,7 +73,7 @@ prepare_repository
7373

7474

7575
@test "Remove bash remediation" {
76-
file="./linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/bash/shared.sh"
76+
file="./linux_os/guide/system/software/integrity/software-integrity/rpm_verification/rpm_verify_permissions/bash/shared.sh"
7777
rm -f "$file"
7878

7979
git add "$file" && git commit -m "test commit" &>/dev/null

‎tests/json_jinja.bats

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ prepare_repository
77
@test "Change sshd macro" {
88
file="./shared/macros/10-bash.jinja"
99
sed -i "/macro bash_sshd_config_set/a echo 1" "$file"
10-
regex_check_1='{.*"rules": \[.*"sshd_use_strong_ciphers".*\].*"bash": "True".*"ansible": "False".*}'
11-
regex_check_2='{.*"rules": \[.*"sshd_use_strong_macs".*\].*"bash": "True".*"ansible": "False".*}'
12-
regex_check_3='{.*"rules": \[.*"sshd_set_keepalive".*\].*"bash": "True".*"ansible": "False".*}'
13-
regex_check_4='{.*"rules": \[.*"sshd_set_idle_timeout".*\].*"bash": "True".*"ansible": "False".*}'
10+
regex_check_1='{.*"rules": \[.*"sshd_use_.*".*\].*"bash": "True".*"ansible": "False".*}'
11+
regex_check_2='{.*"rules": \[.*"sshd_set_.*".*\].*"bash": "True".*"ansible": "False".*}'
1412

1513
git add "$file" && git commit -m "test commit" &>/dev/null
1614

0 commit comments

Comments
 (0)