Directory separator conflicts with PharData file path

[KurlenkovEvgeniy]

PharData has FilesystemIterator::UNIX_PATHS flag as default in constructor (https://www.php.net/manual/en/phardata.construct.php, https://www.php.net/manual/en/class.filesystemiterator.php#filesystemiterator.constants.unix-paths).
However, ‎DIRECTORY_SEPARATOR is used in

location/src/Drivers/MaxMind.php

Line 45 in c95c397

Str::afterLast($file->getPath(), DIRECTORY_SEPARATOR),

which fails to retrieve valid $relativePath on Windows.

[KurlenkovEvgeniy]

And maybe it is possible to extract file exact to $this->getDatabasePath()?

location/src/Drivers/MaxMind.php

Line 49 in c95c397

$archive->extractTo($storage->path('/'), $relativePath, true);

It leaves extracted junk files.

[stevebauman]

Hi @KurlenkovEvgeniy,

What do you suggest? Should we create new PharData with unix-paths disabled for Windows systems?

[KurlenkovEvgeniy]

Since the FilesystemIterator::UNIX_PATHS flag used in PharData, changing DIRECTORY_SEPARATOR to '/' in

location/src/Drivers/MaxMind.php

Line 45 in c95c397

Str::afterLast($file->getPath(), DIRECTORY_SEPARATOR),

should be enough.

[KurlenkovEvgeniy]

What can you say about junk files?
There is a directory in downloading .tar.gz file. The structure is like this - maxmind.tar.gz/GeoLite2-Country_20240503/GeoLite2-Country.mmdb
After extracting, directory
%root directory from config('location.maxmind.local.path')%/GeoLite2-Country_20240503/GeoLite2-Country.mmdb
is not being deleted.
Looks like we can't extract files within directories without latter themselves.
I can suggest to clear those temp directories.
From line

location/src/Drivers/MaxMind.php

Line 44 in c95c397

$relativePath = implode('/', [

$tmpDirectory = Str::afterLast($file->getPath(), '/'); // add var and unix-separator
if ($tmpDirectory == $tar) { // check if in the future the .mmdb file will be in the root of archive
    $relativePath = $file->getFilename();
} else {
    $relativePath = implode('/', [
        $tmpDirectory,
        $file->getFilename(),
    ]);
}

$archive->extractTo($storage->path('/'), $relativePath, true);

$dataBasePath = $this->getDatabasePath();
file_put_contents(
    $dataBasePath,
    fopen($storage->path($relativePath), 'r')
);

if ($tmpDirectory == $tar && !Str::endsWith($dataBasePath, DIRECTORY_SEPARATOR.$relativePath)) { // in case of db file name from config equals db file name from maxmind
    $storage->delete($relativePath);
} else {
    $storage->deleteDirectory($tmpDirectory); // delete dir and it's files
}
$storage->delete($tar);