Skip to content

Pass additional args to callable option cors_allowed_origins #398

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
miguelgrinberg merged 2 commits into from
Apr 12, 2025
+20 −16
Merged

Pass additional args to callable option cors_allowed_origins #398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82c613a
Pass additional args to callable option cors_allowed_origins
wft-swas Apr 4, 2025
e73cc37
simplify cors allowed hosts logic
miguelgrinberg Apr 12, 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
36 changes: 20 additions & 16 deletions src/engineio/base_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,29 +282,33 @@ def _unauthorized(self, message=None):
'response': message.encode('utf-8')}

def _cors_allowed_origins(self, environ):
default_origins = []
if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
default_origins.append('{scheme}://{host}'.format(
scheme=environ['wsgi.url_scheme'], host=environ['HTTP_HOST']))
if 'HTTP_X_FORWARDED_PROTO' in environ or \
'HTTP_X_FORWARDED_HOST' in environ:
scheme = environ.get(
'HTTP_X_FORWARDED_PROTO',
environ['wsgi.url_scheme']).split(',')[0].strip()
default_origins.append('{scheme}://{host}'.format(
scheme=scheme, host=environ.get(
'HTTP_X_FORWARDED_HOST', environ['HTTP_HOST']).split(
',')[0].strip()))
if self.cors_allowed_origins is None:
allowed_origins = default_origins
allowed_origins = []
if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
allowed_origins.append('{scheme}://{host}'.format(
scheme=environ['wsgi.url_scheme'],
host=environ['HTTP_HOST']))
if 'HTTP_X_FORWARDED_PROTO' in environ or \
'HTTP_X_FORWARDED_HOST' in environ:
scheme = environ.get(
'HTTP_X_FORWARDED_PROTO',
environ['wsgi.url_scheme']).split(',')[0].strip()
allowed_origins.append('{scheme}://{host}'.format(
scheme=scheme, host=environ.get(
'HTTP_X_FORWARDED_HOST',
environ['HTTP_HOST']).split(
',')[0].strip()))
elif self.cors_allowed_origins == '*':
allowed_origins = None
elif isinstance(self.cors_allowed_origins, str):
allowed_origins = [self.cors_allowed_origins]
elif callable(self.cors_allowed_origins):
origin = environ.get('HTTP_ORIGIN')
allowed_origins = [origin] \
if self.cors_allowed_origins(origin) else []
try:
is_allowed = self.cors_allowed_origins(origin, environ)
except TypeError:
is_allowed = self.cors_allowed_origins(origin)
allowed_origins = [origin] if is_allowed else []
else:
allowed_origins = self.cors_allowed_origins
return allowed_origins
Expand Down
Loading