Skip to content

Fix use of HTTP credentials #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chosak merged 1 commit into from
Aug 27, 2025
Merged

Fix use of HTTP credentials #220

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions complaint_search/es_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
from datetime import datetime, timedelta
from math import ceil
from urllib.parse import quote

from elasticsearch import Elasticsearch, RequestsHttpConnection, helpers
from flags.state import flag_enabled
Expand All @@ -28,11 +29,9 @@

log = logging.getLogger(__name__)

_ES_URL = "{}://{}:{}".format(
"http",
os.environ.get("ES_HOST", "localhost"),
os.environ.get("ES_PORT", "9200"),
)
_ES_HOST = os.environ.get("ES_HOST", "localhost")
_ES_PORT = os.environ.get("ES_PORT", "9200")
_ES_URL = f"http://{_ES_HOST}:{_ES_PORT}"
_ES_USER = os.environ.get("ES_USER", "")
_ES_PASSWORD = os.environ.get("ES_PASSWORD", "")
_ES_INSTANCE = None
Expand Down Expand Up @@ -158,8 +157,16 @@ def _get_es():
timeout=100,
)
else:
host = _ES_HOST
if _ES_USER and _ES_PASSWORD:
encoded_username = quote(_ES_USER)
encoded_password = quote(_ES_PASSWORD)
host = f"{encoded_username}:{encoded_password}@{host}"

_ES_INSTANCE = Elasticsearch(
[_ES_URL], http_auth=(_ES_USER, _ES_PASSWORD), timeout=100
f"http://{host}:{_ES_PORT}",
use_ssl=(str(_ES_PORT) == "443"),
timeout=100
)
return _ES_INSTANCE

Expand Down