Skip to content

Add optional parameter to is_internal_call check #40

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
mlclay merged 3 commits into from
Jun 24, 2020
Merged

Add optional parameter to is_internal_call check #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0e575c
Add optional parameter to check
jamesfneyer Jun 23, 2020
0d52692
Update pyproject version
jamesfneyer Jun 23, 2020
48e1ada
Remove redundant is_internal check
jamesfneyer Jun 23, 2020
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "shipchain-common"
version = "1.0.24"
version = "1.0.25"
description = "A PyPI package containing shared code for ShipChain's Python/Django projects."

license = "Apache-2.0"
Expand Down
15 changes: 8 additions & 7 deletions src/shipchain_common/authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,20 @@ def get_jwt_from_request(request):
return None


def is_internal_call(request):
return ('X_NGINX_SOURCE' in request.META and request.META['X_NGINX_SOURCE'] == 'internal'
and request.META['X_SSL_CLIENT_VERIFY'] == 'SUCCESS')
def is_internal_call(request, service_name=None):
is_internal = ('X_NGINX_SOURCE' in request.META and request.META['X_NGINX_SOURCE'] == 'internal'
and request.META['X_SSL_CLIENT_VERIFY'] == 'SUCCESS')
if service_name and is_internal:
certificate_cn = parse_dn(request.META['X_SSL_CLIENT_DN'])['CN']
is_internal = certificate_cn == f'{service_name}.{settings.ENVIRONMENT.lower()}-internal'
return is_internal


class InternalRequest(BasePermission):
def has_permission(self, request, view):
if settings.ENVIRONMENT in ('LOCAL', 'INT'):
return True
if is_internal_call(request):
certificate_cn = parse_dn(request.META['X_SSL_CLIENT_DN'])['CN']
return certificate_cn == f'{self.SERVICE_NAME}.{settings.ENVIRONMENT.lower()}-internal'
return False
return is_internal_call(request, self.SERVICE_NAME)


class EngineRequest(InternalRequest):
Expand Down