summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-01-29 00:48:34 +0100
committerDan McGee <dan@archlinux.org>2012-01-29 00:48:34 +0100
commitd4ebdc5b974e9478b2cd41a6948d031c2222c5b4 (patch)
tree6a54c032ede21a1a6ac423ca4e4adaf00f1dbb30
parentbb570809f18c01a1172e970738bac6ac7b6171f1 (diff)
downloadarchweb-d4ebdc5b974e9478b2cd41a6948d031c2222c5b4.tar.gz
archweb-d4ebdc5b974e9478b2cd41a6948d031c2222c5b4.tar.xz
Support more characters in package names
Fixes FS#28106, where we couldn't view packages with names containing the '@' symbol. Rather than whitelist things, switch to a blacklist of only a space and slash character. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--packages/urls.py4
-rw-r--r--packages/urls_groups.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/urls.py b/packages/urls.py
index 1f25e3f..6c61629 100644
--- a/packages/urls.py
+++ b/packages/urls.py
@@ -30,10 +30,10 @@ urlpatterns = patterns('packages.views',
(r'^(?P<name>[A-z0-9\-+.]+)/$',
'details'),
- (r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[A-z0-9\-+.]+)/$',
+ (r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[^ /]+)/$',
'details'),
# canonical package url. subviews defined above
- (r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/',
+ (r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/',
include(package_patterns)),
)
diff --git a/packages/urls_groups.py b/packages/urls_groups.py
index c561e50..d609944 100644
--- a/packages/urls_groups.py
+++ b/packages/urls_groups.py
@@ -3,7 +3,7 @@ from django.conf.urls.defaults import patterns
urlpatterns = patterns('packages.views',
(r'^$', 'groups', {}, 'groups-list'),
(r'^(?P<arch>[A-z0-9]+)/$', 'groups'),
- (r'^(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$', 'group_details'),
+ (r'^(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/$', 'group_details'),
)
# vim: set ts=4 sw=4 et: