Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sync dispatcher immutable files with Dispatcher SDK and image v2.0.232 #470

Merged
merged 1 commit into from
Oct 17, 2024
Merged

sync dispatcher immutable files with Dispatcher SDK and image v2.0.232 #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dispatcher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
<!-- rules being inserted by archetype-pre-package.groovy -->
<requireTextFileChecksum>
<file>src/conf.d/available_vhosts/default.vhost</file>
<checksum>d4bc425c3f0ce825450019ce2501e14e</checksum>
<checksum>758e78c452d8d93685eaaf6d78561828</checksum>
<type>md5</type>
<message>There have been changes detected in a file which is supposed to be immutable according to https://docs.adobe.com/content/help/en/experience-manager-cloud-service/implementing/content-delivery/disp-overview.html#file-structure: src/conf.d/available_vhosts/default.vhost</message>
</requireTextFileChecksum>
<requireTextFileChecksum>
<file>src/conf.d/dispatcher_vhost.conf</file>
<checksum>8be9f535a8a4d15bd895cebb2a9e03ad</checksum>
<checksum>37d6ff3af540dea2d0b3eb6fcbd373cc</checksum>
<type>md5</type>
<message>There have been changes detected in a file which is supposed to be immutable according to https://docs.adobe.com/content/help/en/experience-manager-cloud-service/implementing/content-delivery/disp-overview.html#file-structure: src/conf.d/dispatcher_vhost.conf</message>
</requireTextFileChecksum>
Expand All @@ -77,7 +77,7 @@
</requireTextFileChecksum>
<requireTextFileChecksum>
<file>src/conf.dispatcher.d/available_farms/default.farm</file>
<checksum>3d8a01ff3465ac69b229bff6e90ecdeb</checksum>
<checksum>c5e805cade08939226c3c69ecd6ebc3a</checksum>
<type>md5</type>
<message>There have been changes detected in a file which is supposed to be immutable according to https://docs.adobe.com/content/help/en/experience-manager-cloud-service/implementing/content-delivery/disp-overview.html#file-structure: src/conf.dispatcher.d/available_farms/default.farm</message>
</requireTextFileChecksum>
Expand Down Expand Up @@ -113,7 +113,7 @@
</requireTextFileChecksum>
<requireTextFileChecksum>
<file>src/conf.dispatcher.d/filters/default_filters.any</file>
<checksum>33ab21977347e87a04dac059cd15fc06</checksum>
<checksum>89984e2bace630d1f2e160d1a01cf91f</checksum>
<type>md5</type>
<message>There have been changes detected in a file which is supposed to be immutable according to https://docs.adobe.com/content/help/en/experience-manager-cloud-service/implementing/content-delivery/disp-overview.html#file-structure: src/conf.dispatcher.d/filters/default_filters.any</message>
</requireTextFileChecksum>
Expand Down
2 changes: 1 addition & 1 deletion dispatcher/src/conf.d/available_vhosts/default.vhost
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Include conf.d/variables/custom.vars
# Some items cache with the wrong mime type
# Use this option to use the name to auto-detect mime types when cached improperly
ModMimeUsePathInfo On
# Use this option to avoid cache poisioning
# Use this option to avoid cache poisoning
# Sling will return /content/image.jpg as well as /content/image.jpg/ but apache can't search /content/image.jpg/ as a file
# Apache will treat that like a directory. This assures the last slash is never stored in cache
DirectorySlash Off
Expand Down
141 changes: 88 additions & 53 deletions dispatcher/src/conf.d/dispatcher_vhost.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Include conf.d/variables/global.vars

# Liveness probe URL
Alias "/system/probes/live" probes/live-status.json
# Readiness probe URL
Alias "/system/probes/ready" probes/ready-status.json
# Startup probe URL
Alias "/system/probes/start" probes/startup-status.json

Expand Down Expand Up @@ -111,16 +109,53 @@ Alias "/system/probes/start" probes/startup-status.json
</LocationMatch>
</IfDefine>

# Legacy /systemready mapped to new Health probe URL /system/probes/health in AEM
<Location "/systemready">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
RewriteEngine Off
</Location>

# Allow ingressroute checks through on /system/probes/health (regardless of dispatcher filters)
<Location "/system/probes/health">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
RewriteEngine Off
# managed redirect maps not configured (= backward-compatible)
<IfFile !opt-in/managed-rewrite-maps.yaml>
# Legacy /systemready mapped to new Health probe URL /system/probes/health in AEM
<Location "/systemready">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
RewriteEngine Off
</Location>

# Allow ingressroute checks through on /system/probes/health (regardless of dispatcher filters)
<Location "/system/probes/health">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
RewriteEngine Off
</Location>
</IfFile>
# managed redirect maps configured
<IfFile opt-in/managed-rewrite-maps.yaml>
# check if traffic can be already allowed to pass (404/redirects not existing yet prevention)
<IfFile /tmp/rewrites/ready>
# Legacy /systemready mapped to new Health probe URL /system/probes/health in AEM
<Location "/systemready">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
RewriteEngine Off
</Location>

# Allow ingressroute checks through on /system/probes/health (regardless of dispatcher filters)
<Location "/system/probes/health">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/health
RewriteEngine Off
</Location>
</IfFile>
# else forcing "403 Forbidden" for Health probes
# "Any code greater than or equal to 200 and less than 400 indicates success. Any other code indicates failure."
# as per https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
<IfFile !/tmp/rewrites/ready>
<Location "/systemready">
Require all denied
</Location>
<Location "/system/probes/health">
Require all denied
</Location>
</IfFile>
</IfFile>

# Readiness probe for K8S Endpoints also depends on AEM readiness probe
<Location "/system/probes/ready">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/system/probes/ready
RewriteEngine Off
</Location>

# Allow access to CRXDE on dev environment
Expand Down Expand Up @@ -228,48 +263,48 @@ Alias "/gitinit-status" metadata/gitinit-status.json
Require expr "%{HTTP_HOST} == '${POD_NAME}'"
</Directory>

# Dedicated vhost for EaaS:
# Dedicated vhost for Adobe proxy testing:
# (currently disabled, but customers can expect it to be enabled in future versions - CQ-4349728)
#<VirtualHost *:80>
# ServerName "test.eaas"
# # possibility to make overrides before directives in this vhost
# IncludeOptional conf.d/includes/first-listed-vhost.pre.includes
# # since this vhost is first-listed one, this setting influences other vhosts - see https://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize
# LimitRequestFieldSize 32768
# DocumentRoot /var/www/localhost/htdocs
# AllowEncodedSlashes NoDecode
# <IfModule mod_headers.c>
# Header add X-Vhost "test.eaas"
# </IfModule>
# <Directory "/var/www/localhost/htdocs">
# Options Indexes FollowSymLinks
# AllowOverride None
# Require all granted
# </Directory>
#
# # SKYOPS-49434: Allow EaaS to access publish instance directly for dev and stage environments when test.eaas vhost is requested
# <IfDefine ENVIRONMENT_DEV>
# <LocationMatch "/">
# ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
# RewriteEngine Off
# </LocationMatch>
# </IfDefine>
# <IfDefine ENVIRONMENT_STAGE>
# <LocationMatch "/">
# ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
# RewriteEngine Off
# </LocationMatch>
# </IfDefine>
# # 403 Forbidden on prod
# <IfDefine ENVIRONMENT_PROD>
# <IfModule mod_rewrite.c>
# RewriteEngine on
# RewriteRule ^ - [F]
# </IfModule>
# </IfDefine>
# # possibility to make overrides after directives in this vhost
# IncludeOptional conf.d/includes/first-listed-vhost.post.includes
#</VirtualHost>
<VirtualHost *:80>
ServerName "test.proxy"
# possibility to make overrides before directives in this vhost
IncludeOptional conf.d/includes/first-listed-vhost.pre.includes
# since this vhost is first-listed one, this setting influences other vhosts - see https://httpd.apache.org/docs/2.4/mod/core.html#limitrequestfieldsize
LimitRequestFieldSize 32768
DocumentRoot /var/www/localhost/htdocs
AllowEncodedSlashes NoDecode
<IfModule mod_headers.c>
Header add X-Vhost "test.proxy"
</IfModule>
<Directory "/var/www/localhost/htdocs">
Options Indexes FollowSymLinks
AllowOverride None
Require all granted
</Directory>

# SKYOPS-49434: Allow EaaS to access publish instance directly for dev and stage environments when test.proxy vhost is requested
<IfDefine ENVIRONMENT_DEV>
<LocationMatch "/">
ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
RewriteEngine Off
</LocationMatch>
</IfDefine>
<IfDefine ENVIRONMENT_STAGE>
<LocationMatch "/">
ProxyPassMatch http://${AEM_HOST}:${AEM_PORT}
RewriteEngine Off
</LocationMatch>
</IfDefine>
# 403 Forbidden on prod
<IfDefine ENVIRONMENT_PROD>
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteRule ^ - [F]
</IfModule>
</IfDefine>
# possibility to make overrides after directives in this vhost
IncludeOptional conf.d/includes/first-listed-vhost.post.includes
</VirtualHost>

# Customer's vhosts:
Include conf.d/enabled_vhosts/*.vhost
Expand Down
14 changes: 13 additions & 1 deletion dispatcher/src/conf.dispatcher.d/available_farms/default.farm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
#

/publishfarm {
# Dispatcher Debugging Flag
# Include X-Cache-Info response header if X-Dispatcher-Info is in request header
# /info "1"
# client headers which should be passed through to the render instances
# (feature supported since dispatcher build 2.6.3.5222)
/clientheaders {
Expand All @@ -34,6 +37,7 @@
# /url "/libs/granite/dispatcher/content/vanityUrls.html"
# /file "/tmp/vanity_urls"
# /delay 300
# /loadOnStartup 1
# }
# allow propagation of replication posts (should seldomly be used)
/propagateSyndPost "0"
Expand Down Expand Up @@ -86,9 +90,17 @@
}
# The ignoreUrlParams section contains query string parameter names that
# should be ignored when determining whether some request's output can be
# cached or delivered from cache.
# cached or delivered from cache. Please only enable one of the examples below.
# The recommended setting is to ignore all parameters and selectively allow them. e.g.
# /ignoreUrlParams {
# /0001 { /glob "*" /type "allow" }
# /0002 { /glob "page" /type "deny" }
# /0003 { /glob "product" /type "deny" }
# }
#
# In this example configuration, the "q" parameter will be ignored as
# well as general marketing related parameters such as e.g. utm_campaign.
# If any other parameters are specified the request gets forwarded to the publisher.
# Marketing parameters can normally be ignored on most websites as they are tracked
# through different means.
# /ignoreUrlParams {
Expand Down
4 changes: 2 additions & 2 deletions dispatcher/src/conf.dispatcher.d/filters/default_filters.any
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
# GraphQL Persisted Queries & preflight requests
/0061 { /type "allow" /method '(GET|POST|OPTIONS)' /url "/graphql/execute.json*" }

# Allow Forms Document Services requests
/0062 { /type "allow" /method '(GET|POST)' /url "/adobe/forms/*" }
# Allow Adaptive Form & Document Services requests
/0062 { /type "allow" /method '(GET|POST|OPTIONS)' /url "/adobe/forms/*" }

# Allow PUT for Forms DocAssurance Services Decryption API
/0063 { /type "allow" /method "PUT" /url "/adobe/forms/document/assure/encrypt" }
Loading