ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-01-31 02:46:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for multiple cookie domains

Browse Source
This commit is contained in:
clearml 2024-12-18 17:47:21 +02:00
parent 1299ebfcf3
commit 1b76f36dcd
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apiserver/server_init/request_handlers.py
View File

@ -2,6 +2,7 @@ import unicodedata
import urllib.parse import urllib.parse
from functools import partial from functools import partial
from boltons.iterutils import first
from flask import request, Response, redirect from flask import request, Response, redirect
from werkzeug.datastructures import ImmutableMultiDict from werkzeug.datastructures import ImmutableMultiDict
from werkzeug.exceptions import BadRequest from werkzeug.exceptions import BadRequest
@ -22,12 +23,26 @@ log = config.logger(__file__)
class RequestHandlers: class RequestHandlers:
_request_strip_prefix = config.get("apiserver.request.strip_prefix", None) _request_strip_prefix = config.get("apiserver.request.strip_prefix", None)
_server_header = config.get("apiserver.response.headers.server", "clearml") _server_header = config.get("apiserver.response.headers.server", "clearml")
_basic_cookie_settings = config.get("apiserver.auth.cookies")
_custom_cookie_settings = { _custom_cookie_settings = {
c["name"]: c["settings"] c["name"]: c["settings"]
for c in config.get("apiserver.auth.custom_cookies", {}).values() for c in config.get("apiserver.auth.custom_cookies", {}).values()
if c.get("enabled") and c.get("settings") if c.get("enabled") and c.get("settings")
} }
def _get_cookie_settings(self, cookie_key=None):
settings = (
self._custom_cookie_settings.get(cookie_key) or self._basic_cookie_settings
).copy()
if isinstance(settings["domain"], list):
host_without_port, _, _ = request.host.partition(":")
domain = first(
settings["domain"],
key=lambda d: host_without_port.endswith(d) if d else False,
)
settings["domain"] = domain
return settings
def before_request(self): def before_request(self):
if request.method == "OPTIONS": if request.method == "OPTIONS":
return "", 200 return "", 200
@ -80,10 +95,7 @@ class RequestHandlers:
if call.result.cookies: if call.result.cookies:
for key, value in call.result.cookies.items(): for key, value in call.result.cookies.items():
kwargs = ( kwargs = self._get_cookie_settings(key)
self._custom_cookie_settings.get(key)
or config.get("apiserver.auth.cookies")
).copy()
if value is None: if value is None:
# Removing a cookie # Removing a cookie
kwargs["max_age"] = 0 kwargs["max_age"] = 0