From 93ed72d5dc17edfc0794a91946d7c3e9c449dd3c Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 16 Apr 2022 07:22:11 +0200 Subject: [PATCH 1/3] fix(model/paste): fix faulty condition --- src/httpaste/model/paste.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/httpaste/model/paste.py b/src/httpaste/model/paste.py index 3e030ef..534f9a8 100755 --- a/src/httpaste/model/paste.py +++ b/src/httpaste/model/paste.py @@ -94,7 +94,7 @@ def load(proto: Paste, backend: object) -> Optional[Paste]: if proto.sub and model.sub != shash( proto.sub, model.data_hash, - proto.pid) or not proto.sub and model.sub: + proto.pid) or (not proto.sub and model.sub): raise SubError('Paste not owned by user') From bf8e2c19cfe3036cc0902037c29f01088d6e3aee Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 16 Apr 2022 07:22:54 +0200 Subject: [PATCH 2/3] fix(controller/paste): add missing type --- src/httpaste/controller/paste/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/httpaste/controller/paste/__init__.py b/src/httpaste/controller/paste/__init__.py index 08a74a1..e6efa93 100644 --- a/src/httpaste/controller/paste/__init__.py +++ b/src/httpaste/controller/paste/__init__.py @@ -6,7 +6,7 @@ from httpaste.helper.common import decode, DecodeError, join_url import httpaste.model.paste as paste_model import httpaste.model.user as user_model from httpaste.backend import load_backend -from httpaste.helper.http import BadRequestError, GoneError, NotFoundError +from httpaste.helper.http import BadRequestError, GoneError, NotFoundError, ForbiddenError from httpaste.helper.syntax import highlight from httpaste.schema import ( PasteKey, From 04661720de8bd402bc11899b48bf37fcd8d3f779 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 16 Apr 2022 07:23:16 +0200 Subject: [PATCH 3/3] fix(httpaste/controller/ui/paste): fix url baking --- src/httpaste/controller/ui/paste/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/httpaste/controller/ui/paste/__init__.py b/src/httpaste/controller/ui/paste/__init__.py index 771ed1a..4d63bfd 100644 --- a/src/httpaste/controller/ui/paste/__init__.py +++ b/src/httpaste/controller/ui/paste/__init__.py @@ -54,12 +54,14 @@ def get(**kwargs): template = views.get_template("viewport/ui/paste/get.html") + + base_path = f'paste/public/{kwargs["id"]}' - raw_paste_url = f'{request.host_url}{base_path}' if kwargs.get('user'): - raw_paste_url = f'{request.host_url}{base_path}' + base_path = f'paste/private/{kwargs["id"]}' + raw_paste_url = f'{request.host_url}{base_path}' paste_url = raw_paste_url paste_url_query = {}