Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-01-22 16:52:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: More lenient postgres override parsing (#6712)

Browse Source
This commit is contained in:
Michael Genson
2025-12-13 14:21:54 -06:00
committed by GitHub
parent e5276f6c20
commit bdbef1ab9e
2 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mealie/core/settings/db_providers.py
View File

@@ -43,22 +43,22 @@ class PostgresProvider(AbstractDBProvider, BaseSettings):
model_config = SettingsConfigDict(arbitrary_types_allowed=True, extra="allow")
def _parse_override_url(self, url: str) -> str:
if not url.startswith("postgresql://"):
raise ValueError("POSTGRES_URL_OVERRIDE scheme must be postgresql")
scheme, remainder = url.split("://", 1)
if "@" in remainder and ":" in remainder.split("@")[0]:
credentials, host_part = remainder.rsplit("@", 1)
user, password = credentials.split(":", 1)
return f"{scheme}://{user}:{urlparse.quote(password, safe='')}@{host_part}"
return url
@property
def db_url(self) -> str:
if self.POSTGRES_URL_OVERRIDE:
url = self.POSTGRES_URL_OVERRIDE
scheme, remainder = url.split("://", 1)
if scheme != "postgresql":
raise ValueError("POSTGRES_URL_OVERRIDE scheme must be postgresql")
remainder = remainder.split(":", 1)[1]
password = remainder[: remainder.rfind("@")]
quoted_password = urlparse.quote(password)
safe_url = url.replace(password, quoted_password)
return safe_url
return self._parse_override_url(self.POSTGRES_URL_OVERRIDE)
return str(
PostgresDsn.build(