bundles: Don't allow slashes in bundle names

Because bundle names are used in URLs, we don't want slashes in them.

Include a SQL migration script.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/forms.py b/apps/patchwork/forms.py
index d5e51a2c8b9dfcc52954b13e95bb3d774f0b03c2..82197696588b3ced6f8a86bf71e7db18d8e0dc4b 100644 (file)
--- a/apps/patchwork/forms.py
+++ b/apps/patchwork/forms.py
@@ -58,11 +58,14 @@ class LoginForm(forms.Form):
     password = forms.CharField(widget = forms.PasswordInput)
 
 class BundleForm(forms.ModelForm):
     password = forms.CharField(widget = forms.PasswordInput)
 
 class BundleForm(forms.ModelForm):

+    name = forms.RegexField(regex = r'^[^/]+$', max_length=50, label=u'Name',
+            error_messages = {'invalid': 'Bundle names can\'t contain slashes'})
+

     class Meta:
         model = Bundle
         fields = ['name', 'public']
 
     class Meta:
         model = Bundle
         fields = ['name', 'public']
 

-class CreateBundleForm(forms.ModelForm):
+class CreateBundleForm(BundleForm):

     def __init__(self, *args, **kwargs):
         super(CreateBundleForm, self).__init__(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
         super(CreateBundleForm, self).__init__(*args, **kwargs)
 

diff --git a/apps/patchwork/utils.py b/apps/patchwork/utils.py
index 1771167ae12f35fb55479c35aa865be496ce2664..f48e7a59a341ada3bc9a1465c809f181dac4cd3a 100644 (file)
--- a/apps/patchwork/utils.py
+++ b/apps/patchwork/utils.py
@@ -105,6 +105,9 @@ def set_bundle(user, project, action, data, patches, context):
     bundle = None
     if action == 'create':
         bundle_name = data['bundle_name'].strip()
     bundle = None
     if action == 'create':
         bundle_name = data['bundle_name'].strip()

+        if '/' in bundle_name:
+            return ['Bundle names can\'t contain slashes']
+

         if not bundle_name:
             return ['No bundle name was specified']
 
         if not bundle_name:
             return ['No bundle name was specified']
 

diff --git a/lib/sql/migration/013-bundle-names.sql b/lib/sql/migration/013-bundle-names.sql
new file mode 100644 (file)
index 0000000..3dbbfb1
--- /dev/null
+++ b/lib/sql/migration/013-bundle-names.sql
@@ -0,0 +1,6 @@
+BEGIN;
+UPDATE patchwork_bundle
+       SET name = replace(name, '/', '-')
+       WHERE name like '%/%';
+COMMIT;
+