Skip to content

Add mongo database name to connection uri #128

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
asadeg02 merged 8 commits into from
Apr 9, 2025
Merged

Add mongo database name to connection uri #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
888d274
feat: refactor mongodb connection urigeneration to get user and passw…
asadeg02 Apr 4, 2025
84266ed
fix: URL-encode MongoDB credentials to prevent InvalidURI errors
asadeg02 Apr 7, 2025
1c065a6
Merge branch 'main' into refactor/mongodb-connection-uri
asadeg02 Apr 7, 2025
0dd069a
fix: update MongoDB health check to ensure compatibility with AWS tas…
asadeg02 Apr 7, 2025
7247fda
Fix syntax error caused by resolving merge conflicts
asadeg02 Apr 7, 2025
5277070
Add relaxed health check endpoint for AWS container and ALB health ch…
asadeg02 Apr 8, 2025
adfd34d
Add option to allow all hosts by setting env variable
asadeg02 Apr 8, 2025
d8ff014
feat: add mongo database name to connection uri
asadeg02 Apr 9, 2025
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
5 changes: 5 additions & 0 deletions backend/backend/apis/bwwc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,10 @@ def mongo_health(req: HttpRequest) -> HttpResponse:
else:
return HttpResponseBadRequest("Invalid request method")

@csrf_exempt
def app_health_check(req: HttpRequest) -> HttpResponse:
return HttpResponse("OK")


def get_urlpatterns():
return [
Expand All @@ -329,4 +333,5 @@ def get_urlpatterns():
path("api/bwwc/get_submission_history/", get_submission_history),
path("api/bwwc/backup/", backup),
path("api/bwwc/health/", mongo_health),
path("/api/bwwc/healthz/", app_health_check),
]
4 changes: 4 additions & 0 deletions backend/backend/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
SECRET_KEY = os.getenv("SECRET_KEY")

DJANGO_ALLOWED_HOSTS = os.getenv("DJANGO_ALLOWED_HOSTS", "")
ALLOW_ALL_HOSTS = os.getenv("ALLOW_ALL_HOSTS", "false")

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = DJANGO_ENV == "dev"
Expand All @@ -56,6 +57,9 @@
if DJANGO_ALLOWED_HOSTS:
ALLOWED_HOSTS.extend(DJANGO_ALLOWED_HOSTS.split(","))

if ALLOW_ALL_HOSTS.lower() == "true":
ALLOWED_HOSTS = ["*"]

CORS_ALLOWED_ORIGINS = [
"http://127.0.0.1:5173",
"http://localhost:5173",
Expand Down
3 changes: 2 additions & 1 deletion backend/env/.env.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ MONGO_USER = bwwc
MONGO_PASSWORD = mongo
MONGO_DB = bwwc
MONGO_PARAMS = ""
DJANGO_ALLOWED_HOSTS = ""
DJANGO_ALLOWED_HOSTS = ""
ALLOW_ALL_HOSTS = false
3 changes: 2 additions & 1 deletion backend/env/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ MONGO_USER = bwwc
MONGO_PASSWORD = mongo
MONGO_DB = bwwc
MONGO_PARAMS = ""
DJANGO_ALLOWED_HOSTS = ""
DJANGO_ALLOWED_HOSTS = ""
ALLOW_ALL_HOSTS = false
8 changes: 5 additions & 3 deletions backend/secretshare/mpce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import uuid
import numbers
import logging
import urllib.parse
from typing import Any, Dict, List, Optional, Tuple, Union, Callable
from itertools import groupby
from operator import itemgetter
Expand Down Expand Up @@ -35,11 +36,12 @@ def __init__(self, protocol: str = "shamirs", prime: int = 180252380737439):

self.mongo_host = os.environ.get("MONGO_HOST")
self.mongo_port = os.environ.get("MONGO_PORT")
self.mongo_user = os.environ.get("MONGO_USER", "bwwc")
self.mongo_password = os.environ.get("MONGO_PASSWORD")
self.mongo_user = urllib.parse.quote_plus(os.environ.get("MONGO_USER", "bwwc"))
self.mongo_password = urllib.parse.quote_plus(os.environ.get("MONGO_PASSWORD"))
self.mongo_db = os.environ.get("MONGO_DB", "bwwc")
self.mongo_params = os.environ.get("MONGO_PARAMS", "")
mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/?{self.mongo_params}"
mongo_uri = f"mongodb://{self.mongo_user}:{self.mongo_password}@{self.mongo_host}:{self.mongo_port}/{self.mongo_db}?{self.mongo_params}"
self.logger.info(f"Connection URI is: {mongo_uri}")

self.mongo_client = MongoClient(mongo_uri)

Expand Down
Loading