From c29e7f02df4bd5cdfac3696de6d221f1beea041f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 4 Feb 2021 08:55:02 +0100 Subject: [PATCH] Add EL auth config --- config/default.yaml | 3 +++ server/helpers/elastic-search.ts | 9 +++++++++ server/initializers/constants.ts | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/config/default.yaml b/config/default.yaml index abb5890..b6465f1 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -10,6 +10,9 @@ webserver: elastic-search: # https or http http: 'http' + auth: + username: null + password: null ssl: # Specificy a custom CA ca: null diff --git a/server/helpers/elastic-search.ts b/server/helpers/elastic-search.ts index 80a812e..f3282e8 100644 --- a/server/helpers/elastic-search.ts +++ b/server/helpers/elastic-search.ts @@ -17,6 +17,15 @@ if (CONFIG.ELASTIC_SEARCH.SSL.CA) { }) } +if (CONFIG.ELASTIC_SEARCH.AUTH.USERNAME) { + Object.assign(elasticOptions, { + auth: { + username: CONFIG.ELASTIC_SEARCH.AUTH.USERNAME, + password: CONFIG.ELASTIC_SEARCH.AUTH.PASSWORD + } + }) +} + const elasticSearch = new Client(elasticOptions) function buildSort (value: string) { diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index a06fb10..1ff4211 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -14,6 +14,10 @@ const CONFIG = { }, ELASTIC_SEARCH: { HTTP: config.get('elastic-search.http'), + AUTH: { + USERNAME: config.get('elastic-search.auth.username'), + PASSWORD: config.get('elastic-search.auth.password') + }, SSL: { CA: config.get('elastic-search.ssl.ca') },