Adds validation to create profile.

Author: FranciscoCanas

src/freeseer/frontend/controller/configuration.py

@@ -24,6 +24,7 @@
 import signal
 
 from flask import Blueprint, request
+import re
 from freeseer import settings, logging
 from freeseer.framework.config.exceptions import InvalidOptionValueError
 from freeseer.framework.config.profile import ProfileDoesNotExist, ProfileAlreadyExists
@@ -90,19 +91,19 @@ def map_plugin_category(plugin_type):
     return category
 
 
-def update_config(config, changes):
+def update_config(config, data):
     """
-    Helper to update Config instances with request data.
+    Updates given Config instance with request data.
     """
-    for key, value in changes.items():
+    for key, value in data.items():
         try:
             opt_instance = config.options[key]
             value = opt_instance.decode(value)
             setattr(config, key, value)
         except KeyError:
             raise HTTPError('Invalid Option: {}'.format(key), 400)
         except InvalidOptionValueError:
-            raise HTTPError('Invalid Value: {}'.format(value), 400)
+            raise HTTPError('Invalid Value {} for option {}'.format(value, key), 400)
     config.save()
 
 
@@ -172,7 +173,11 @@ def create_profile():
     """
     Create new profile under 'name' specified in request arg.
     """
+    pattern = '^\w+$'
     profile_name = request.form['name']
+    if not re.match(pattern, profile_name):
+        raise HTTPError('Invalid Profile Name: {}'.format(profile_name), 400)
+
     try:
         settings.profile_manager.create(profile_name)
     except ProfileAlreadyExists:
@@ -237,8 +242,6 @@ def modify_general_configuration(profile):
     changes = request.form
     update_config(profile_configuration, changes)
     return ''
-
-
 #
 # General Configuration Endpoints
 #
@@ -278,8 +281,6 @@ def modify_recording_configuration(profile):
     changes = request.form
     update_config(profile_configuration, changes)
     return ''
-
-
 #
 # End recording configuration endpoints.
 #
@@ -300,15 +301,15 @@ def list_plugin_category(profile, category):
     return {
         'plugins': [plugin.name for plugin in plugin_infos]
     }
-
-
 #
 # End of plugin category endpoints.
 #
 
 #
 # Plugin endpoints.
 #
+
+
 @configuration.route('/profiles/<string:profile>/recording/<string:category>/<string:plugin>', methods=['GET'])
 @http_response(200)
 def list_plugin_instances(profile, category, plugin):
@@ -360,7 +361,6 @@ def modify_plugin_instance(profile, category, plugin, id):
     changes = request.form
     update_config(plugin_object.config, changes)
     return ''
-
 #
 # End of plugin endpoints.
 #

src/freeseer/tests/frontend/controller/test_configuration.py

@@ -79,8 +79,10 @@ def test_create_profile(self, test_client):
         assert new_profile
 
     def test_create_profile_invalid_args(self, test_client):
-        response = test_client.post('/profiles')
+        response = test_client.post('/profiles', data={'name': '$%@DN@'})
+        data = json.loads(response.data)
         assert response.status_code == 400
+        assert data['error_message'] == 'Invalid Profile Name: $%@DN@'
 
     def test_create_profile_already_exists(self, test_client):
         response = test_client.post('/profiles',