From ad2b4b4b6bbde8a370cb2e8806ae546b679f7962 Mon Sep 17 00:00:00 2001 From: konradoboza Date: Wed, 28 Aug 2024 12:18:34 +0200 Subject: [PATCH 1/3] IBX-8811: Rebranded SiteAccess session prefix --- docs/varnish/vcl/varnish5.vcl | 2 +- docs/varnish/vcl/varnish6.vcl | 2 +- docs/varnish/vcl/varnish7.vcl | 2 +- src/bundle/AppCache.php | 2 +- src/bundle/Resources/config/fos_http_cache.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/varnish/vcl/varnish5.vcl b/docs/varnish/vcl/varnish5.vcl index 15819da..4ac040b 100644 --- a/docs/varnish/vcl/varnish5.vcl +++ b/docs/varnish/vcl/varnish5.vcl @@ -51,7 +51,7 @@ sub vcl_recv { if (req.http.cookie) { set req.http.cookie = ";" + req.http.cookie; set req.http.cookie = regsuball(req.http.cookie, "; +", ";"); - set req.http.cookie = regsuball(req.http.cookie, ";(eZSESSID[^=]*)=", "; \1="); + set req.http.cookie = regsuball(req.http.cookie, ";(IBX_SESSION_ID[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";(ibexa-[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";[^ ][^;]*", ""); set req.http.cookie = regsuball(req.http.cookie, "^[; ]+|[; ]+$", ""); diff --git a/docs/varnish/vcl/varnish6.vcl b/docs/varnish/vcl/varnish6.vcl index a5c8bbf..d4a6b93 100644 --- a/docs/varnish/vcl/varnish6.vcl +++ b/docs/varnish/vcl/varnish6.vcl @@ -51,7 +51,7 @@ sub vcl_recv { if (req.http.cookie) { set req.http.cookie = ";" + req.http.cookie; set req.http.cookie = regsuball(req.http.cookie, "; +", ";"); - set req.http.cookie = regsuball(req.http.cookie, ";(eZSESSID[^=]*)=", "; \1="); + set req.http.cookie = regsuball(req.http.cookie, ";(IBX_SESSION_ID[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";(ibexa-[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";[^ ][^;]*", ""); set req.http.cookie = regsuball(req.http.cookie, "^[; ]+|[; ]+$", ""); diff --git a/docs/varnish/vcl/varnish7.vcl b/docs/varnish/vcl/varnish7.vcl index 3443e75..618e4c8 100644 --- a/docs/varnish/vcl/varnish7.vcl +++ b/docs/varnish/vcl/varnish7.vcl @@ -49,7 +49,7 @@ sub vcl_recv { if (req.http.cookie) { set req.http.cookie = ";" + req.http.cookie; set req.http.cookie = regsuball(req.http.cookie, "; +", ";"); - set req.http.cookie = regsuball(req.http.cookie, ";(eZSESSID[^=]*)=", "; \1="); + set req.http.cookie = regsuball(req.http.cookie, ";(IBX_SESSION_ID[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";(ibexa-[^=]*)=", "; \1="); set req.http.cookie = regsuball(req.http.cookie, ";[^ ][^;]*", ""); set req.http.cookie = regsuball(req.http.cookie, "^[; ]+|[; ]+$", ""); diff --git a/src/bundle/AppCache.php b/src/bundle/AppCache.php index 2997342..d63eca4 100644 --- a/src/bundle/AppCache.php +++ b/src/bundle/AppCache.php @@ -34,7 +34,7 @@ class AppCache extends HttpCache implements CacheInvalidation public function __construct(KernelInterface $kernel, $cacheDir = null) { parent::__construct($kernel, $cacheDir); - $this->addSubscriber(new UserContextListener(['session_name_prefix' => 'eZSESSID'])); + $this->addSubscriber(new UserContextListener(['session_name_prefix' => 'IBX_SESSION_ID'])); $this->addSubscriber(new PurgeTagsListener(['tags_method' => 'PURGE', 'client_ips' => $this->getInternalAllowedIPs()])); $this->addSubscriber(new PurgeListener(['client_ips' => $this->getInternalAllowedIPs()])); } diff --git a/src/bundle/Resources/config/fos_http_cache.yml b/src/bundle/Resources/config/fos_http_cache.yml index cdb7953..c45ef3b 100644 --- a/src/bundle/Resources/config/fos_http_cache.yml +++ b/src/bundle/Resources/config/fos_http_cache.yml @@ -9,4 +9,4 @@ user_context: enabled: true hash_cache_ttl: 600 # NOTE: These are also defined/used in AppCache, in Varnish VCL, and Fastly VCL - session_name_prefix: eZSESSID + session_name_prefix: IBX_SESSION_ID From 2d2012ba1747a0d8ede0175dc25f68cf22d306cf Mon Sep 17 00:00:00 2001 From: konradoboza Date: Wed, 28 Aug 2024 12:28:28 +0200 Subject: [PATCH 2/3] [tmp] dev dependency to `ibexa/core` --- dependencies.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 0000000..163a185 --- /dev/null +++ b/dependencies.json @@ -0,0 +1,11 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-ibx-8811-SA-sessions-sharing as 5.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/core", + "package": "ibexa/core", + "shouldBeAddedAsVCS": false + } + ] +} From 92bdccd5832bc7b6d91526d63175083e20df7f77 Mon Sep 17 00:00:00 2001 From: konradoboza Date: Wed, 2 Oct 2024 13:03:37 +0200 Subject: [PATCH 3/3] [tmp] removed dev dependency to `ibexa/core` --- dependencies.json | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json deleted file mode 100644 index 163a185..0000000 --- a/dependencies.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "recipesEndpoint": "", - "packages": [ - { - "requirement": "dev-ibx-8811-SA-sessions-sharing as 5.0.x-dev", - "repositoryUrl": "https://github.com/ibexa/core", - "package": "ibexa/core", - "shouldBeAddedAsVCS": false - } - ] -}