Fix vimeo#4620 - reconciled literal strings cannot carry taints

danog · Jan 29, 2021 · 43187a0 · 43187a0
1 parent f969b01
commit 43187a0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Psalm/Type/Reconciler.php b/src/Psalm/Type/Reconciler.php
@@ -309,7 +309,8 @@ public static function reconcileKeyedTypes(
             }
 
             if (($statements_analyzer->data_flow_graph instanceof \Psalm\Internal\Codebase\TaintFlowGraph
-                    && (!$result_type->hasScalarType()) || $result_type->hasString())
+                    && (!$result_type->hasScalarType())
+                        || ($result_type->hasString() && !$result_type->hasLiteralString()))
                 || $statements_analyzer->data_flow_graph instanceof \Psalm\Internal\Codebase\VariableUseGraph
             ) {
                 if ($before_adjustment && $before_adjustment->parent_nodes) {

diff --git a/tests/TaintTest.php b/tests/TaintTest.php
@@ -544,6 +544,19 @@ public function getTaint() : string {
                     $a = new A("bar");
                     echo $a->getTaint();',
             ],
+            'literalStringCannotCarryTaint' => [
+                '<?php
+                    $file = $_GET["foo"];
+
+                    if ($file !== "") {
+                        /**
+                         * @psalm-taint-escape input
+                         */
+                        $file = basename($file);
+                    }
+
+                    echo $file;'
+            ],
         ];
     }