From cf355b0b69db323408e50a3719cff4e1ab0807b0 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 13 Feb 2024 22:46:25 +0100 Subject: [PATCH] Update shlink-common and shlink-installer --- UPGRADE.md | 5 +++++ composer.json | 4 ++-- config/autoload/cache.global.php | 1 - config/autoload/installer.global.php | 1 - module/Core/src/Config/EnvVars.php | 1 - 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index 0af19f77..f76be20b 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -40,6 +40,11 @@ * Due to previous point, it is no longer possible to pass `ENABLE_PERIODIC_VISIT_LOCATE=true` in order to configure a cron job that locates visits periodically. This was not really needed in the docker image, as visits are located on the fly. +### Changes in integrations + +* Credentials in redis URLs should now be URL-encoded, as they are unconditionally url-decoded before being used. Previously, it was possible to customize this behavior via `REDIS_DECODE_CREDENTIALS=true|false`. +* Providing redis URIs in the form of `tcp://password@6.6.6.6:6379` is no longer supported. If you want to provide password with no username, do `tcp://:password@6.6.6.6:6379` instead. + ## From v2.x to v3.x ### Changes in REST API diff --git a/composer.json b/composer.json index 0ea76443..ed0cb3ae 100644 --- a/composer.json +++ b/composer.json @@ -43,11 +43,11 @@ "pagerfanta/core": "^3.8", "pugx/shortid-php": "^1.1", "ramsey/uuid": "^4.7", - "shlinkio/shlink-common": "dev-main#a309824 as 6.0", + "shlinkio/shlink-common": "dev-main#3f6b243 as 6.0", "shlinkio/shlink-config": "^2.5", "shlinkio/shlink-event-dispatcher": "^3.1", "shlinkio/shlink-importer": "^5.2.1", - "shlinkio/shlink-installer": "^8.7", + "shlinkio/shlink-installer": "dev-develop#9f0d7e5 as 9.0", "shlinkio/shlink-ip-geolocation": "^3.4", "shlinkio/shlink-json": "^1.1", "spiral/roadrunner": "^2023.2", diff --git a/config/autoload/cache.global.php b/config/autoload/cache.global.php index 30db2c0a..94a9a183 100644 --- a/config/autoload/cache.global.php +++ b/config/autoload/cache.global.php @@ -11,7 +11,6 @@ return (static function (): array { 'redis' => [ 'servers' => $redisServers, 'sentinel_service' => EnvVars::REDIS_SENTINEL_SERVICE->loadFromEnv(), - 'decode_credentials' => (bool) EnvVars::REDIS_DECODE_CREDENTIALS->loadFromEnv(false), ], ]; diff --git a/config/autoload/installer.global.php b/config/autoload/installer.global.php index affb0897..a3b477af 100644 --- a/config/autoload/installer.global.php +++ b/config/autoload/installer.global.php @@ -31,7 +31,6 @@ return [ Option\Worker\TaskWorkerNumConfigOption::class, Option\Worker\WebWorkerNumConfigOption::class, Option\Redis\RedisServersConfigOption::class, - Option\Redis\RedisDecodeCredentialsConfigOption::class, Option\Redis\RedisSentinelServiceConfigOption::class, Option\Redis\RedisPubSubConfigOption::class, Option\UrlShortener\ShortCodeLengthOption::class, diff --git a/module/Core/src/Config/EnvVars.php b/module/Core/src/Config/EnvVars.php index 4a32b7c3..14a850c9 100644 --- a/module/Core/src/Config/EnvVars.php +++ b/module/Core/src/Config/EnvVars.php @@ -24,7 +24,6 @@ enum EnvVars: string case CACHE_NAMESPACE = 'CACHE_NAMESPACE'; case REDIS_SERVERS = 'REDIS_SERVERS'; case REDIS_SENTINEL_SERVICE = 'REDIS_SENTINEL_SERVICE'; - case REDIS_DECODE_CREDENTIALS = 'REDIS_DECODE_CREDENTIALS'; case REDIS_PUB_SUB_ENABLED = 'REDIS_PUB_SUB_ENABLED'; case MERCURE_PUBLIC_HUB_URL = 'MERCURE_PUBLIC_HUB_URL'; case MERCURE_INTERNAL_HUB_URL = 'MERCURE_INTERNAL_HUB_URL';