Skip to content

Commit 277f8e2

Browse files
authored
fix: restrict template views to warehouse domain (#18572)
1 parent 2d087c9 commit 277f8e2

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

tests/unit/test_routes.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,27 +647,35 @@ def add_redirect_rule(*args, **kwargs):
647647
"sitemap",
648648
"/sitemap/",
649649
"pages/sitemap.html",
650+
route_kw={"domain": warehouse},
650651
view_kw={"has_translations": True},
651652
),
652653
pretend.call(
653-
"help", "/help/", "pages/help.html", view_kw={"has_translations": True}
654+
"help",
655+
"/help/",
656+
"pages/help.html",
657+
route_kw={"domain": warehouse},
658+
view_kw={"has_translations": True},
654659
),
655660
pretend.call(
656661
"security",
657662
"/security/",
658663
"pages/security.html",
664+
route_kw={"domain": warehouse},
659665
view_kw={"has_translations": True},
660666
),
661667
pretend.call(
662668
"sponsors",
663669
"/sponsors/",
664670
"pages/sponsors.html",
671+
route_kw={"domain": warehouse},
665672
view_kw={"has_translations": True},
666673
),
667674
pretend.call(
668675
"trademarks",
669676
"/trademarks/",
670677
"pages/trademarks.html",
678+
route_kw={"domain": warehouse},
671679
view_kw={"has_translations": True},
672680
),
673681
]

warehouse/routes.py

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,24 @@ def includeme(config):
2929

3030
# Some static, template driven pages
3131
config.add_template_view(
32-
"sitemap", "/sitemap/", "pages/sitemap.html", view_kw={"has_translations": True}
32+
"sitemap",
33+
"/sitemap/",
34+
"pages/sitemap.html",
35+
route_kw={"domain": warehouse},
36+
view_kw={"has_translations": True},
3337
)
3438
config.add_template_view(
35-
"help", "/help/", "pages/help.html", view_kw={"has_translations": True}
39+
"help",
40+
"/help/",
41+
"pages/help.html",
42+
route_kw={"domain": warehouse},
43+
view_kw={"has_translations": True},
3644
)
3745
config.add_template_view(
3846
"security",
3947
"/security/",
4048
"pages/security.html",
49+
route_kw={"domain": warehouse},
4150
view_kw={"has_translations": True},
4251
)
4352
# Redirect the old "sponsor PyPI" page to the sponsors page
@@ -46,6 +55,7 @@ def includeme(config):
4655
"sponsors",
4756
"/sponsors/",
4857
"pages/sponsors.html",
58+
route_kw={"domain": warehouse},
4959
view_kw={"has_translations": True},
5060
)
5161

@@ -63,6 +73,7 @@ def includeme(config):
6373
"trademarks",
6474
"/trademarks/",
6575
"pages/trademarks.html",
76+
route_kw={"domain": warehouse},
6677
view_kw={"has_translations": True},
6778
)
6879

0 commit comments

Comments
 (0)