Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions backend/benefit/helsinkibenefit/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,6 @@
AUDIT_LOG_ES_INDEX=(str, "helsinki_benefit_audit_log"),
AUDIT_LOG_ES_USERNAME=(str, ""),
AUDIT_LOG_ES_PASSWORD=(str, ""),
ELASTICSEARCH_APP_AUDIT_LOG_INDEX=(str, "helsinki_benefit_audit_log"),
ELASTICSEARCH_HOST=(str, ""),
ELASTICSEARCH_PORT=(int, 9200),
ELASTICSEARCH_USERNAME=(str, ""),
ELASTICSEARCH_PASSWORD=(str, ""),
CLEAR_AUDIT_LOG_ENTRIES=(bool, False),
ENABLE_SEND_AUDIT_LOG=(bool, False),
EMAIL_USE_TLS=(bool, False),
EMAIL_HOST=(str, "relay.hel.fi"),
EMAIL_HOST_USER=(str, ""),
Expand Down Expand Up @@ -386,17 +379,12 @@ def sentry_traces_sampler(sampling_context: SamplingContext) -> float:
CSRF_COOKIE_SECURE = True
CSRF_USE_SESSIONS = True

# Audit logging
AUDIT_LOG_ORIGIN = env.str("AUDIT_LOG_ORIGIN")
CLEAR_AUDIT_LOG_ENTRIES = env.bool("CLEAR_AUDIT_LOG_ENTRIES")
ELASTICSEARCH_APP_AUDIT_LOG_INDEX = env("ELASTICSEARCH_APP_AUDIT_LOG_INDEX")
ELASTICSEARCH_HOST = env("ELASTICSEARCH_HOST")
ELASTICSEARCH_PORT = env("ELASTICSEARCH_PORT")
ELASTICSEARCH_USERNAME = env("ELASTICSEARCH_USERNAME")
ELASTICSEARCH_PASSWORD = env("ELASTICSEARCH_PASSWORD")
ENABLE_SEND_AUDIT_LOG = env("ENABLE_SEND_AUDIT_LOG")

# Resilient logger configuration
# Disable shared audit logging
AUDIT_LOG_ORIGIN = env("AUDIT_LOG_ORIGIN")
CLEAR_AUDIT_LOG_ENTRIES = False
ENABLE_SEND_AUDIT_LOG = False


RESILIENT_LOGGER = {
"origin": AUDIT_LOG_ORIGIN,
"environment": env("AUDIT_LOG_ENV"),
Expand Down
6 changes: 6 additions & 0 deletions backend/shared/shared/audit_log/tests/test_audit_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,11 @@ def test_log_user_with_backend(user, fixed_datetime):

@pytest.mark.django_db
@override_settings(
ELASTICSEARCH_APP_AUDIT_LOG_INDEX="e_index",
ELASTICSEARCH_HOST="example.com",
ELASTICSEARCH_PORT=1234,
ELASTICSEARCH_USERNAME=None, # username missing
ELASTICSEARCH_PASSWORD="e_password",
ENABLE_SEND_AUDIT_LOG=True,
)
def test_send_audit_log_missing_configuration(user, fixed_datetime):
Expand All @@ -333,6 +338,7 @@ def test_send_audit_log_missing_configuration(user, fixed_datetime):
)
@pytest.mark.django_db
@override_settings(
ELASTICSEARCH_APP_AUDIT_LOG_INDEX="e_index",
ELASTICSEARCH_HOST="example.com",
ELASTICSEARCH_PORT=1234,
ELASTICSEARCH_USERNAME="e_user",
Expand Down
Loading