feat: update domains
This commit is contained in:
@@ -100,17 +100,29 @@ class Settings(BaseSettings):
|
|||||||
|
|
||||||
@field_validator('CSRF_COOKIE_DOMAIN', mode='before')
|
@field_validator('CSRF_COOKIE_DOMAIN', mode='before')
|
||||||
@classmethod
|
@classmethod
|
||||||
def empty_csrf_domain_to_none(cls, v):
|
def normalize_csrf_cookie_domain(cls, v):
|
||||||
if v is None or (isinstance(v, str) and not v.strip()):
|
if v is None or (isinstance(v, str) and not v.strip()):
|
||||||
return None
|
return '.elcsa.ru'
|
||||||
return v
|
s = str(v).strip()
|
||||||
|
sl = s.lower()
|
||||||
|
if sl in ('.elcsa.ru', 'elcsa.ru'):
|
||||||
|
return '.elcsa.ru'
|
||||||
|
if sl.endswith('.elcsa.ru') and not sl.startswith('.'):
|
||||||
|
return '.elcsa.ru'
|
||||||
|
return s
|
||||||
|
|
||||||
@field_validator('AUTH_COOKIE_DOMAIN', mode='before')
|
@field_validator('AUTH_COOKIE_DOMAIN', mode='before')
|
||||||
@classmethod
|
@classmethod
|
||||||
def empty_auth_domain_to_none(cls, v):
|
def normalize_auth_cookie_domain(cls, v):
|
||||||
if v is None or (isinstance(v, str) and not v.strip()):
|
if v is None or (isinstance(v, str) and not v.strip()):
|
||||||
return None
|
return '.elcsa.ru'
|
||||||
return v
|
s = str(v).strip()
|
||||||
|
sl = s.lower()
|
||||||
|
if sl in ('.elcsa.ru', 'elcsa.ru'):
|
||||||
|
return '.elcsa.ru'
|
||||||
|
if sl.endswith('.elcsa.ru') and not sl.startswith('.'):
|
||||||
|
return '.elcsa.ru'
|
||||||
|
return s
|
||||||
|
|
||||||
@field_validator('REDIS_PASSWORD', mode='before')
|
@field_validator('REDIS_PASSWORD', mode='before')
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ async def issue_csrf_token(request: Request):
|
|||||||
httponly=settings.CSRF_COOKIE_HTTPONLY,
|
httponly=settings.CSRF_COOKIE_HTTPONLY,
|
||||||
samesite=settings.CSRF_COOKIE_SAMESITE,
|
samesite=settings.CSRF_COOKIE_SAMESITE,
|
||||||
path=settings.CSRF_COOKIE_PATH,
|
path=settings.CSRF_COOKIE_PATH,
|
||||||
domain=settings.CSRF_COOKIE_DOMAIN,
|
domain=settings.CSRF_COOKIE_DOMAIN or '.elcsa.ru',
|
||||||
max_age=csrf.ttl_seconds,
|
max_age=csrf.ttl_seconds,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user