diff --git a/install_files/ansible-base/group_vars/staging.yml b/install_files/ansible-base/group_vars/staging.yml index 4a4c0c4fa2..f2a1b0da6b 100644 --- a/install_files/ansible-base/group_vars/staging.yml +++ b/install_files/ansible-base/group_vars/staging.yml @@ -32,7 +32,7 @@ apache_logging_level: "info" # The OSSEC alert GPG public key has to be in the install_files/ansible-base/ or # install_files/ansible-base/roles/app/files/ directory ossec_alert_gpg_public_key: "test_admin_key.pub" -ossec_gpg_fpr: "600BC6D5142C68F35DDBCEA87B597104EDDDC102" +ossec_gpg_fpr: "53E1113AC1F25027BA5D475B1141E2BBB5E53711" ossec_alert_email: "ossec@ossec.test" smtp_relay: "smtp.gmail.com" smtp_relay_port: "587" diff --git a/install_files/ansible-base/roles/ossec/files/test_admin_key.pub b/install_files/ansible-base/roles/ossec/files/test_admin_key.pub index 4f6ce60657..5429bd889b 100644 Binary files a/install_files/ansible-base/roles/ossec/files/test_admin_key.pub and b/install_files/ansible-base/roles/ossec/files/test_admin_key.pub differ diff --git a/install_files/ansible-base/roles/ossec/files/test_admin_key.sec b/install_files/ansible-base/roles/ossec/files/test_admin_key.sec index 4f6ce60657..a3af8413d6 100644 Binary files a/install_files/ansible-base/roles/ossec/files/test_admin_key.sec and b/install_files/ansible-base/roles/ossec/files/test_admin_key.sec differ diff --git a/install_files/ansible-base/roles/validate/tasks/validate_gpg_info.yml b/install_files/ansible-base/roles/validate/tasks/validate_gpg_info.yml index 737eafa59b..66b13cdd01 100644 --- a/install_files/ansible-base/roles/validate/tasks/validate_gpg_info.yml +++ b/install_files/ansible-base/roles/validate/tasks/validate_gpg_info.yml @@ -6,7 +6,7 @@ # Should not match the fingerprint for the TEST Journalist pubkey. - item.fingerprint != "65A1B5FF195B56353CC63DFFCC40EF1228271441" # Should not match the fingerprint for the TEST Admin pubkey. - - item.fingerprint != "600BC6D5142C68F35DDBCEA87B597104EDDDC102" + - item.fingerprint != "53E1113AC1F25027BA5D475B1141E2BBB5E53711" # Should not contain whitespace. - "' ' not in item.fingerprint" # Must be a full-length fingerprint. diff --git a/testinfra/mon/test_ossec.py b/testinfra/mon/test_ossec.py index 4b6c69ba0f..b5a3c78bab 100644 --- a/testinfra/mon/test_ossec.py +++ b/testinfra/mon/test_ossec.py @@ -62,12 +62,13 @@ def test_ossec_pubkey_in_keyring(Command, Sudo): Ensure the test Admin GPG public key exists in the keyring within the ossec home directory. """ - ossec_gpg_pubkey_info = """pub 4096R/EDDDC102 2014-10-15 -uid Test/Development (DO NOT USE IN PRODUCTION) (Admin's OSSEC Alert GPG key) -sub 4096R/97D2EB39 2014-10-15""" # noqa + ossec_gpg_pubkey_info = """pub 2048R/B5E53711 2018-01-25 +uid SecureDrop admin key for tests (do not use in production) +sub 2048R/EC1DF5D0 2018-01-25""" # noqa with Sudo("ossec"): - c = Command.check_output("gpg --homedir /var/ossec/.gnupg " - "--list-keys EDDDC102") + c = Command.check_output( + "gpg --homedir /var/ossec/.gnupg " + "--list-keys 53E1113AC1F25027BA5D475B1141E2BBB5E53711") assert c == ossec_gpg_pubkey_info