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

Adding updated immutable files generated by AEM Dispatcher Tools 2.0.91 #918

Merged
merged 1 commit into from
Apr 19, 2022
Merged

Adding updated immutable files generated by AEM Dispatcher Tools 2.0.91 #918

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
9 changes: 6 additions & 3 deletions src/main/archetype/dispatcher.cloud/src/conf.d/available_vhosts/default.vhost
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This is the default publish virtualhost definition for Apache.
# This is the default publish virtualhost definition for Apache.
#
# DO NOT EDIT this file, your changes will have no impact on your deployment.
#
Expand All @@ -23,7 +23,7 @@ Include conf.d/variables/custom.vars
<IfModule mod_headers.c>
Header add X-Vhost "publish"
</IfModule>
<Directory "${DOCROOT}">
<Directory />
<IfModule disp_apache2.c>
# Some items cache with the wrong mime type
# Use this option to use the name to auto-detect mime types when cached improperly
Expand All @@ -37,14 +37,17 @@ Include conf.d/variables/custom.vars
</IfModule>
Options FollowSymLinks
AllowOverride None
Require all granted
# Insert filter
SetOutputFilter DEFLATE
# Don't compress images
SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
# Prevent clickjacking
Header always append X-Frame-Options SAMEORIGIN
</Directory>
<Directory "${DOCROOT}">
AllowOverride None
Require all granted
</Directory>
<IfModule disp_apache2.c>
# Enabled to allow rewrites to take affect and not be ignored by the dispatcher module
DispatcherUseProcessedURL On
Expand Down
47 changes: 46 additions & 1 deletion src/main/archetype/dispatcher.cloud/src/conf.d/dispatcher_vhost.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,28 @@ ServerName dispatcher
Include conf.d/variables/default.vars
Include conf.d/variables/global.vars


# WARNING!!! The probe paths below are INTERNAL and RESERVED - please DO NOT USE them in your virtual host configurations!

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

# internal probes endpoint
<LocationMatch "/system/probes">
RewriteEngine Off
</LocationMatch>

<Directory "/etc/httpd/probes">
SetHandler default-handler
AllowOverride None
Require all granted
</Directory>


#SKYOPS-13837: Proxy static frontend code requests through dispatcher
<IfDefine FRONTEND_SUPPORT>
SSLProxyEngine on
Expand Down Expand Up @@ -76,12 +98,18 @@ Include conf.d/variables/global.vars
Header unset Age
</IfDefine>

# Allow ingressroute checks through on /systemready (regardless of dispatcher filters)
# (legacy) Allow ingressroute checks through on /systemready (regardless of dispatcher filters)
<Location "/systemready">
ProxyPass http://${AEM_HOST}:${AEM_PORT}/systemready
RewriteEngine Off
</Location>

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

# Allow access to CRXDE on dev environment
<IfDefine ENVIRONMENT_DEV>
<LocationMatch "/crx/(de|server)/">
Expand All @@ -93,6 +121,10 @@ Include conf.d/variables/global.vars
# CQ-4287185: Allow access to magento reverse-proxy endpoint
<IfDefine COMMERCE>
SSLProxyEngine on
# CIF-2557 add ProxyRemote to tunnel reverse-proxy traffic through egress proxy if available
<IfDefine HTTP_EGRESS_PROXY>
ProxyRemote ${COMMERCE_ENDPOINT} "http://${AEM_HTTP_PROXY_HOST}:${AEM_HTTP_PROXY_PORT}"
</IfDefine>
<LocationMatch "/api/graphql">
ProxyPass ${COMMERCE_ENDPOINT}
ProxyPassReverse ${COMMERCE_ENDPOINT}
Expand All @@ -107,6 +139,19 @@ Include conf.d/variables/global.vars
Require all denied
</Directory>

# internal metadata endpoint
Alias "/gitinit-status" /etc/httpd/metadata/gitinit-status.json

<LocationMatch "/gitinit-status">
RewriteEngine Off
</LocationMatch>

<Directory "/etc/httpd/metadata">
SetHandler default-handler
AllowOverride None
Require expr "%{HTTP_HOST} == '${POD_NAME}'"
</Directory>

Include conf.d/enabled_vhosts/*.vhost

# Create a catch-all vhost
Expand Down
15 changes: 12 additions & 3 deletions src/main/archetype/dispatcher.cloud/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 @@ -52,7 +52,7 @@

# AEM Forms specific filters
# to allow AF specific endpoints for prefill, submit and sign
/0032 { /type "allow" /path "/content/forms/af/*" /method "POST" /selectors '(submit|internalsubmit|agreement|signSubmit|prefilldata|save)' /extension '(jsp|json)' }
/0032 { /type "allow" /path "/content/forms/af/*" /method "POST" /selectors '(submit|internalsubmit|agreement|signSubmit|prefilldata|save|analyticsconfigparser)' /extension '(jsp|json)' }

# to allow AF specific endpoints for thank you page
/0033 { /type "allow" /path "/content/forms/af/*" /method "GET" /selectors '(guideThankYouPage|guideAsyncThankYouPage)' /extension '(html)'}
Expand All @@ -69,6 +69,9 @@
# to allow invoke service functionality (FDM)
/0037 { /type "allow" /path "/content/forms/*" /selectors '(af)' /extension '(dermis)' }

# to allow forms portal draft and submissions component operation servlet
/0038 { /type "allow" /path "/content/*" /method "GET" /selectors '(fp)' /extension '(operation)' }

# AEM Screens Filters
# to allow AEM Screens channels selectors
/0050 { /type "allow" /method "GET" /url "/screens/channels.json" }
Expand All @@ -80,12 +83,18 @@
# to allow site30 theme servlet
/0052 { /type "allow" /extension "theme" /path "/content/*" }

# Allow manifest.webmanifest files located in the content
/0053 { /type "allow" /extension "webmanifest" /path "/content/*/manifest" }

# Allow Apache Sling Sitemap selectors: sitemap, sitemap-index, sitemap.any-nested-or-named-sitemap
/0054 { /type "allow" /method "GET" /path "/content/*" /selectors 'sitemap(-index)?' /extension "xml" }

# Allow GraphQL & preflight requests
# GraphQL also supports "GET" requests, if you intend to use "GET" add a rule in filters.any
/0060 { /type "allow" /method '(POST|OPTIONS)' /url "/content/_cq_graphql/*/endpoint.json" }

# GraphQL Persisted Queries & preflight requests
/0061 { /type "allow" /method '(GET|POST|OPTIONS)' /url "/graphql/execute.json*" }

# Allow Forms Doc Generation requests
/0062 { /type "allow" /method "POST" /url "/adobe/forms/doc/*" }
# Allow Forms Document Services requests
/0062 { /type "allow" /method "POST" /url "/adobe/forms/*" }