From 31a35a50015abd60e6f976975527a4634dec5ee8 Mon Sep 17 00:00:00 2001 From: Dan Fabulich Date: Tue, 1 Oct 2024 21:10:38 -0700 Subject: [PATCH 1/2] Add composer, composer require glenscott/url-normalizer --- composer.json | 5 + composer.lock | 60 ++ docker-php-composer-setup.sh | 10 + php-composer-setup.sh | 23 + www/vendor/autoload.php | 25 + www/vendor/composer/ClassLoader.php | 579 ++++++++++++++++++ www/vendor/composer/InstalledVersions.php | 359 +++++++++++ www/vendor/composer/LICENSE | 21 + www/vendor/composer/autoload_classmap.php | 10 + www/vendor/composer/autoload_namespaces.php | 9 + www/vendor/composer/autoload_psr4.php | 10 + www/vendor/composer/autoload_real.php | 38 ++ www/vendor/composer/autoload_static.php | 36 ++ www/vendor/composer/installed.json | 50 ++ www/vendor/composer/installed.php | 32 + www/vendor/composer/platform_check.php | 26 + .../glenscott/url-normalizer/.gitignore | 1 + www/vendor/glenscott/url-normalizer/LICENSE | 7 + www/vendor/glenscott/url-normalizer/README.md | 51 ++ .../glenscott/url-normalizer/composer.json | 20 + .../url-normalizer/src/URL/Normalizer.php | 389 ++++++++++++ .../glenscott/url-normalizer/test-client.php | 84 +++ .../tests/URL/NormalizerTest.php | 320 ++++++++++ 23 files changed, 2165 insertions(+) create mode 100644 composer.json create mode 100644 composer.lock create mode 100755 docker-php-composer-setup.sh create mode 100755 php-composer-setup.sh create mode 100644 www/vendor/autoload.php create mode 100644 www/vendor/composer/ClassLoader.php create mode 100644 www/vendor/composer/InstalledVersions.php create mode 100644 www/vendor/composer/LICENSE create mode 100644 www/vendor/composer/autoload_classmap.php create mode 100644 www/vendor/composer/autoload_namespaces.php create mode 100644 www/vendor/composer/autoload_psr4.php create mode 100644 www/vendor/composer/autoload_real.php create mode 100644 www/vendor/composer/autoload_static.php create mode 100644 www/vendor/composer/installed.json create mode 100644 www/vendor/composer/installed.php create mode 100644 www/vendor/composer/platform_check.php create mode 100644 www/vendor/glenscott/url-normalizer/.gitignore create mode 100644 www/vendor/glenscott/url-normalizer/LICENSE create mode 100644 www/vendor/glenscott/url-normalizer/README.md create mode 100644 www/vendor/glenscott/url-normalizer/composer.json create mode 100755 www/vendor/glenscott/url-normalizer/src/URL/Normalizer.php create mode 100644 www/vendor/glenscott/url-normalizer/test-client.php create mode 100644 www/vendor/glenscott/url-normalizer/tests/URL/NormalizerTest.php diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..13735fbd --- /dev/null +++ b/composer.json @@ -0,0 +1,5 @@ +{ + "require": { + "glenscott/url-normalizer": "^1.4" + } +} diff --git a/composer.lock b/composer.lock new file mode 100644 index 00000000..45e3bb94 --- /dev/null +++ b/composer.lock @@ -0,0 +1,60 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "5d2ff3627508b7f98794b355aedc2d22", + "packages": [ + { + "name": "glenscott/url-normalizer", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/glenscott/url-normalizer.git", + "reference": "b8e79d3360a1bd7182398c9956bd74d219ad1b3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/glenscott/url-normalizer/zipball/b8e79d3360a1bd7182398c9956bd74d219ad1b3c", + "reference": "b8e79d3360a1bd7182398c9956bd74d219ad1b3c", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "URL\\": "src/URL" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Glen Scott", + "email": "glen@glenscott.co.uk" + } + ], + "description": "Syntax based normalization of URL's", + "support": { + "issues": "https://github.com/glenscott/url-normalizer/issues", + "source": "https://github.com/glenscott/url-normalizer/tree/master" + }, + "time": "2015-06-11T16:06:02+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/docker-php-composer-setup.sh b/docker-php-composer-setup.sh new file mode 100755 index 00000000..b5ff05a2 --- /dev/null +++ b/docker-php-composer-setup.sh @@ -0,0 +1,10 @@ +#!/bin/bash -ex + +cp ./php-composer-setup.sh www +cp ./composer.json www +cp ./composer.lock www +docker compose exec --privileged web bash ./php-composer-setup.sh +docker compose exec --privileged web bash +rm www/php-composer-setup.sh +mv www/composer.json . +mv www/composer.lock . diff --git a/php-composer-setup.sh b/php-composer-setup.sh new file mode 100755 index 00000000..d554526d --- /dev/null +++ b/php-composer-setup.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +apt-get install -y p7zip-full + +# https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md +# this gets run in the image by docker-php-composer-setup.sh + +EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" +php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" +ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" + +if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ] +then + >&2 echo 'ERROR: Invalid installer checksum' + rm composer-setup.php + exit 1 +fi + +php composer-setup.php +RESULT=$? +rm composer-setup.php +mv composer.phar /usr/local/bin/composer +exit $RESULT \ No newline at end of file diff --git a/www/vendor/autoload.php b/www/vendor/autoload.php new file mode 100644 index 00000000..409f3c5c --- /dev/null +++ b/www/vendor/autoload.php @@ -0,0 +1,25 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Autoload; + +/** + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. + * + * $loader = new \Composer\Autoload\ClassLoader(); + * + * // register classes with namespaces + * $loader->add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier + * @author Jordi Boggiano + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ + */ +class ClassLoader +{ + /** @var \Closure(string):void */ + private static $includeFile; + + /** @var string|null */ + private $vendorDir; + + // PSR-4 + /** + * @var array> + */ + private $prefixLengthsPsr4 = array(); + /** + * @var array> + */ + private $prefixDirsPsr4 = array(); + /** + * @var list + */ + private $fallbackDirsPsr4 = array(); + + // PSR-0 + /** + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array>> + */ + private $prefixesPsr0 = array(); + /** + * @var list + */ + private $fallbackDirsPsr0 = array(); + + /** @var bool */ + private $useIncludePath = false; + + /** + * @var array + */ + private $classMap = array(); + + /** @var bool */ + private $classMapAuthoritative = false; + + /** + * @var array + */ + private $missingClasses = array(); + + /** @var string|null */ + private $apcuPrefix; + + /** + * @var array + */ + private static $registeredLoaders = array(); + + /** + * @param string|null $vendorDir + */ + public function __construct($vendorDir = null) + { + $this->vendorDir = $vendorDir; + self::initializeIncludeClosure(); + } + + /** + * @return array> + */ + public function getPrefixes() + { + if (!empty($this->prefixesPsr0)) { + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); + } + + return array(); + } + + /** + * @return array> + */ + public function getPrefixesPsr4() + { + return $this->prefixDirsPsr4; + } + + /** + * @return list + */ + public function getFallbackDirs() + { + return $this->fallbackDirsPsr0; + } + + /** + * @return list + */ + public function getFallbackDirsPsr4() + { + return $this->fallbackDirsPsr4; + } + + /** + * @return array Array of classname => path + */ + public function getClassMap() + { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + * + * @return void + */ + public function addClassMap(array $classMap) + { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + * + * @return void + */ + public function add($prefix, $paths, $prepend = false) + { + $paths = (array) $paths; + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + $paths, + $this->fallbackDirsPsr0 + ); + } else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function addPsr4($prefix, $paths, $prepend = false) + { + $paths = (array) $paths; + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + $paths, + $this->fallbackDirsPsr4 + ); + } else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + $paths + ); + } + } elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $paths, + $this->prefixDirsPsr4[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 base directories + * + * @return void + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function setPsr4($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + * + * @return void + */ + public function setUseIncludePath($useIncludePath) + { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() + { + return $this->useIncludePath; + } + + /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoritative + * + * @return void + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = $classMapAuthoritative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function isClassMapAuthoritative() + { + return $this->classMapAuthoritative; + } + + /** + * APCu prefix to use to cache found/not-found classes, if the extension is enabled. + * + * @param string|null $apcuPrefix + * + * @return void + */ + public function setApcuPrefix($apcuPrefix) + { + $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; + } + + /** + * The APCu prefix in use, or null if APCu caching is not enabled. + * + * @return string|null + */ + public function getApcuPrefix() + { + return $this->apcuPrefix; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + * + * @return void + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + + if (null === $this->vendorDir) { + return; + } + + if ($prepend) { + self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; + } else { + unset(self::$registeredLoaders[$this->vendorDir]); + self::$registeredLoaders[$this->vendorDir] = $this; + } + } + + /** + * Unregisters this instance as an autoloader. + * + * @return void + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + + if (null !== $this->vendorDir) { + unset(self::$registeredLoaders[$this->vendorDir]); + } + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return true|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + $includeFile = self::$includeFile; + $includeFile($file); + + return true; + } + + return null; + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { + return false; + } + if (null !== $this->apcuPrefix) { + $file = apcu_fetch($this->apcuPrefix.$class, $hit); + if ($hit) { + return $file; + } + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if (false === $file && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if (null !== $this->apcuPrefix) { + apcu_add($this->apcuPrefix.$class, $file); + } + + if (false === $file) { + // Remember that this class does not exist. + $this->missingClasses[$class] = true; + } + + return $file; + } + + /** + * Returns the currently registered loaders keyed by their corresponding vendor directories. + * + * @return array + */ + public static function getRegisteredLoaders() + { + return self::$registeredLoaders; + } + + /** + * @param string $class + * @param string $ext + * @return string|false + */ + private function findFileWithExtension($class, $ext) + { + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengthsPsr4[$first])) { + $subPath = $class; + while (false !== $lastPos = strrpos($subPath, '\\')) { + $subPath = substr($subPath, 0, $lastPos); + $search = $subPath . '\\'; + if (isset($this->prefixDirsPsr4[$search])) { + $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); + foreach ($this->prefixDirsPsr4[$search] as $dir) { + if (file_exists($file = $dir . $pathEnd)) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); + } else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + + return false; + } + + /** + * @return void + */ + private static function initializeIncludeClosure() + { + if (self::$includeFile !== null) { + return; + } + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file + * @return void + */ + self::$includeFile = \Closure::bind(static function($file) { + include $file; + }, null, null); + } +} diff --git a/www/vendor/composer/InstalledVersions.php b/www/vendor/composer/InstalledVersions.php new file mode 100644 index 00000000..51e734a7 --- /dev/null +++ b/www/vendor/composer/InstalledVersions.php @@ -0,0 +1,359 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer; + +use Composer\Autoload\ClassLoader; +use Composer\Semver\VersionParser; + +/** + * This class is copied in every Composer installed project and available to all + * + * See also https://getcomposer.org/doc/07-runtime.md#installed-versions + * + * To require its presence, you can require `composer-runtime-api ^2.0` + * + * @final + */ +class InstalledVersions +{ + /** + * @var mixed[]|null + * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null + */ + private static $installed; + + /** + * @var bool|null + */ + private static $canGetVendors; + + /** + * @var array[] + * @psalm-var array}> + */ + private static $installedByVendor = array(); + + /** + * Returns a list of all package names which are present, either by being installed, replaced or provided + * + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackages() + { + $packages = array(); + foreach (self::getInstalled() as $installed) { + $packages[] = array_keys($installed['versions']); + } + + if (1 === \count($packages)) { + return $packages[0]; + } + + return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); + } + + /** + * Returns a list of all package names with a specific type e.g. 'library' + * + * @param string $type + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackagesByType($type) + { + $packagesByType = array(); + + foreach (self::getInstalled() as $installed) { + foreach ($installed['versions'] as $name => $package) { + if (isset($package['type']) && $package['type'] === $type) { + $packagesByType[] = $name; + } + } + } + + return $packagesByType; + } + + /** + * Checks whether the given package is installed + * + * This also returns true if the package name is provided or replaced by another package + * + * @param string $packageName + * @param bool $includeDevRequirements + * @return bool + */ + public static function isInstalled($packageName, $includeDevRequirements = true) + { + foreach (self::getInstalled() as $installed) { + if (isset($installed['versions'][$packageName])) { + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; + } + } + + return false; + } + + /** + * Checks whether the given package satisfies a version constraint + * + * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call: + * + * Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3') + * + * @param VersionParser $parser Install composer/semver to have access to this class and functionality + * @param string $packageName + * @param string|null $constraint A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package + * @return bool + */ + public static function satisfies(VersionParser $parser, $packageName, $constraint) + { + $constraint = $parser->parseConstraints((string) $constraint); + $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + + return $provided->matches($constraint); + } + + /** + * Returns a version constraint representing all the range(s) which are installed for a given package + * + * It is easier to use this via isInstalled() with the $constraint argument if you need to check + * whether a given version of a package is installed, and not just whether it exists + * + * @param string $packageName + * @return string Version constraint usable with composer/semver + */ + public static function getVersionRanges($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + $ranges = array(); + if (isset($installed['versions'][$packageName]['pretty_version'])) { + $ranges[] = $installed['versions'][$packageName]['pretty_version']; + } + if (array_key_exists('aliases', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); + } + if (array_key_exists('replaced', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); + } + if (array_key_exists('provided', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); + } + + return implode(' || ', $ranges); + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['version'])) { + return null; + } + + return $installed['versions'][$packageName]['version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getPrettyVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['pretty_version'])) { + return null; + } + + return $installed['versions'][$packageName]['pretty_version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference + */ + public static function getReference($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['reference'])) { + return null; + } + + return $installed['versions'][$packageName]['reference']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path. + */ + public static function getInstallPath($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @return array + * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool} + */ + public static function getRootPackage() + { + $installed = self::getInstalled(); + + return $installed[0]['root']; + } + + /** + * Returns the raw installed.php data for custom implementations + * + * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. + * @return array[] + * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} + */ + public static function getRawData() + { + @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + + return self::$installed; + } + + /** + * Returns the raw data of all installed.php which are currently loaded for custom implementations + * + * @return array[] + * @psalm-return list}> + */ + public static function getAllRawData() + { + return self::getInstalled(); + } + + /** + * Lets you reload the static array from another file + * + * This is only useful for complex integrations in which a project needs to use + * this class but then also needs to execute another project's autoloader in process, + * and wants to ensure both projects have access to their version of installed.php. + * + * A typical case would be PHPUnit, where it would need to make sure it reads all + * the data it needs from this class, then call reload() with + * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure + * the project in which it runs can then also use this class safely, without + * interference between PHPUnit's dependencies and the project's dependencies. + * + * @param array[] $data A vendor/composer/installed.php data set + * @return void + * + * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $data + */ + public static function reload($data) + { + self::$installed = $data; + self::$installedByVendor = array(); + } + + /** + * @return array[] + * @psalm-return list}> + */ + private static function getInstalled() + { + if (null === self::$canGetVendors) { + self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); + } + + $installed = array(); + + if (self::$canGetVendors) { + foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + if (isset(self::$installedByVendor[$vendorDir])) { + $installed[] = self::$installedByVendor[$vendorDir]; + } elseif (is_file($vendorDir.'/composer/installed.php')) { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require $vendorDir.'/composer/installed.php'; + $installed[] = self::$installedByVendor[$vendorDir] = $required; + if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { + self::$installed = $installed[count($installed) - 1]; + } + } + } + } + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; + } else { + self::$installed = array(); + } + } + + if (self::$installed !== array()) { + $installed[] = self::$installed; + } + + return $installed; + } +} diff --git a/www/vendor/composer/LICENSE b/www/vendor/composer/LICENSE new file mode 100644 index 00000000..f27399a0 --- /dev/null +++ b/www/vendor/composer/LICENSE @@ -0,0 +1,21 @@ + +Copyright (c) Nils Adermann, Jordi Boggiano + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/www/vendor/composer/autoload_classmap.php b/www/vendor/composer/autoload_classmap.php new file mode 100644 index 00000000..0fb0a2c1 --- /dev/null +++ b/www/vendor/composer/autoload_classmap.php @@ -0,0 +1,10 @@ + $vendorDir . '/composer/InstalledVersions.php', +); diff --git a/www/vendor/composer/autoload_namespaces.php b/www/vendor/composer/autoload_namespaces.php new file mode 100644 index 00000000..15a2ff3a --- /dev/null +++ b/www/vendor/composer/autoload_namespaces.php @@ -0,0 +1,9 @@ + array($vendorDir . '/glenscott/url-normalizer/src/URL'), +); diff --git a/www/vendor/composer/autoload_real.php b/www/vendor/composer/autoload_real.php new file mode 100644 index 00000000..a51417eb --- /dev/null +++ b/www/vendor/composer/autoload_real.php @@ -0,0 +1,38 @@ +register(true); + + return $loader; + } +} diff --git a/www/vendor/composer/autoload_static.php b/www/vendor/composer/autoload_static.php new file mode 100644 index 00000000..330bbe64 --- /dev/null +++ b/www/vendor/composer/autoload_static.php @@ -0,0 +1,36 @@ + + array ( + 'URL\\' => 4, + ), + ); + + public static $prefixDirsPsr4 = array ( + 'URL\\' => + array ( + 0 => __DIR__ . '/..' . '/glenscott/url-normalizer/src/URL', + ), + ); + + public static $classMap = array ( + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', + ); + + public static function getInitializer(ClassLoader $loader) + { + return \Closure::bind(function () use ($loader) { + $loader->prefixLengthsPsr4 = ComposerStaticInit12212f8390cfa485f99929bb7a8f0797::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit12212f8390cfa485f99929bb7a8f0797::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit12212f8390cfa485f99929bb7a8f0797::$classMap; + + }, null, ClassLoader::class); + } +} diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json new file mode 100644 index 00000000..24edf940 --- /dev/null +++ b/www/vendor/composer/installed.json @@ -0,0 +1,50 @@ +{ + "packages": [ + { + "name": "glenscott/url-normalizer", + "version": "1.4.0", + "version_normalized": "1.4.0.0", + "source": { + "type": "git", + "url": "https://github.com/glenscott/url-normalizer.git", + "reference": "b8e79d3360a1bd7182398c9956bd74d219ad1b3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/glenscott/url-normalizer/zipball/b8e79d3360a1bd7182398c9956bd74d219ad1b3c", + "reference": "b8e79d3360a1bd7182398c9956bd74d219ad1b3c", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "time": "2015-06-11T16:06:02+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "URL\\": "src/URL" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Glen Scott", + "email": "glen@glenscott.co.uk" + } + ], + "description": "Syntax based normalization of URL's", + "support": { + "issues": "https://github.com/glenscott/url-normalizer/issues", + "source": "https://github.com/glenscott/url-normalizer/tree/master" + }, + "install-path": "../glenscott/url-normalizer" + } + ], + "dev": true, + "dev-package-names": [] +} diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php new file mode 100644 index 00000000..9f873fcd --- /dev/null +++ b/www/vendor/composer/installed.php @@ -0,0 +1,32 @@ + array( + 'name' => '__root__', + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, + 'type' => 'library', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'dev' => true, + ), + 'versions' => array( + '__root__' => array( + 'pretty_version' => '1.0.0+no-version-set', + 'version' => '1.0.0.0', + 'reference' => null, + 'type' => 'library', + 'install_path' => __DIR__ . '/../../', + 'aliases' => array(), + 'dev_requirement' => false, + ), + 'glenscott/url-normalizer' => array( + 'pretty_version' => '1.4.0', + 'version' => '1.4.0.0', + 'reference' => 'b8e79d3360a1bd7182398c9956bd74d219ad1b3c', + 'type' => 'library', + 'install_path' => __DIR__ . '/../glenscott/url-normalizer', + 'aliases' => array(), + 'dev_requirement' => false, + ), + ), +); diff --git a/www/vendor/composer/platform_check.php b/www/vendor/composer/platform_check.php new file mode 100644 index 00000000..7621d4ff --- /dev/null +++ b/www/vendor/composer/platform_check.php @@ -0,0 +1,26 @@ += 50300)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 5.3.0". You are running ' . PHP_VERSION . '.'; +} + +if ($issues) { + if (!headers_sent()) { + header('HTTP/1.1 500 Internal Server Error'); + } + if (!ini_get('display_errors')) { + if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { + fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); + } elseif (!headers_sent()) { + echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; + } + } + trigger_error( + 'Composer detected issues in your platform: ' . implode(' ', $issues), + E_USER_ERROR + ); +} diff --git a/www/vendor/glenscott/url-normalizer/.gitignore b/www/vendor/glenscott/url-normalizer/.gitignore new file mode 100644 index 00000000..57872d0f --- /dev/null +++ b/www/vendor/glenscott/url-normalizer/.gitignore @@ -0,0 +1 @@ +/vendor/ diff --git a/www/vendor/glenscott/url-normalizer/LICENSE b/www/vendor/glenscott/url-normalizer/LICENSE new file mode 100644 index 00000000..c0c6a77f --- /dev/null +++ b/www/vendor/glenscott/url-normalizer/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2013 Glen Scott + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/www/vendor/glenscott/url-normalizer/README.md b/www/vendor/glenscott/url-normalizer/README.md new file mode 100644 index 00000000..e203fa81 --- /dev/null +++ b/www/vendor/glenscott/url-normalizer/README.md @@ -0,0 +1,51 @@ + +# Syntax based normalization of URI's + +This normalizes URI's based on the specification RFC 3986 +https://tools.ietf.org/html/rfc3986 + +Example usage: + + require_once 'vendor/autoload.php'; + + $url = 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d'; + $un = new URL\Normalizer( $url ); + echo $un->normalize(); + + // result: "example://a/b/c/%7Bfoo%7D" + +The normalization process preserves semantics so, for example, the following URL's are all equivalent: + +HTTP://www.Example.com/ and http://www.example.com/ +http://www.example.com/a%c2%b1b and http://www.example.com/a%C2%B1b +http://www.example.com/%7Eusername/ and http://www.example.com/~username/ +http://www.example.com and http://www.example.com/ +http://www.example.com:80/bar.html and http://www.example.com/bar.html +http://www.example.com/../a/b/../c/./d.html and http://www.example.com/a/c/d.html +http://www.example.com/?array[key]=value and http://www.example.com/?array%5Bkey%5D=value + +The following normalizations are performed: + +1. Converting the scheme and host to lower case +2. Capitalizing letters in escape sequences +3. Decoding percent-encoded octets of unreserved characters +4. Adding trailing / +5. Removing the default port +6. Removing dot-segments + +For more information about these normalizations, please see the following Wikipedia article: + +http://en.wikipedia.org/wiki/URL_normalization#Normalizations_that_Preserve_Semantics + +For license information, please see LICENSE file. + +## Options + +Two options are available when normalizing URLs which are disabled by default: + +1. Remove empty delimiters. Enabling this option would normalize http://www.example.com/? to http://www.example.com/ Currently, only the query string delimiter (?) is supported by this option. +2. Sort query parameters. Enabling this option sorts the query parameters by key alphabetically. For example, http://www.example.com/?c=3&b=2&a=1 becomes http://www.example.com/?a=1&b=2&c=3 + +## TODO + +Add further scheme-based normalization steps, as detailed in section 6.2.3 of the RFC. diff --git a/www/vendor/glenscott/url-normalizer/composer.json b/www/vendor/glenscott/url-normalizer/composer.json new file mode 100644 index 00000000..5fe9c83b --- /dev/null +++ b/www/vendor/glenscott/url-normalizer/composer.json @@ -0,0 +1,20 @@ +{ + "name": "glenscott/url-normalizer", + "description": "Syntax based normalization of URL's", + "license": "MIT", + "authors": [ + { + "name": "Glen Scott", + "email": "glen@glenscott.co.uk" + } + ], + "require": { + "php": ">=5.3.0", + "ext-mbstring": "*" + }, + "autoload": { + "psr-4": { + "URL\\" : "src/URL" + } + } +} diff --git a/www/vendor/glenscott/url-normalizer/src/URL/Normalizer.php b/www/vendor/glenscott/url-normalizer/src/URL/Normalizer.php new file mode 100755 index 00000000..354d4ca9 --- /dev/null +++ b/www/vendor/glenscott/url-normalizer/src/URL/Normalizer.php @@ -0,0 +1,389 @@ + + * require_once 'Normalizer.php'; + * + * $url = 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d'; + * $un = new URLNormalizer(); + * $un->setUrl( $url ); + * echo $un->normalize(); + * + * // result: "example://a/b/c/%7Bfoo%7D" + * + * + * @author Glen Scott + */ +class Normalizer +{ + private $url; + private $scheme; + private $host; + private $port; + private $user; + private $pass; + private $path; + private $query; + private $fragment; + private $default_scheme_ports = array( 'http:' => 80, 'https:' => 443, ); + private $components = array( 'scheme', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment', ); + private $remove_empty_delimiters; + private $sort_query_params; + + /** + * Does the original URL have a ? query delimiter + */ + private $query_delimiter; + + public function __construct($url = null, $remove_empty_delimiters = false, $sort_query_params = false) + { + if ($url) { + $this->setUrl($url); + } + + $this->remove_empty_delimiters = $remove_empty_delimiters; + $this->sort_query_params = $sort_query_params; + } + + private function getQuery($query) + { + $qs = array(); + foreach ($query as $qk => $qv) { + if (is_array($qv)) { + $qs[rawurldecode($qk)] = $this->getQuery($qv); + } else { + $qs[rawurldecode($qk)] = rawurldecode($qv); + } + } + return $qs; + } + + public function getUrl() + { + return $this->url; + } + + public function setUrl($url) + { + $this->url = $url; + + if (strpos($this->url, '?') !== false) { + $this->query_delimiter = true; + } else { + $this->query_delimiter = false; + } + + // parse URL into respective parts + $url_components = $this->mbParseUrl($this->url); + + if (! $url_components) { + // Reset URL + $this->url = ''; + + // Flush properties + foreach ($this->components as $key) { + if (property_exists($this, $key)) { + $this->$key = ''; + } + } + + return false; + } else { + // Update properties + foreach ($url_components as $key => $value) { + if (property_exists($this, $key)) { + $this->$key = $value; + } + } + + // Flush missing components + $missing_components = array_diff( + array_values($this->components), + array_keys($url_components) + ); + + foreach ($missing_components as $key) { + if (property_exists($this, $key)) { + $this->$key = ''; + } + } + + return true; + } + } + + public function normalize() + { + + // URI Syntax Components + // scheme authority path query fragment + // @link https://tools.ietf.org/html/rfc3986#section-3 + + // Scheme + // @link https://tools.ietf.org/html/rfc3986#section-3.1 + + if ($this->scheme) { + // Converting the scheme to lower case + $this->scheme = strtolower($this->scheme) . ':'; + } + + // Authority + // @link https://tools.ietf.org/html/rfc3986#section-3.2 + + $authority = ''; + if ($this->host) { + $authority .= '//'; + + // User Information + // @link https://tools.ietf.org/html/rfc3986#section-3.2.1 + + if ($this->user) { + if ($this->pass) { + $authority .= $this->user . ':' . $this->pass . '@'; + } else { + $authority .= $this->user . '@'; + } + } + + // Host + // @link https://tools.ietf.org/html/rfc3986#section-3.2.2 + + // Converting the host to lower case + if (mb_detect_encoding($this->host) == 'UTF-8') { + $authority .= mb_strtolower($this->host, 'UTF-8'); + } else { + $authority .= strtolower($this->host); + } + + // Port + // @link https://tools.ietf.org/html/rfc3986#section-3.2.3 + + // Removing the default port + if (isset($this->default_scheme_ports[$this->scheme] ) + && $this->port == $this->default_scheme_ports[$this->scheme]) { + $this->port = ''; + } + + if ($this->port) { + $authority .= ':' . $this->port; + } + } + + // Path + // @link https://tools.ietf.org/html/rfc3986#section-3.3 + + if ($this->path) { + $this->path = $this->removeAdditionalPathPrefixSlashes($this->path); + $this->path = $this->removeDotSegments($this->path); + $this->path = $this->urlDecodeUnreservedChars($this->path); + $this->path = $this->urlDecodeReservedSubDelimChars($this->path); + } elseif ($this->url) { + // Add default path only when valid URL is present + // Adding trailing / + $this->path = '/'; + } + + // Query + // @link https://tools.ietf.org/html/rfc3986#section-3.4 + + if ($this->query) { + $query = $this->parseStr($this->query); + + //encodes every parameter correctly + $qs = $this->getQuery($query); + + $this->query = '?'; + + if ($this->sort_query_params) { + ksort($qs); + } + + foreach ($qs as $key => $val) { + if (strlen($this->query) > 1) { + $this->query .= '&'; + } + + if (is_array($val)) { + for ($i = 0; $i < count($val); $i++) { + if ($i > 0) { + $this->query .= '&'; + } + $this->query .= rawurlencode($key) . '=' . rawurlencode($val[$i]); + } + } else { + $this->query .= rawurlencode($key) . '=' . rawurlencode($val); + } + } + + // Fix http_build_query adding equals sign to empty keys + $this->query = str_replace('=&', '&', rtrim($this->query, '=')); + } else { + if ($this->query_delimiter && ! $this->remove_empty_delimiters) { + $this->query = '?'; + } + } + + // Fragment + // @link https://tools.ietf.org/html/rfc3986#section-3.5 + + if ($this->fragment) { + $this->fragment = rawurldecode($this->fragment); + $this->fragment = rawurlencode($this->fragment); + $this->fragment = '#' . $this->fragment; + } + + $this->setUrl($this->scheme . $authority . $this->path . $this->query . $this->fragment); + + return $this->getUrl(); + } + + /** + * Path segment normalization + * https://tools.ietf.org/html/rfc3986#section-5.2.4 + */ + public function removeDotSegments($path) + { + $new_path = ''; + + while (! empty($path)) { + // A + $pattern_a = '!^(\.\./|\./)!x'; + $pattern_b_1 = '!^(/\./)!x'; + $pattern_b_2 = '!^(/\.)$!x'; + $pattern_c = '!^(/\.\./|/\.\.)!x'; + $pattern_d = '!^(\.|\.\.)$!x'; + $pattern_e = '!(/*[^/]*)!x'; + + if (preg_match($pattern_a, $path)) { + // remove prefix from $path + $path = preg_replace($pattern_a, '', $path); + } elseif (preg_match($pattern_b_1, $path, $matches) || preg_match($pattern_b_2, $path, $matches)) { + $path = preg_replace("!^" . $matches[1] . "!", '/', $path); + } elseif (preg_match($pattern_c, $path, $matches)) { + $path = preg_replace('!^' . preg_quote($matches[1], '!') . '!x', '/', $path); + + // remove the last segment and its preceding "/" (if any) from output buffer + $new_path = preg_replace('!/([^/]+)$!x', '', $new_path); + } elseif (preg_match($pattern_d, $path)) { + $path = preg_replace($pattern_d, '', $path); + } else { + if (preg_match($pattern_e, $path, $matches)) { + $first_path_segment = $matches[1]; + + $path = preg_replace('/^' . preg_quote($first_path_segment, '/') . '/', '', $path, 1); + + $new_path .= $first_path_segment; + } + } + } + + return $new_path; + } + + public function getScheme() + { + return $this->scheme; + } + + /** + * Decode unreserved characters + * + * @link https://tools.ietf.org/html/rfc3986#section-2.3 + */ + public function urlDecodeUnreservedChars($string) + { + $string = rawurldecode($string); + $string = rawurlencode($string); + $string = str_replace(array( '%2F', '%3A', '%40' ), array( '/', ':', '@' ), $string); + + return $string; + } + + /** + * Decode reserved sub-delims + * + * @link https://tools.ietf.org/html/rfc3986#section-2.2 + */ + public function urlDecodeReservedSubDelimChars($string) + { + return str_replace( + array( '%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C', '%3B', '%3D' ), + array( '!', '$', '&', "'", '(', ')', '*', '+', ',', ';', '=' ), + $string + ); + } + + /** + * Replacement for PHP's parse_string which does not deal with spaces or dots in key names + * + * @param string $string URL query string + * @return array key value pairs + */ + private function parseStr($string) + { + $params = array(); + + $pairs = explode('&', $string); + + foreach ($pairs as $pair) { + if (! $pair) { + continue; + } + + $var = explode('=', $pair, 2); + $val = ( isset( $var[1] ) ? $var[1] : '' ); + + if (isset($params[$var[0]])) { + if (is_array($params[$var[0]])) { + $params[$var[0]][] = $val; + } else { + $params[$var[0]] = array($params[$var[0]], $val); + } + } else { + $params[$var[0]] = $val; + } + } + + return $params; + } + + private function mbParseUrl($url) + { + $result = false; + + // Build arrays of values we need to decode before parsing + $entities = array('%21', '%2A', '%27', '%28', '%29', '%3B', '%3A', '%40', '%26', '%3D', '%24', '%2C', '%2F', '%3F', '%23', '%5B', '%5D'); + $replacements = array('!', '*', "'", "(", ")", ";", ":", "@", "&", "=", "$", ",", "/", "?", "#", "[", "]"); + + // Create encoded URL with special URL characters decoded so it can be parsed + // All other characters will be encoded + $encodedURL = str_replace($entities, $replacements, urlencode($url)); + + // Parse the encoded URL + $encodedParts = parse_url($encodedURL); + + // Now, decode each value of the resulting array + if ($encodedParts) { + foreach ($encodedParts as $key => $value) { + $result[$key] = urldecode(str_replace($replacements, $entities, $value)); + } + } + return $result; + } + + /* + * Converts ////foo to /foo within each path segment + */ + private function removeAdditionalPathPrefixSlashes($path) + { + return preg_replace('/(\/)+/', '/', $path); + } +} diff --git a/www/vendor/glenscott/url-normalizer/test-client.php b/www/vendor/glenscott/url-normalizer/test-client.php new file mode 100644 index 00000000..3091a540 --- /dev/null +++ b/www/vendor/glenscott/url-normalizer/test-client.php @@ -0,0 +1,84 @@ +'; + +require_once 'src/URL/Normalizer.php'; + +$un = new URL\Normalizer(); + +test('eXAMPLE://a/./b/../b/%63/%7bfoo%7d', 'example://a/b/c/%7Bfoo%7D'); +test('http://www.example.com', 'http://www.example.com/'); +test('http://www.yahoo.com/%a1', 'http://www.yahoo.com/%A1'); + +test('HTTP://www.Example.com/', 'http://www.example.com/'); +test('http://www.example.com/a%c2%b1b', 'http://www.example.com/a%C2%B1b'); +test('http://www.example.com/%7Eusername/', 'http://www.example.com/~username/'); +test('http://www.example.com:80/bar.html', 'http://www.example.com/bar.html'); + +test('http://www.example.com/../a/b/../c/./d.html', 'http://www.example.com/a/c/d.html'); +test('../', '' ); +test('./', '' ); +test('/./', '/' ); +test('/.', '/' ); +test('/a/b/c/./../../g', '/a/g' ); +test('mid/content=5/../6', 'mid/6' ); +test('/foo/bar/.', '/foo/bar/' ); +test('/foo/bar/./', '/foo/bar/' ); +test('/foo/bar/..', '/foo/' ); +test('/foo/bar/../', '/foo/' ); +test('/foo/bar/../baz', '/foo/baz' ); +test('/foo/bar/../..', '/'); +test('/foo/bar/../../' , '/'); +test('/foo/bar/../../baz' , '/baz'); +//test('/foo/bar/../../../baz' , '/../baz'); +test('a/./b/../b/', 'a/b/' ); +test('.', '' ); +test('..', '' ); + +test('%63', 'c'); +test('%63/%7b', 'c/%7B'); + +test('http://example.com', 'http://example.com/'); +test('http://example.com/', 'http://example.com/'); +test('http://example.com:/', 'http://example.com/'); +test('http://example.com:80/', 'http://example.com/'); + +test('https://example.com', 'https://example.com/'); +test('https://example.com/', 'https://example.com/'); +test('https://example.com:/', 'https://example.com/'); +test('https://example.com:443/', 'https://example.com/'); + +test('http://fancysite.nl/links/doit.pl?id=2029', 'http://fancysite.nl/links/doit.pl?id=2029'); +test('http://example.com/index.html#fragment', 'http://example.com/index.html#fragment'); +test('http://example.com:81/index.html', 'http://example.com:81/index.html'); +test('HtTp://User:Pass@www.ExAmPle.com:80/Blah', 'http://User:Pass@www.example.com/Blah'); +test('/test:2/', ''); +test('mailto:mail@example.com', 'mailto:mail@example.com'); +test('http://user@example.com/', 'http://user@example.com/'); +test('http://example.com/path/?query#fragment', 'http://example.com/path/?query#fragment'); +test('http://example.com/path/?q1&q2&q3&q4', 'http://example.com/path/?q1&q2&q3&q4'); +test('http://example.com:400/', 'http://example.com:400/'); +test('http://example.com/', 'http://example.com/'); + +test('http://example.com/path/?query=space value', 'http://example.com/path/?query=space%20value'); + +test('http://www.example.com/?array[key]=value', 'http://www.example.com/?array%5Bkey%5D=value'); + +/** + * Test URL Normalization + * + * @param string $input URL to normalize + * @param string $expected Anticipated result of normalization + * @return void + * @author emojka + **/ +function test($input, $expected) { + global $un; + $un->setUrl($input); + $result = $un->normalize(); + if ($result === $expected) { + printf("✔ %s → %s\n", $input, $result); + } else { + printf("%s ✘ %s → %s\n", $expected, $input, $result); + } +} diff --git a/www/vendor/glenscott/url-normalizer/tests/URL/NormalizerTest.php b/www/vendor/glenscott/url-normalizer/tests/URL/NormalizerTest.php new file mode 100644 index 00000000..825e3333 --- /dev/null +++ b/www/vendor/glenscott/url-normalizer/tests/URL/NormalizerTest.php @@ -0,0 +1,320 @@ +fixture = new Normalizer(); + } + + public function testClassCanBeInstantiated() { + $this->assertTrue( is_object( $this->fixture ) ); + } + + public function testObjectIsOfCorrectType() { + $this->assertTrue( get_class( $this->fixture ) == 'URL\Normalizer' ); + } + + public function testObjectHasGetUrlMethod() { + $this->assertTrue( method_exists( $this->fixture, 'getUrl' ) ); + } + + public function testSetUrlFromConstructor() { + $this->fixture = new Normalizer( 'http://www.example.com/' ); + $this->assertTrue( $this->fixture->getUrl() == 'http://www.example.com/' ); + } + + public function testSetUrl() { + $this->fixture->setUrl( $this->test_url ); + $this->assertTrue( $this->fixture->getUrl() == $this->test_url ); + } + + public function testObjectHasGetSchemeMethod() { + $this->assertTrue( method_exists( $this->fixture, 'getScheme' ) ); + } + + public function testSchemeExtractedFromUrl() { + $this->fixture->setUrl( $this->test_url ); + $this->assertTrue( $this->fixture->getScheme() == 'http' ); + } + + /** + * @dataProvider provider + */ + public function testUrlsAreNormalised( $url, $normalised_url ) { + $this->fixture->setUrl( $url ); + + $this->assertEquals( $normalised_url, $this->fixture->normalize() ); + } + + /** + * @dataProvider provider + */ + public function testUrlsAreNormalisedAgain( $url, $normalised_url ) { + $this->fixture->setUrl( $url ); + + // normalize once + $this->fixture->normalize(); + + // then normalize again + $this->assertEquals( $normalised_url, $this->fixture->normalize() ); + } + + public function provider() { + // tests from http://en.wikipedia.org/wiki/URL_normalization#Normalizations_that_Preserve_Semantics + return array( + array( 'HTTP://www.Example.com/', 'http://www.example.com/' ), + array( 'http://www.example.com/a%c2%b1b', 'http://www.example.com/a%C2%B1b' ), + array( 'http://www.example.com/%7Eusername/', 'http://www.example.com/~username/' ), + array( 'http://www.example.com', 'http://www.example.com/' ), + array( 'http://www.example.com:80/bar.html', 'http://www.example.com/bar.html' ), + array( 'http://www.example.com/../a/b/../c/./d.html', 'http://www.example.com/a/c/d.html' ), + array( 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d', 'example://a/b/c/%7Bfoo%7D' ), + ); + } + + public function testCaseIsNormalization() { + $this->fixture->setUrl( 'http://www.yahoo.com/%a1' ); + $this->assertEquals( 'http://www.yahoo.com/%A1', $this->fixture->normalize() ); + } + + /** + * @dataProvider dotSegmentProvider + * + * https://tools.ietf.org/html/rfc3986#section-5.2.4 + */ + public function testRemoveDotSegments( $path, $normalised_path ) { + $this->assertEquals( $normalised_path, $this->fixture->removeDotSegments( $path ) ); + } + + public function dotSegmentProvider() { + return array( + array( '../', '' ), + array( './', '' ), + array( '/./', '/' ), + array( '/.', '/' ), + array( '/a/b/c/./../../g', '/a/g' ), + array( 'mid/content=5/../6', 'mid/6' ), + array( '/foo/bar/.', '/foo/bar/' ), + array( '/foo/bar/./', '/foo/bar/' ), + array( '/foo/bar/..', '/foo/' ), + array( '/foo/bar/../', '/foo/' ), + array( '/foo/bar/../baz', '/foo/baz' ), + array('/foo/bar/../..', '/'), + array('/foo/bar/../../' , '/'), + array('/foo/bar/../../baz' , '/baz'), + //array('/foo/bar/../../../baz' , '/../baz'), + array( 'a/./b/../b/', 'a/b/' ), + array( '.', '' ), + array( '..', '' ), + ); + } + + public function testDecodingUnreservedUrlChars() { + $this->assertEquals( 'c', $this->fixture->urlDecodeUnreservedChars( '%63' ) ); + $this->assertEquals( 'c/%7B', $this->fixture->urlDecodeUnreservedChars( '%63/%7b' ) ); + $this->assertEquals( 'eXAMPLE://a/./b/../b/c/%7Bfoo%7D', $this->fixture->urlDecodeUnreservedChars( 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d' ) ); + } + + /** + * @dataProvider schemeData + * + * https://tools.ietf.org/html/rfc3986#section-6.2.3 + */ + public function testSchemeBasedNormalization( $url ) { + $expected_uri = 'http://example.com/'; + + $this->fixture->setUrl( $url ); + $this->assertEquals( $expected_uri, $this->fixture->normalize() ); + + } + + public function schemeData() { + return array( array( 'http://example.com' ), + array( 'http://example.com/' ), + array( 'http://example.com:/' ), + array( 'http://example.com:80/' ), ); + } + + /** + * @dataProvider schemeDataSSL + * + * https://tools.ietf.org/html/rfc3986#section-6.2.3 + */ + public function testSchemeBasedNormalizationSSL( $url ) { + $expected_uri = 'https://example.com/'; + + $this->fixture->setUrl( $url ); + $this->assertEquals( $expected_uri, $this->fixture->normalize() ); + + } + + public function schemeDataSSL() { + return array( array( 'https://example.com' ), + array( 'https://example.com/' ), + array( 'https://example.com:/' ), + array( 'https://example.com:443/' ), ); + } + + public function testQueryParametersArePreserved() { + $url = 'http://fancysite.nl/links/doit.pl?id=2029'; + + $this->fixture->setUrl( $url ); + $this->assertEquals( $url, $this->fixture->normalize() ); + } + + public function testFragmentIdentifiersArePreserved() { + $url = 'http://example.com/index.html#fragment'; + + $this->fixture->setUrl( $url ); + $this->assertEquals( $url, $this->fixture->normalize() ); + } + + public function testPortNumbersArePreserved() { + $url = 'http://example.com:81/index.html'; + + $this->fixture->setUrl( $url ); + $this->assertEquals( $url, $this->fixture->normalize() ); + } + + public function testCaseSensitiveElementsArePreserved() { + $url = 'HtTp://User:Pass@www.ExAmPle.com:80/Blah'; + + $this->fixture->setUrl( $url ); + $this->assertEquals( 'http://User:Pass@www.example.com/Blah', $this->fixture->normalize() ); + } + + public function testSetUrlReturnsFalseWithUnparseableUrl() { + $this->assertFalse( $this->fixture->setUrl( '/test:2/' ) ); + } + + public function testTrailingSlashIsAdded() { + $url = 'http://example.com'; + + $this->fixture->setUrl( $url ); + $this->assertEquals( 'http://example.com/', $this->fixture->normalize() ); + } + + public function testDoubleSlashNotAddedToSchemeIfNoHost() { + $uri = 'mailto:mail@example.com'; + + $this->fixture->setUrl( $uri ); + $this->assertEquals( 'mailto:mail@example.com', $this->fixture->normalize() ); + } + + public function testColonNotAddedToUsernameWhenNoPassword() { + $uri = 'http://user@example.com/'; + + $this->fixture->setUrl( $uri ); + $this->assertEquals( 'http://user@example.com/', $this->fixture->normalize() ); + } + + public function testPortAndFragmentDoNotPersistBetweenCalls() { + $this->fixture->setUrl( 'http://example.com/path/?query#fragment' ); + $this->fixture->normalize(); + + $uri = 'http://example.com:400/'; + $this->fixture->setUrl( $uri ); + $this->assertEquals( $uri, $this->fixture->normalize() ); + + $uri = 'http://example.com/'; + $this->fixture->setUrl( $uri ); + $this->assertEquals( $uri, $this->fixture->normalize() ); + } + + public function testEbayImageUrl() { + $this->fixture->setUrl( 'http://i.ebayimg.com/t/O05520-Adidas-OM-Olympique-Marseille-Jacket-Hooded-UK-S-/00/s/NDAwWDQwMA==/$(KGrHqF,!lMF!iFJh4nmBQflyg7GSw~~60_12.JPG' ); + $this->assertEquals( 'http://i.ebayimg.com/t/O05520-Adidas-OM-Olympique-Marseille-Jacket-Hooded-UK-S-/00/s/NDAwWDQwMA==/$(KGrHqF,!lMF!iFJh4nmBQflyg7GSw~~60_12.JPG', + $this->fixture->normalize() ); + + } + + public function testReservedCharactersInPathSegmentAreNotEncoded() { + $this->fixture->setUrl( "http://www.example.com/!$&'()*+,;=/" ); + $this->assertEquals( "http://www.example.com/!$&'()*+,;=/", $this->fixture->normalize() ); + } + + public function testQueryWithArray() { + $this->fixture->setUrl('http://www.example.com/?array[key]=value'); + $this->assertEquals('http://www.example.com/?array%5Bkey%5D=value', $this->fixture->normalize() ); + } + + public function testSpacesInQueryStringAreCorrectlyEncoded() { + $this->fixture->setUrl( 'http://www.example.com/?a space' ); + $this->assertEquals( 'http://www.example.com/?a%20space', $this->fixture->normalize() ); + } + + public function testQueryValuesThatContainEqualsSignsArePreserved() { + $this->fixture->setUrl( 'http://www.example.com/?key=v1=v2' ); + $this->assertEquals( 'http://www.example.com/?key=v1%3Dv2', $this->fixture->normalize() ); + } + + public function testUtf8HostNames() { + $this->fixture->setUrl('http://www.Яндекс.РФ'); + $this->assertEquals( 'http://www.яндекс.рф/', $this->fixture->normalize() ); + + $this->fixture->setUrl('http://dev.ŽiŪrKėNaS.lt'); + $this->assertEquals( 'http://dev.žiūrkėnas.lt/', $this->fixture->normalize() ); + + } + + public function testTrimMultipleSlashes() { + $this->fixture->setUrl('http://www.яндекс.рф/////'); + $this->assertEquals( 'http://www.яндекс.рф/', $this->fixture->normalize() ); + + $this->fixture->setUrl('http://www.яндекс.рф/////index.php'); + $this->assertEquals( 'http://www.яндекс.рф/index.php', $this->fixture->normalize() ); + + $this->fixture->setUrl('http://www.яндекс.рф///index////subdir////'); + $this->assertEquals( 'http://www.яндекс.рф/index/subdir/', $this->fixture->normalize() ); + + $this->fixture->setUrl('http://www.яндекс.рф/index/../../subdir'); + $this->assertEquals( 'http://www.яндекс.рф/subdir', $this->fixture->normalize() ); + + } + + /** + * @dataProvider unnamedKeys + */ + public function testUnnamedKeysInQueryStringArePreserved($url, $expected) { + $this->fixture->setUrl($url); + $this->assertEquals($expected, $this->fixture->normalize()); + } + + public function unnamedKeys() { + return array( + array('http://www.example.com/?foo[]=bar&foo[]=baz', 'http://www.example.com/?foo%5B%5D=bar&foo%5B%5D=baz'), + ); + } + + public function testDelimitersArePreservedIfAssociatedComponentIsEmpty() + { + $this->fixture->setUrl('http://www.example.com/?'); + $this->assertEquals( 'http://www.example.com/?', $this->fixture->normalize() ); + } + + public function testEmptyDelimitersAreRemovedOption() + { + $this->fixture = new Normalizer('http://www.example.com/?', true); + $this->assertEquals( 'http://www.example.com/', $this->fixture->normalize() ); + } + + public function testEmptyParametersAreNotPreserved() + { + $this->fixture->setUrl('http://www.example.com/?a&'); + $this->assertEquals( 'http://www.example.com/?a', $this->fixture->normalize() ); + } + + public function testAlphabeticalSortingOfQueryParameters() + { + $this->fixture = new Normalizer('http://www.example.com/?c=3&b=2&a=1', false, true); + $this->assertEquals( 'http://www.example.com/?a=1&b=2&c=3', $this->fixture->normalize() ); + } +} From ac94030d4c51829649c482629c9097c2911d1594 Mon Sep 17 00:00:00 2001 From: Dan Fabulich Date: Tue, 1 Oct 2024 21:31:02 -0700 Subject: [PATCH 2/2] ifarchive-tuid-report: Normalize IF Archive paths and gamelinks URLs Fixes https://github.com/iftechfoundation/ifdb-suggestion-tracker/issues/492 --- www/ifarchive-tuid-report | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/www/ifarchive-tuid-report b/www/ifarchive-tuid-report index ae54124e..14c1d7be 100644 --- a/www/ifarchive-tuid-report +++ b/www/ifarchive-tuid-report @@ -3,6 +3,7 @@ include_once "util.php"; include_once "pagetpl.php"; include_once "dbconnect.php"; +require_once 'vendor/autoload.php'; $json = $_GET['json'] ?? false; $refresh = $_GET['refresh'] ?? false; @@ -87,9 +88,20 @@ $db = dbConnect(); $output = []; foreach($tuids as $tuid => $path) { - $result = mysqli_execute_query($db, "select url from gamelinks where gameid = ? and url like ?", [$tuid, "%$path"]); - $row = mysqli_fetch_row($result); - if (!$row) { + // normalize the path using URL normalizer. First we make it an absolute URL, normalize it, then we strip the absolute part off + $path = substr((new URL\Normalizer("https://ifarchive.org/$path"))->normalize(), strlen("https://ifarchive.org/")); + $result = mysqli_execute_query($db, "select url from gamelinks where gameid = ?", [$tuid]); + $found = false; + foreach ($result->fetch_all(MYSQLI_NUM) as [$url]) { + $url = (new URL\Normalizer($url))->normalize(); + // check whether the $url ends with $path + if (substr_compare($url, $path, -strlen($path)) === 0) { + $found = true; + break; + } + } + + if (!$found) { [$title] = mysqli_fetch_row(mysqli_execute_query($db, "select title from games where id = ?", [$tuid])); $output[]= [ "tuid" => $tuid,