Changeset 8514

Timestamp:

04/17/08 20:25:39 (6 months ago)

Author:

fabien

Message:

added validation for application/module/task names (closes #3228)

Files:

• branches/1.1/lib/task/generator/sfGenerateAppTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/generator/sfGenerateModuleTask.class.php (modified) (1 diff)
• branches/1.1/lib/task/generator/sfGenerateTaskTask.class.php (modified) (1 diff)

branches/1.1/lib/task/generator/sfGenerateAppTask.class.php

@@ -90 +90 @@
-    $app = $arguments['application'];
-
+    // Validate the application name
+    if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $app))
+    {
+      throw new sfCommandException(sprintf('The application name "%s" is invalid.', $app));
+    }
+
-    $appDir = sfConfig::get('sf_apps_dir').'/'.$app;
-

branches/1.1/lib/task/generator/sfGenerateModuleTask.class.php

@@ -70 +70 @@
-    $module = $arguments['module'];
-
+    // Validate the module name
+    if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $app))
+    {
+      throw new sfCommandException(sprintf('The module name "%s" is invalid.', $app));
+    }
+
-    $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$module;
-

branches/1.1/lib/task/generator/sfGenerateTaskTask.class.php

@@ -63 +63 @@
-    $name = isset($taskNameComponents[1]) ? $taskNameComponents[1] : $taskNameComponents[0];
-    $taskClassName = str_replace('-', '', ($namespace ? $namespace.ucfirst($name) : $name)).'Task';
+
+    // Validate the class name
+    if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $app))
+    {
+      throw new sfCommandException(sprintf('The task class name "%s" is invalid.', $app));
+    }
+
-    $briefDescription = $options['brief-description'];
-    $detailedDescription = <<<HED