danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Taint map is non-empty as well

Browse Source
This commit is contained in:
Bruce Weirdan 2023-02-26 03:17:13 -04:00
parent 6811547707
commit e743cd9e8d
No known key found for this signature in database
GPG Key ID: CFC3AAB181751B0D
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dictionaries/InternalTaintSinkMap.php
View File

@ -5,7 +5,7 @@ use Psalm\Type\TaintKind;
// This maps internal function names to sink types that we don’t want to end up there
/**
* @var array<string, list<list<TaintKind::*>>>
* @var non-empty-array<string, non-empty-list<list<TaintKind::*>>>
*/
return [
'exec' => [['shell']],

17
src/Psalm/Internal/Codebase/InternalCallMapHandler.php
View File

@ -53,9 +53,9 @@ class InternalCallMapHandler
private static ?array $call_map_callables = [];
/**
* @var array<string, list<list<TaintKind::*>>>
* @var non-empty-array<string, non-empty-list<list<TaintKind::*>>>|null
*/
private static array $taint_sink_map = [];
private static ?array $taint_sink_map = null;
/**
* @param list<PhpParser\Node\Arg> $args
@ -333,6 +333,8 @@ class InternalCallMapHandler
* Gets the method/function call map
*
* @return non-empty-array<string, array<int|string, string>>
* @psalm-assert !null self::$taint_sink_map
* @psalm-assert !null self::$call_map
*/
public static function getCallMap(): array
{
@ -366,15 +368,18 @@ class InternalCallMapHandler
self::$call_map = $call_map;
/**
* @var array<string, list<list<TaintKind::*>>>
* @var non-empty-array<string, non-empty-list<list<TaintKind::*>>>
*/
$taint_map = require(dirname(__DIR__, 4) . '/dictionaries/InternalTaintSinkMap.php');
$taint_map_data = require(dirname(__DIR__, 4) . '/dictionaries/InternalTaintSinkMap.php');
foreach ($taint_map as $key => $value) {
$taint_map = [];
foreach ($taint_map_data as $key => $value) {
$cased_key = strtolower($key);
self::$taint_sink_map[$cased_key] = $value;
$taint_map[$cased_key] = $value;
}
self::$taint_sink_map = $taint_map;
if (version_compare($analyzer_version, $current_version, '<')) {
// the following assumes both minor and major versions a single digits
for ($i = $current_version_int; $i > $analyzer_version_int && $i >= self::LOWEST_AVAILABLE_DELTA; --$i) {