Skip to content

Address PHP security review comments #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hueitan merged 1 commit into from
Mar 24, 2026
+96 −16
Merged

Address PHP security review comments #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"phpunit/phpunit": "9.6.34",
"mediawiki/mediawiki-codesniffer": "48.0.0",
"mustangostang/spyc": "0.6.3",
"mhujer/yaml-sort-checker": "^1.5"
"mhujer/yaml-sort-checker": "^1.5",
"symfony/console": "^5.4",
"psr/log": "^2.0"
},

"support": {
Expand Down
52 changes: 51 additions & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/LanguageUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ public static function get(): LanguageUtil {
}

private function loadData() {
$this->data = json_decode( file_get_contents( __DIR__ . '/' . self::LANGUAGE_DATA_PATH ) );
$path = realpath( __DIR__ . '/' . self::LANGUAGE_DATA_PATH );
if ( $path && str_starts_with( $path, dirname( __DIR__ ) ) ) {
$this->data = json_decode( file_get_contents( $path ) );
} else {
throw new \RuntimeException( 'Invalid language data file path' );
}
}

/**
Expand Down
49 changes: 36 additions & 13 deletions src/util/ulsdata2json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,24 @@
* @license GPL-2.0-or-later
*/

require_once __DIR__ . '/../../vendor/autoload.php';
use Symfony\Component\Console\Logger\ConsoleLogger;
use Symfony\Component\Console\Output\ConsoleOutput;

$safeFile = __DIR__ . '/../../vendor/autoload.php';
require_once $safeFile;

$output = new ConsoleOutput();
$logger = new ConsoleLogger( $output );

define( 'DATA_DIRECTORY', __DIR__ . '/../../data' );

print "Reading langdb.yaml...\n";
$yamlLangdb = file_get_contents( DATA_DIRECTORY . '/langdb.yaml' );
$logger->info( "Reading langdb.yaml..." );
$langdbPath = realpath( DATA_DIRECTORY . '/langdb.yaml' );
if ( $langdbPath && is_readable( $langdbPath ) ) {
$yamlLangdb = file_get_contents( $langdbPath );
} else {
throw new Exception( "Cannot read langdb.yaml" );
}
$parsedLangdb = spyc_load( $yamlLangdb );

$supplementalDataFilename = 'supplementalData.xml';
Expand All @@ -27,27 +39,32 @@

$curl = curl_init( $supplementalDataUrl );
$supplementalDataFile = fopen( $supplementalDataFilename, 'w' );
if ( !$supplementalDataFile ) {
throw new Exception( "Cannot open file for writing" );
}

curl_setopt( $curl, CURLOPT_FILE, $supplementalDataFile );
curl_setopt( $curl, CURLOPT_HEADER, 0 );

print "Trying to download $supplementalDataUrl...\n";
$logger->info( "Trying to download $supplementalDataUrl..." );
$curlSuccess = curl_exec( $curl );
curl_close( $curl );
fclose( $supplementalDataFile );

if ( !$curlSuccess ) {
die( "Failed to download CLDR data from $supplementalDataUrl.\n" );
$logger->error( "Failed to download CLDR data from $supplementalDataUrl." );
exit( 1 );
}
print "Downloaded $supplementalDataFilename, trying to parse...\n";
$logger->info( "Downloaded $supplementalDataFilename, trying to parse..." );

$supplementalData = simplexml_load_file( $supplementalDataFilename );

if ( !( $supplementalData instanceof SimpleXMLElement ) ) {
die( "Attempt to load CLDR data from $supplementalDataFilename failed.\n" );
$logger->error( "Attempt to load CLDR data from $supplementalDataFilename failed." );
exit( 1 );
}

print "CLDR supplemental data parsed successfully, reading territories info...\n";
$logger->info( "CLDR supplemental data parsed successfully, reading territories info..." );
$parsedLangdb['territories'] = [];

foreach ( $supplementalData->territoryInfo->territory as $territoryRecord ) {
Expand Down Expand Up @@ -78,14 +95,14 @@
foreach ( $parsedLangdb['territories'] as $territoryCode => $languages ) {
foreach ( $languages as $index => $language ) {
if ( !isset( $parsedLangdb['languages'][$language] ) ) {
echo "Unknown language $language for territory $territoryCode\n";
$logger->warning( "Unknown language $language for territory $territoryCode" );
unset( $parsedLangdb['territories'][$territoryCode][$index] );
continue;
}

$data = $parsedLangdb['languages'][$language];
if ( count( $data ) === 1 ) {
echo "Redirect for language $language to {$data[0]} territory $territoryCode\n";
$logger->info( "Redirect for language $language to {$data[0]} territory $territoryCode" );
$parsedLangdb['territories'][$territoryCode][$index] = $data[0];
continue;
}
Expand All @@ -106,9 +123,15 @@
array_values( $parsedLangdb['territories'][$territoryCode] );
}

print "Writing JSON langdb...\n";
$logger->info( "Writing JSON langdb..." );
$jsonVerbose = json_encode( $parsedLangdb, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE ) . "\n";
// For making diff review easier.
file_put_contents( DATA_DIRECTORY . '/language-data.json', $jsonVerbose );
$outputFile = DATA_DIRECTORY . '/language-data.json';
$realDataDir = realpath( DATA_DIRECTORY );
if ( $realDataDir && str_starts_with( realpath( dirname( $outputFile ) ), $realDataDir ) ) {
file_put_contents( $outputFile, $jsonVerbose, LOCK_EX );
} else {
throw new Exception( "Invalid output path" );
}

print "Done.\n";
$logger->info( "Done." );
Loading