Merge pull request #743 from acelaya-forks/feature/geolite-license

Feature/geolite license

.travis.yml

@@ -48,12 +48,6 @@ before_deploy:
   - if [[ ! -z $TRAVIS_TAG && "${TRAVIS_PHP_VERSION}" == "7.4" ]]; then ./build.sh ${TRAVIS_TAG#?} ; fi
 
 deploy:
-  - provider: script
-    script: bash ./docker/build
-    on:
-      all_branches: true
-      condition: $TRAVIS_PULL_REQUEST == 'false'
-      php: '7.4'
   - provider: releases
     api_key:
       secure: a9dbZchocqeuOViwUeNH54bQR5Sz7rEYXx5b9WPFtnFn9LGKKUaLbA2U91UQ9QKPrcTpsALubUYbw2CnNmvCwzaY+R8lCD3gkU4ohsEnbpnw3deOeixI74sqBHJAuCH9FSaRDGILoBMtUKx2xlzIymFxkIsgIukkGbdkWHDlRWY3oTUUuw1SQ2Xk9KDsbJQtjIc1+G/O6gHaV4qv/R9W8NPmJExKTNDrAZbC1vIUnxqp4UpVo1hst8qPd1at94CndDYM5rG+7imGbdtxTxzamt819qdTO1OfvtctKawNAm7YXZrrWft6c7gI6j6SI4hxd+ZrrPBqbaRFHkZHjnNssO/yn4SaOHFFzccmu0MzvpPCf0qWZwd3sGHVYer1MnR2mHYqU84QPlW3nrHwJjkrpq3+q0JcBY6GsJs+RskHNtkMTKV05Iz6QUI5YZGwTpuXaRm036SmavjGc4IDlMaYCk/NmbB9BKpthJxLdUpczOHpnjXXHziotWD6cfEnbjU3byfD8HY5WrxSjsNT7SKmXN3hRof7bk985ewQVjGT42O3NbnfnqjQQWr/B7/zFTpLR4f526Bkq12CdCyf5lvrbq+POkLVdJ+uFfR7ds248Ue/jBQy6kM1tWmKF9QiwisFlA84eQ4CW3I93Rp97URv+AQa9zmbD0Ve3Udp+g6nF5I=
@@ -62,3 +56,9 @@ deploy:
     on:
       tags: true
       php: '7.4'
+  - provider: script
+    script: bash ./docker/build
+    on:
+      all_branches: true
+      condition: $TRAVIS_PULL_REQUEST == 'false'
+      php: '7.4'

CHANGELOG.md

@@ -4,6 +4,103 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## 2.1.4 - 2020-04-30
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#742](https://github.com/shlinkio/shlink/issues/742) Allowed a custom GeoLite2 license key to be provided, in order to avoid download limits.
+
+
+## 2.1.3 - 2020-04-09
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#712](https://github.com/shlinkio/shlink/issues/712) Fixed app set-up not clearing entities metadata cache.
+* [#711](https://github.com/shlinkio/shlink/issues/711) Fixed `HEAD` requests returning a duplicated `Content-Length` header.
+* [#716](https://github.com/shlinkio/shlink/issues/716) Fixed Twitter not properly displaying preview for final long URL.
+* [#717](https://github.com/shlinkio/shlink/issues/717) Fixed DB connection expiring on task workers when using swoole.
+* [#705](https://github.com/shlinkio/shlink/issues/705) Fixed how the short URL domain is inferred when generating QR codes, making sure the configured domain is respected even if the request is performed using a different one, and only when a custom domain is used, then that one is used instead.
+
+
+## 2.1.2 - 2020-03-29
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* [#696](https://github.com/shlinkio/shlink/issues/696) Updated to infection v0.16.
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#700](https://github.com/shlinkio/shlink/issues/700) Fixed migration not working with postgres.
+* [#690](https://github.com/shlinkio/shlink/issues/690) Fixed tags being incorrectly sluggified when filtering short URL lists, making results not be the expected.
+
+
+## 2.1.1 - 2020-03-28
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#697](https://github.com/shlinkio/shlink/issues/697) Recovered `.htaccess` file that was unintentionally removed in v2.1.0, making Shlink unusable with Apache.
+
+
 ## 2.1.0 - 2020-03-28
 
 #### Added

build.sh

@@ -19,6 +19,7 @@ mkdir -p "${builtcontent}"
 rsync -av * "${builtcontent}" \
     --exclude=*docker* \
     --exclude=Dockerfile \
+    --include=.htaccess \
     --exclude-from=./.dockerignore
 cd "${builtcontent}"
 

composer.json

@@ -52,7 +52,7 @@
         "shlinkio/shlink-common": "^3.0",
         "shlinkio/shlink-config": "^1.0",
         "shlinkio/shlink-event-dispatcher": "^1.4",
-        "shlinkio/shlink-installer": "^4.3.1",
+        "shlinkio/shlink-installer": "^4.4.0",
         "shlinkio/shlink-ip-geolocation": "^1.4",
         "symfony/console": "^5.0",
         "symfony/filesystem": "^5.0",
@@ -63,9 +63,9 @@
         "devster/ubench": "^2.0",
         "dms/phpunit-arraysubset-asserts": "^0.2.0",
         "eaglewu/swoole-ide-helper": "dev-master",
-        "infection/infection": "^0.15.0",
+        "infection/infection": "^0.16.1",
-        "phpstan/phpstan": "^0.12.3",
+        "phpstan/phpstan": "^0.12.18",
-        "phpunit/phpunit": "^9.0.1",
+        "phpunit/phpunit": "~9.0.1",
         "roave/security-advisories": "dev-master",
         "shlinkio/php-coding-standard": "~2.1.0",
         "shlinkio/shlink-test-utils": "^1.4",
@@ -135,7 +135,7 @@
         "test:api:ci": "@test:api --coverage-php build/coverage-api.cov",
         "test:unit:pretty": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-html build/coverage",
         "infect": "infection --threads=4 --min-msi=80 --log-verbosity=default --only-covered",
-        "infect:ci": "@infect --coverage=build",
+        "infect:ci": "@infect --coverage=build --skip-initial-tests",
         "infect:show": "@infect --show-mutations",
         "infect:test": [
             "@test:unit:ci",

config/autoload/installer.global.php

@@ -31,6 +31,7 @@ return [
             Option\WebWorkerNumConfigOption::class,
             Option\RedisServersConfigOption::class,
             Option\ShortCodeLengthOption::class,
+            Option\GeoLiteLicenseKeyConfigOption::class,
         ],
 
         'installation_commands' => [

config/autoload/middleware-pipeline.global.php

@@ -5,8 +5,9 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink;
 
 use Laminas\Stratigility\Middleware\ErrorHandler;
-use Mezzio;
+use Mezzio\Helper;
 use Mezzio\ProblemDetails;
+use Mezzio\Router;
 use PhpMiddleware\RequestId\RequestIdMiddleware;
 
 return [
@@ -14,7 +15,7 @@ return [
     'middleware_pipeline' => [
         'error-handler' => [
             'middleware' => [
-                Mezzio\Helper\ContentLengthMiddleware::class,
+                Helper\ContentLengthMiddleware::class,
                 ErrorHandler::class,
             ],
         ],
@@ -35,14 +36,15 @@ return [
 
         'routing' => [
             'middleware' => [
-                Mezzio\Router\Middleware\RouteMiddleware::class,
+                Router\Middleware\RouteMiddleware::class,
+                Router\Middleware\ImplicitHeadMiddleware::class,
             ],
         ],
 
         'rest' => [
             'path' => '/rest',
             'middleware' => [
-                Mezzio\Router\Middleware\ImplicitOptionsMiddleware::class,
+                Router\Middleware\ImplicitOptionsMiddleware::class,
                 Rest\Middleware\BodyParserMiddleware::class,
                 Rest\Middleware\AuthenticationMiddleware::class,
             ],
@@ -50,7 +52,7 @@ return [
 
         'dispatch' => [
             'middleware' => [
-                Mezzio\Router\Middleware\DispatchMiddleware::class,
+                Router\Middleware\DispatchMiddleware::class,
             ],
         ],
 
@@ -67,4 +69,5 @@ return [
             ],
         ],
     ],
+
 ];

data/migrations/Version20200323190014.php

@@ -22,15 +22,16 @@ final class Version20200323190014 extends AbstractMigration
     {
         $qb = $this->connection->createQueryBuilder();
         $qb->update('visit_locations')
-           ->set('is_empty', true)
+           ->set('is_empty', ':isEmpty')
-           ->where($qb->expr()->eq('country_code', ':empty'))
+           ->where($qb->expr()->eq('country_code', ':emptyString'))
-           ->andWhere($qb->expr()->eq('country_name', ':empty'))
+           ->andWhere($qb->expr()->eq('country_name', ':emptyString'))
-           ->andWhere($qb->expr()->eq('region_name', ':empty'))
+           ->andWhere($qb->expr()->eq('region_name', ':emptyString'))
-           ->andWhere($qb->expr()->eq('city_name', ':empty'))
+           ->andWhere($qb->expr()->eq('city_name', ':emptyString'))
-           ->andWhere($qb->expr()->eq('timezone', ':empty'))
+           ->andWhere($qb->expr()->eq('timezone', ':emptyString'))
            ->andWhere($qb->expr()->eq('lat', 0))
            ->andWhere($qb->expr()->eq('lon', 0))
-           ->setParameter('empty', '')
+           ->setParameter('isEmpty', true)
+           ->setParameter('emptyString', '')
            ->execute();
     }
 

docker/README.md

@@ -18,7 +18,7 @@ It also expects these two env vars to be provided, in order to properly generate
 So based on this, to run shlink on a local docker service, you should run a command like this:
 
 ```bash
-docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https shlinkio/shlink:stable
+docker run --name shlink -p 8080:8080 -e SHORT_DOMAIN_HOST=doma.in -e SHORT_DOMAIN_SCHEMA=https -e GEOLITE_LICENSE_KEY=kjh23ljkbndskj345 shlinkio/shlink:stable
 ```
 
 ### Interact with shlink's CLI on a running container.
@@ -121,6 +121,8 @@ This is the complete list of supported env vars:
 
     In the future, these redis servers could be used for other caching operations performed by shlink.
 
+* `GEOLITE_LICENSE_KEY`: The license key used to download new GeoLite2 database files. This is not mandatory, as a default license key is provided, but it is **strongly recommended** that you provide your own. Go to [https://shlink.io/documentation/geolite-license-key](https://shlink.io/documentation/geolite-license-key) to know how to generate it.
+
 An example using all env vars could look like this:
 
 ```bash
@@ -147,6 +149,7 @@ docker run \
     -e TASK_WORKER_NUM=32 \
     -e "VISITS_WEBHOOKS=http://my-api.com/api/v2.3/notify,https://third-party.io/foo" \
     -e DEFAULT_SHORT_CODES_LENGTH=6 \
+    -e GEOLITE_LICENSE_KEY=kjh23ljkbndskj345 \
     shlinkio/shlink:stable
 ```
 
@@ -187,7 +190,8 @@ The whole configuration should have this format, but it can be split into multip
         "password": "123abc",
         "host": "something.rds.amazonaws.com",
         "port": "3306"
-    }
+    },
+    "geolite_license_key": "kjh23ljkbndskj345"
 }
 ```
 

docker/config/shlink_in_docker.local.php

@@ -147,4 +147,8 @@ return [
         ],
     ],
 
+    'geolite2' => [
+        'license_key' => env('GEOLITE_LICENSE_KEY', 'G4Lm0C60yJsnkdPi'),
+    ],
+
 ];

docker/docker-entrypoint.sh

@@ -12,6 +12,9 @@ php bin/cli db:migrate -n -q
 echo "Generating proxies..."
 php vendor/doctrine/orm/bin/doctrine.php orm:generate-proxies -n -q
 
+echo "Clearing entities cache..."
+php vendor/doctrine/orm/bin/doctrine.php orm:clear-cache:metadata -n -q
+
 # When restarting the container, swoole might think it is already in execution
 # This forces the app to be started every second until the exit code is 0
 until php vendor/mezzio/mezzio-swoole/bin/mezzio-swoole start; do sleep 1 ; done

module/Core/config/dependencies.config.php

@@ -4,9 +4,7 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Core;
 
-use Doctrine\Common\Cache\Cache;
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
-use Mezzio\Router\RouterInterface;
 use Mezzio\Template\TemplateRendererInterface;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Shlinkio\Shlink\Core\Domain\Resolver;
@@ -39,8 +37,6 @@ return [
             Action\PixelAction::class => ConfigAbstractFactory::class,
             Action\QrCodeAction::class => ConfigAbstractFactory::class,
 
-            Middleware\QrCodeCacheMiddleware::class => ConfigAbstractFactory::class,
-
             Resolver\PersistenceDomainResolver::class => ConfigAbstractFactory::class,
         ],
     ],
@@ -81,13 +77,11 @@ return [
             'Logger_Shlink',
         ],
         Action\QrCodeAction::class => [
-            RouterInterface::class,
             Service\ShortUrl\ShortUrlResolver::class,
+            'config.url_shortener.domain',
             'Logger_Shlink',
         ],
 
-        Middleware\QrCodeCacheMiddleware::class => [Cache::class],
-
         Resolver\PersistenceDomainResolver::class => ['em'],
     ],
 

module/Core/config/routes.config.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 use Fig\Http\Message\RequestMethodInterface as RequestMethod;
 use RKA\Middleware\IpAddress;
 use Shlinkio\Shlink\Core\Action;
-use Shlinkio\Shlink\Core\Middleware;
 
 return [
 
@@ -32,7 +31,6 @@ return [
             'name' => Action\QrCodeAction::class,
             'path' => '/{shortCode}/qr-code[/{size:[0-9]+}]',
             'middleware' => [
-                Middleware\QrCodeCacheMiddleware::class,
                 Action\QrCodeAction::class,
             ],
             'allowed_methods' => [RequestMethod::METHOD_GET],

module/Core/src/Action/AbstractTrackingAction.php

@@ -4,7 +4,9 @@ declare(strict_types=1);
 
 namespace Shlinkio\Shlink\Core\Action;
 
+use Fig\Http\Message\RequestMethodInterface;
 use Laminas\Diactoros\Uri;
+use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -24,7 +26,7 @@ use function array_merge;
 use function GuzzleHttp\Psr7\build_query;
 use function GuzzleHttp\Psr7\parse_query;
 
-abstract class AbstractTrackingAction implements MiddlewareInterface
+abstract class AbstractTrackingAction implements MiddlewareInterface, RequestMethodInterface
 {
     private ShortUrlResolverInterface $urlResolver;
     private VisitsTrackerInterface $visitTracker;
@@ -50,14 +52,13 @@ abstract class AbstractTrackingAction implements MiddlewareInterface
         $disableTrackParam = $this->appOptions->getDisableTrackParam();
 
         try {
-            $url = $this->urlResolver->resolveEnabledShortUrl($identifier);
+            $shortUrl = $this->urlResolver->resolveEnabledShortUrl($identifier);
 
-            // Track visit to this short code
+            if ($this->shouldTrackRequest($request, $query, $disableTrackParam)) {
-            if ($disableTrackParam === null || ! array_key_exists($disableTrackParam, $query)) {
+                $this->visitTracker->track($shortUrl, Visitor::fromRequest($request));
-                $this->visitTracker->track($url, Visitor::fromRequest($request));
             }
 
-            return $this->createSuccessResp($this->buildUrlToRedirectTo($url, $query, $disableTrackParam));
+            return $this->createSuccessResp($this->buildUrlToRedirectTo($shortUrl, $query, $disableTrackParam));
         } catch (ShortUrlNotFoundException $e) {
             $this->logger->warning('An error occurred while tracking short code. {e}', ['e' => $e]);
             return $this->createErrorResp($request, $handler);
@@ -76,6 +77,16 @@ abstract class AbstractTrackingAction implements MiddlewareInterface
         return (string) $uri->withQuery(build_query($mergedQuery));
     }
 
+    private function shouldTrackRequest(ServerRequestInterface $request, array $query, ?string $disableTrackParam): bool
+    {
+        $forwardedMethod = $request->getAttribute(ImplicitHeadMiddleware::FORWARDED_HTTP_METHOD_ATTRIBUTE);
+        if ($forwardedMethod === self::METHOD_HEAD) {
+            return false;
+        }
+
+        return $disableTrackParam === null || ! array_key_exists($disableTrackParam, $query);
+    }
+
     abstract protected function createSuccessResp(string $longUrl): ResponseInterface;
 
     abstract protected function createErrorResp(

module/Core/src/Action/QrCodeAction.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Shlinkio\Shlink\Core\Action;
 
 use Endroid\QrCode\QrCode;
-use Mezzio\Router\RouterInterface;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\MiddlewareInterface;
@@ -23,17 +22,17 @@ class QrCodeAction implements MiddlewareInterface
     private const MIN_SIZE = 50;
     private const MAX_SIZE = 1000;
 
-    private RouterInterface $router;
     private ShortUrlResolverInterface $urlResolver;
+    private array $domainConfig;
     private LoggerInterface $logger;
 
     public function __construct(
-        RouterInterface $router,
         ShortUrlResolverInterface $urlResolver,
+        array $domainConfig,
         ?LoggerInterface $logger = null
     ) {
-        $this->router = $router;
         $this->urlResolver = $urlResolver;
+        $this->domainConfig = $domainConfig;
         $this->logger = $logger ?: new NullLogger();
     }
 
@@ -42,23 +41,19 @@ class QrCodeAction implements MiddlewareInterface
         $identifier = ShortUrlIdentifier::fromRedirectRequest($request);
 
         try {
-            $this->urlResolver->resolveEnabledShortUrl($identifier);
+            $shortUrl = $this->urlResolver->resolveEnabledShortUrl($identifier);
         } catch (ShortUrlNotFoundException $e) {
             $this->logger->warning('An error occurred while creating QR code. {e}', ['e' => $e]);
             return $handler->handle($request);
         }
 
-        $path = $this->router->generateUri(RedirectAction::class, ['shortCode' => $identifier->shortCode()]);
+        $qrCode = new QrCode($shortUrl->toString($this->domainConfig));
-        $size = $this->getSizeParam($request);
+        $qrCode->setSize($this->getSizeParam($request));
-
-        $qrCode = new QrCode((string) $request->getUri()->withPath($path)->withQuery(''));
-        $qrCode->setSize($size);
         $qrCode->setMargin(0);
+
         return new QrCodeResponse($qrCode);
     }
 
-    /**
-     */
     private function getSizeParam(Request $request): int
     {
         $size = (int) $request->getAttribute('size', self::DEFAULT_SIZE);

module/Core/src/Config/SimplifiedConfigParser.php

@@ -33,6 +33,7 @@ class SimplifiedConfigParser
         'task_worker_num' => ['mezzio-swoole', 'swoole-http-server', 'options', 'task_worker_num'],
         'visits_webhooks' => ['url_shortener', 'visits_webhooks'],
         'default_short_codes_length' => ['url_shortener', 'default_short_codes_length'],
+        'geolite_license_key' => ['geolite2', 'license_key'],
     ];
     private const SIMPLIFIED_CONFIG_SIDE_EFFECTS = [
         'delete_short_url_threshold' => [

module/Core/src/EventDispatcher/LocateShortUrlVisit.php

@@ -9,6 +9,7 @@ use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\CLI\Exception\GeolocationDbUpdateFailedException;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdaterInterface;
+use Shlinkio\Shlink\Common\Doctrine\ReopeningEntityManager;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Entity\VisitLocation;
 use Shlinkio\Shlink\IpGeolocation\Exception\WrongIpException;
@@ -41,22 +42,35 @@ class LocateShortUrlVisit
 
     public function __invoke(ShortUrlVisited $shortUrlVisited): void
     {
+        // FIXME Temporarily handling DB connection reset here to fix https://github.com/shlinkio/shlink/issues/717
+        //       Remove when https://github.com/shlinkio/shlink-event-dispatcher/issues/23 is implemented
+        if ($this->em instanceof ReopeningEntityManager) {
+            $this->em->open();
+        }
+
         $visitId = $shortUrlVisited->visitId();
 
-        /** @var Visit|null $visit */
+        try {
-        $visit = $this->em->find(Visit::class, $visitId);
+            /** @var Visit|null $visit */
-        if ($visit === null) {
+            $visit = $this->em->find(Visit::class, $visitId);
-            $this->logger->warning('Tried to locate visit with id "{visitId}", but it does not exist.', [
+            if ($visit === null) {
-                'visitId' => $visitId,
+                $this->logger->warning('Tried to locate visit with id "{visitId}", but it does not exist.', [
-            ]);
+                    'visitId' => $visitId,
-            return;
+                ]);
-        }
+                return;
+            }
 
-        if ($this->downloadOrUpdateGeoLiteDb($visitId)) {
+            if ($this->downloadOrUpdateGeoLiteDb($visitId)) {
-            $this->locateVisit($visitId, $shortUrlVisited->originalIpAddress(), $visit);
+                $this->locateVisit($visitId, $shortUrlVisited->originalIpAddress(), $visit);
-        }
+            }
 
-        $this->eventDispatcher->dispatch(new VisitLocated($visitId));
+            $this->eventDispatcher->dispatch(new VisitLocated($visitId));
+        } finally {
+            // FIXME Temporarily handling DB connection reset here to fix https://github.com/shlinkio/shlink/issues/717
+            //       Remove when https://github.com/shlinkio/shlink-event-dispatcher/issues/23 is implemented
+            $this->em->getConnection()->close();
+            $this->em->clear();
+        }
     }
 
     private function downloadOrUpdateGeoLiteDb(string $visitId): bool

module/Core/src/Middleware/QrCodeCacheMiddleware.php

@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Shlinkio\Shlink\Core\Middleware;
-
-use Doctrine\Common\Cache\Cache;
-use Laminas\Diactoros\Response as DiactResp;
-use Psr\Http\Message\ResponseInterface as Response;
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class QrCodeCacheMiddleware implements MiddlewareInterface
-{
-    private Cache $cache;
-
-    public function __construct(Cache $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * Process an incoming server request and return a response, optionally delegating
-     * to the next middleware component to create the response.
-     *
-     *
-     */
-    public function process(Request $request, RequestHandlerInterface $handler): Response
-    {
-        $cacheKey = $request->getUri()->getPath();
-
-        // If this QR code is already cached, just return it
-        if ($this->cache->contains($cacheKey)) {
-            $qrData = $this->cache->fetch($cacheKey);
-            $response = new DiactResp();
-            $response->getBody()->write($qrData['body']);
-            return $response->withHeader('Content-Type', $qrData['content-type']);
-        }
-
-        // If not, call the next middleware and cache it
-        /** @var Response $resp */
-        $resp = $handler->handle($request);
-        $this->cache->save($cacheKey, [
-            'body' => $resp->getBody()->__toString(),
-            'content-type' => $resp->getHeaderLine('Content-Type'),
-        ]);
-        return $resp;
-    }
-}

module/Core/src/Validation/ShortUrlsParamsInputFilter.php

@@ -39,7 +39,7 @@ class ShortUrlsParamsInputFilter extends InputFilter
 
         $tags = $this->createArrayInput(self::TAGS, false);
         $tags->getFilterChain()->attach(new Filter\StringToLower())
-                               ->attach(new Validation\SluggerFilter());
+                               ->attach(new Filter\PregReplace(['pattern' => '/ /', 'replacement' => '-']));
         $this->add($tags);
     }
 }

module/Core/test/Action/QrCodeActionTest.php

@@ -30,7 +30,7 @@ class QrCodeActionTest extends TestCase
 
         $this->urlResolver = $this->prophesize(ShortUrlResolverInterface::class);
 
-        $this->action = new QrCodeAction($router->reveal(), $this->urlResolver->reveal());
+        $this->action = new QrCodeAction($this->urlResolver->reveal(), ['domain' => 'doma.in']);
     }
 
     /** @test */

module/Core/test/Action/RedirectActionTest.php

@@ -4,8 +4,10 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\Action;
 
+use Fig\Http\Message\RequestMethodInterface;
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequest;
+use Mezzio\Router\Middleware\ImplicitHeadMiddleware;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -89,4 +91,23 @@ class RedirectActionTest extends TestCase
 
         $handle->shouldHaveBeenCalledOnce();
     }
+
+    /** @test */
+    public function trackingIsDisabledWhenRequestIsForwardedFromHead(): void
+    {
+        $shortCode = 'abc123';
+        $shortUrl = new ShortUrl('http://domain.com/foo/bar?some=thing');
+        $this->urlResolver->resolveEnabledShortUrl(new ShortUrlIdentifier($shortCode, ''))->willReturn($shortUrl);
+        $track = $this->visitTracker->track(Argument::cetera())->will(function (): void {
+        });
+
+        $request = (new ServerRequest())->withAttribute('shortCode', $shortCode)
+                                        ->withAttribute(
+                                            ImplicitHeadMiddleware::FORWARDED_HTTP_METHOD_ATTRIBUTE,
+                                            RequestMethodInterface::METHOD_HEAD,
+                                        );
+        $this->action->process($request, $this->prophesize(RequestHandlerInterface::class)->reveal());
+
+        $track->shouldNotHaveBeenCalled();
+    }
 }

module/Core/test/Config/SimplifiedConfigParserTest.php

@@ -60,6 +60,7 @@ class SimplifiedConfigParserTest extends TestCase
                 'https://third-party.io/foo',
             ],
             'default_short_codes_length' => 8,
+            'geolite_license_key' => 'kjh23ljkbndskj345',
         ];
         $expected = [
             'app_options' => [
@@ -127,6 +128,10 @@ class SimplifiedConfigParserTest extends TestCase
                     ],
                 ],
             ],
+
+            'geolite2' => [
+                'license_key' => 'kjh23ljkbndskj345',
+            ],
         ];
 
         $result = ($this->postProcessor)(array_merge($config, $simplified));

module/Core/test/EventDispatcher/LocateShortUrlVisitTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace ShlinkioTest\Shlink\Core\EventDispatcher;
 
+use Doctrine\DBAL\Connection;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -37,6 +38,10 @@ class LocateShortUrlVisitTest extends TestCase
     {
         $this->ipLocationResolver = $this->prophesize(IpLocationResolverInterface::class);
         $this->em = $this->prophesize(EntityManagerInterface::class);
+        $conn = $this->prophesize(Connection::class);
+        $this->em->getConnection()->willReturn($conn->reveal());
+        $this->em->clear()->will(function (): void {
+        });
         $this->logger = $this->prophesize(LoggerInterface::class);
         $this->dbUpdater = $this->prophesize(GeolocationDbUpdaterInterface::class);
         $this->eventDispatcher = $this->prophesize(EventDispatcherInterface::class);

module/Core/test/Middleware/QrCodeCacheMiddlewareTest.php

@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace ShlinkioTest\Shlink\Core\Middleware;
-
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\Cache;
-use Laminas\Diactoros\Response;
-use Laminas\Diactoros\ServerRequest;
-use Laminas\Diactoros\Uri;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Psr\Http\Server\RequestHandlerInterface;
-use Shlinkio\Shlink\Core\Middleware\QrCodeCacheMiddleware;
-
-class QrCodeCacheMiddlewareTest extends TestCase
-{
-    private QrCodeCacheMiddleware $middleware;
-    private Cache $cache;
-
-    public function setUp(): void
-    {
-        $this->cache = new ArrayCache();
-        $this->middleware = new QrCodeCacheMiddleware($this->cache);
-    }
-
-    /** @test */
-    public function noCachedPathFallsBackToNextMiddleware(): void
-    {
-        $delegate = $this->prophesize(RequestHandlerInterface::class);
-        $delegate->handle(Argument::any())->willReturn(new Response())->shouldBeCalledOnce();
-
-        $this->middleware->process((new ServerRequest())->withUri(new Uri('/foo/bar')), $delegate->reveal());
-
-        $this->assertTrue($this->cache->contains('/foo/bar'));
-    }
-
-    /** @test */
-    public function cachedPathReturnsCacheContent(): void
-    {
-        $isCalled = false;
-        $uri = (new Uri())->withPath('/foo');
-        $this->cache->save('/foo', ['body' => 'the body', 'content-type' => 'image/png']);
-        $delegate = $this->prophesize(RequestHandlerInterface::class);
-
-        $resp = $this->middleware->process((new ServerRequest())->withUri($uri), $delegate->reveal());
-
-        $this->assertFalse($isCalled);
-        $resp->getBody()->rewind();
-        $this->assertEquals('the body', $resp->getBody()->getContents());
-        $this->assertEquals('image/png', $resp->getHeaderLine('Content-Type'));
-        $delegate->handle(Argument::any())->shouldHaveBeenCalledTimes(0);
-    }
-}