Changeset 1d9734c

Timestamp:

01/29/12 16:07:12 (4 months ago)

Author:

mrook

Branches:

master

Children:

3286322, 9c52445

Parents:

aaec053

git-author:

Michiel Rook <mrook@…> (01/29/12 16:07:12)

git-committer:

Michiel Rook <mrook@…> (01/29/12 16:07:12)

Message:

Fixes #833 - always escape arguments when escape is set to true

Files:

• classes/phing/tasks/system/ExecTask.php (modified) (1 diff, 1 prop)
• classes/phing/types/Commandline.php (modified) (3 diffs, 1 prop)
• test/classes/phing/tasks/system/ExecTaskTest.php (modified) (1 diff, 1 prop)
• test/etc/tasks/system/ExecTest.xml (modified) (1 diff)

classes/phing/tasks/system/ExecTask.php

@@ -211 +211 @@
             );
         } else if ($this->command === null) {
-            $this->command = (string)$this->commandline;
+            $this->command = Commandline::toString($this->commandline->getCommandline(), $this->escape);
         } else if ($this->commandline->getExecutable() === null) {
             //we need to escape the command only if it's specified directly

classes/phing/types/Commandline.php

@@ -158 +158 @@
      *                           and double quotes.
      */
-    public static function quoteArgument($argument) {
-        if (strpos($argument, "\"") !== false) {
+    public static function quoteArgument($argument, $escape = false) {
+        if ($escape) {
+            return escapeshellarg($argument);
+        } elseif (strpos($argument, "\"") !== false) {
             if (strpos($argument, "'") !== false) {
                 throw new BuildException("Can't handle single and double quotes in same argument");
@@ -177 +179 @@
      * usable as command line arguments.
      */
-    public static function toString($lines) {
+    public static function toString($lines, $escape = false) {
         // empty path return empty string
         if (!$lines) {
@@ -189 +191 @@
                 $result .= ' ';
             }
-            $result .= self::quoteArgument($lines[$i]);
+            $result .= self::quoteArgument($lines[$i], $escape);
         }
         return $result;

test/classes/phing/tasks/system/ExecTaskTest.php

@@ -350 +350 @@
         $this->executeTarget(__FUNCTION__);
     }
+    
+    /**
+     * Inspired by {@link http://www.phing.info/trac/ticket/833}
+     */
+    public function testEscapedArg()
+    {
+        $this->executeTarget(__FUNCTION__);
+        $this->assertPropertyEquals('outval', 'abc$b3!SB');
+    }
 }
 

test/etc/tasks/system/ExecTest.xml

@@ -151 +151 @@
         </exec>
     </target>
+    
+    <target name="testEscapedArg">
+        <exec executable="echo" escape="true" outputProperty="outval">
+            <arg value="abc$b3!SB"/>
+        </exec>
+    </target>
 
 </project>