Skip to content

Proxito: refactor allowed_user #10213

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
merged 2 commits into from
Apr 3, 2023
Merged

Proxito: refactor allowed_user #10213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c8e577
Proxito: refactor allowed_user
stsewd Mar 30, 2023
52e8477
Black
stsewd Mar 30, 2023
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 readthedocs/projects/views/public.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def get(
slug=version_slug,
)

if not self.allowed_user(request, project, version.slug):
if not self.allowed_user(request, version):
return self.get_unauthed_response(request, project)

# All public versions can be cached.
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/proxito/views/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def _serve_401(self, request, project):
log.debug('Unauthorized access to documentation.', project_slug=project.slug)
return res

def allowed_user(self, *args, **kwargs):
def allowed_user(self, request, version):
return True

def get_version_from_host(self, request, version_slug):
Expand Down
29 changes: 14 additions & 15 deletions readthedocs/proxito/views/serve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def get(
pass

# Check user permissions and return an unauthed response if needed
if not self.allowed_user(request, final_project, version_slug):
if not version or not self.allowed_user(request, version):
return self.get_unauthed_response(request, final_project)

return self._serve_docs(
Expand Down Expand Up @@ -460,7 +460,7 @@ def get_using_unresolver(self, request):
pass

# Check user permissions and return an unauthed response if needed.
if not self.allowed_user(request, project, version.slug):
if not self.allowed_user(request, version):
return self.get_unauthed_response(request, project)

return self._serve_docs(
Expand Down Expand Up @@ -637,22 +637,21 @@ def _get_custom_404_page(self, request, project, version=None):
If a 404 page is found, we return a response with the content of that file,
`None` otherwise.
"""
current_version_slug = version.slug if version else None
versions_slug = []
if current_version_slug:
versions_slug.append(current_version_slug)

default_version_slug = project.get_default_version()
if default_version_slug != current_version_slug:
versions_slug.append(default_version_slug)

for version_slug_404 in versions_slug:
if not self.allowed_user(request, project, version_slug_404):
versions_404 = [version] if version else []
if not version or version.slug != project.default_version:
default_version = project.versions.filter(
slug=project.default_version
).first()
if default_version:
versions_404.append(default_version)

for version_404 in versions_404:
if not self.allowed_user(request, version_404):
continue

storage_root_path = project.get_storage_path(
type_="html",
version_slug=version_slug_404,
version_slug=version_404.slug,
include_file=False,
version_type=self.version_type,
)
Expand All @@ -664,7 +663,7 @@ def _get_custom_404_page(self, request, project, version=None):
if build_media_storage.exists(storage_filename_path):
log.info(
"Serving custom 404.html page.",
version_slug_404=version_slug_404,
version_slug_404=version_404.slug,
storage_filename_path=storage_filename_path,
)
resp = HttpResponse(
Expand Down