diff --git a/composer.json b/composer.json
index 6abfc4460bcc53e638bd1555c46c32abe65eb7bf..6c97470805a9f510515b34904fef1177d817ae36 100644
--- a/composer.json
+++ b/composer.json
@@ -98,6 +98,7 @@
"drupal/block_permissions": "1.1",
"drupal/block_region_permissions": "1.4",
"drupal/bootstrap": "^3.23",
+ "drupal/cache_control_override": "^1.0@alpha",
"drupal/ckeditor_indentblock": "1.0.0-beta2",
"drupal/config_direct_save": "1.0",
"drupal/config_ignore": "2.3",
diff --git a/composer.lock b/composer.lock
index 03b527fde588cdc0c18f503cea32197951939a36..3cfc95e1442f4d01d0d312a43b43aba26138161d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "f8c116ab8dad7b5b9787b82b847a6663",
+ "content-hash": "483958ad644d5bd3351af88c32212e2b",
"packages": [
{
"name": "alchemy/zippy",
@@ -2651,6 +2651,50 @@
"irc": "irc://irc.freenode.org/drupal-bootstrap"
}
},
+ {
+ "name": "drupal/cache_control_override",
+ "version": "1.0.0-alpha2",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupalcode.org/project/cache_control_override.git",
+ "reference": "8.x-1.0-alpha2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/cache_control_override-8.x-1.0-alpha2.zip",
+ "reference": "8.x-1.0-alpha2",
+ "shasum": "24f97b80eb3d335256eabd2e5e71886526a2385a"
+ },
+ "require": {
+ "drupal/core": "^8 || ^9"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "drupal": {
+ "version": "8.x-1.0-alpha2",
+ "datestamp": "1597733165",
+ "security-coverage": {
+ "status": "not-covered",
+ "message": "Project has not opted into security advisory coverage!"
+ }
+ }
+ },
+ "notification-url": "https://packages.drupal.org/8/downloads",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "asgorobets",
+ "homepage": "https://www.drupal.org/user/1399950"
+ }
+ ],
+ "description": "Override page Cache-Control header based on bubbled cacheability metadata.",
+ "homepage": "https://www.drupal.org/project/cache_control_override",
+ "support": {
+ "source": "https://git.drupalcode.org/project/cache_control_override"
+ }
+ },
{
"name": "drupal/captcha",
"version": "1.1.0",
@@ -13559,6 +13603,7 @@
"aliases": [],
"minimum-stability": "dev",
"stability-flags": {
+ "drupal/cache_control_override": 15,
"drupal/multiple_fields_remove_button": 15
},
"prefer-stable": true,
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 2ba54c61d693e033416b69370a249135c3eae254..e0aade52f2bc82bf9887eaf6622d5bef176e2262 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2734,6 +2734,52 @@
"irc": "irc://irc.freenode.org/drupal-bootstrap"
}
},
+ {
+ "name": "drupal/cache_control_override",
+ "version": "1.0.0-alpha2",
+ "version_normalized": "1.0.0.0-alpha2",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupalcode.org/project/cache_control_override.git",
+ "reference": "8.x-1.0-alpha2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/cache_control_override-8.x-1.0-alpha2.zip",
+ "reference": "8.x-1.0-alpha2",
+ "shasum": "24f97b80eb3d335256eabd2e5e71886526a2385a"
+ },
+ "require": {
+ "drupal/core": "^8 || ^9"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "drupal": {
+ "version": "8.x-1.0-alpha2",
+ "datestamp": "1597733165",
+ "security-coverage": {
+ "status": "not-covered",
+ "message": "Project has not opted into security advisory coverage!"
+ }
+ }
+ },
+ "installation-source": "dist",
+ "notification-url": "https://packages.drupal.org/8/downloads",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "asgorobets",
+ "homepage": "https://www.drupal.org/user/1399950"
+ }
+ ],
+ "description": "Override page Cache-Control header based on bubbled cacheability metadata.",
+ "homepage": "https://www.drupal.org/project/cache_control_override",
+ "support": {
+ "source": "https://git.drupalcode.org/project/cache_control_override"
+ }
+ },
{
"name": "drupal/captcha",
"version": "1.1.0",
diff --git a/web/modules/cache_control_override/LICENSE.txt b/web/modules/cache_control_override/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d159169d1050894d3ea3b98e1c965c4058208fe1
--- /dev/null
+++ b/web/modules/cache_control_override/LICENSE.txt
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/web/modules/cache_control_override/cache_control_override.info.yml b/web/modules/cache_control_override/cache_control_override.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..346303dc625573b168b211460cfe45d24ce45464
--- /dev/null
+++ b/web/modules/cache_control_override/cache_control_override.info.yml
@@ -0,0 +1,11 @@
+name: Cache Control Override
+type: module
+description: Override page Cache-Control header based on bubbled cacheability metadata.
+core: 8.x
+core_version_requirement: ^8 || ^9
+package: Performance and scalability
+
+# Information added by Drupal.org packaging script on 2020-08-18
+version: '8.x-1.0-alpha2'
+project: 'cache_control_override'
+datestamp: 1597733167
diff --git a/web/modules/cache_control_override/cache_control_override.services.yml b/web/modules/cache_control_override/cache_control_override.services.yml
new file mode 100644
index 0000000000000000000000000000000000000000..557687191f738e132ba7da07a6bb184e68cd0201
--- /dev/null
+++ b/web/modules/cache_control_override/cache_control_override.services.yml
@@ -0,0 +1,10 @@
+services:
+ cache_control_override.cache_control_override_subscriber:
+ class: Drupal\cache_control_override\EventSubscriber\CacheControlOverrideSubscriber
+ tags:
+ - { name: event_subscriber }
+ cache_control_override.page_cache_response_policy.deny_on_cache_override:
+ class: Drupal\cache_control_override\PageCache\DenyOnCacheControlOverride
+ public: false
+ tags:
+ - { name: page_cache_response_policy }
diff --git a/web/modules/cache_control_override/src/EventSubscriber/CacheControlOverrideSubscriber.php b/web/modules/cache_control_override/src/EventSubscriber/CacheControlOverrideSubscriber.php
new file mode 100644
index 0000000000000000000000000000000000000000..6ce37d8f06d83dea87b0dee4ddc01d741d2b108f
--- /dev/null
+++ b/web/modules/cache_control_override/src/EventSubscriber/CacheControlOverrideSubscriber.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\cache_control_override\EventSubscriber;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableResponseInterface;
+use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * Cache Control Override.
+ */
+class CacheControlOverrideSubscriber implements EventSubscriberInterface {
+
+ /**
+ * Overrides cache control header if any of override methods are enabled.
+ *
+ * @param \Symfony\Component\HttpKernel\Event\FilterResponseEvent $event
+ * The event to process.
+ */
+ public function onRespond(FilterResponseEvent $event) {
+ if (!$event->isMasterRequest()) {
+ return;
+ }
+
+ $response = $event->getResponse();
+
+ // If the current response isn't an implementation of the
+ // CacheableResponseInterface, then there is nothing we can override.
+ if (!$response instanceof CacheableResponseInterface) {
+ return;
+ }
+
+ // If FinishResponseSubscriber didn't set the response as cacheable, then
+ // don't override anything.
+ if (!$response->headers->hasCacheControlDirective('max-age') || !$response->headers->hasCacheControlDirective('public')) {
+ return;
+ }
+
+ $max_age = $response->getCacheableMetadata()->getCacheMaxAge();
+
+ // We treat permanent cache max-age as default therefore we don't override
+ // the max-age.
+ if ($max_age != Cache::PERMANENT) {
+ $response->headers->set('Cache-Control', 'public, max-age=' . $max_age);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getSubscribedEvents() {
+ $events[KernelEvents::RESPONSE][] = ['onRespond'];
+ return $events;
+ }
+
+}
diff --git a/web/modules/cache_control_override/src/PageCache/DenyOnCacheControlOverride.php b/web/modules/cache_control_override/src/PageCache/DenyOnCacheControlOverride.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f8f21291824f53dd0c1af159bd4cf3f5ae9accc
--- /dev/null
+++ b/web/modules/cache_control_override/src/PageCache/DenyOnCacheControlOverride.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\cache_control_override\PageCache;
+
+use Drupal\Core\Cache\CacheableResponseInterface;
+use Drupal\Core\PageCache\ResponsePolicyInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Cache policy for responses that have a bubbled max-age=0.
+ */
+class DenyOnCacheControlOverride implements ResponsePolicyInterface {
+
+ /**
+ * {@inheritdoc}
+ */
+ public function check(Response $response, Request $request) {
+ if (!$response instanceof CacheableResponseInterface) {
+ return NULL;
+ }
+
+ if ($response->getCacheableMetadata()->getCacheMaxAge() === 0) {
+ // @TODO: This will affect users using Internal Page Cache as well, find a way to document that.
+ return static::DENY;
+ }
+ }
+
+}
diff --git a/web/modules/cache_control_override/tests/modules/cache_control_override_test/cache_control_override_test.info.yml b/web/modules/cache_control_override/tests/modules/cache_control_override_test/cache_control_override_test.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..8707e0d1c02a934ed7346fa544d366995c8fff1a
--- /dev/null
+++ b/web/modules/cache_control_override/tests/modules/cache_control_override_test/cache_control_override_test.info.yml
@@ -0,0 +1,12 @@
+name: Cache Control Override test
+type: module
+description: 'Provides functionality for testing Cache Control Override.'
+hidden: true
+core: 8.x
+dependencies:
+ - cache_control_override
+
+# Information added by Drupal.org packaging script on 2020-08-18
+version: '8.x-1.0-alpha2'
+project: 'cache_control_override'
+datestamp: 1597733167
diff --git a/web/modules/cache_control_override/tests/modules/cache_control_override_test/cache_control_override_test.routing.yml b/web/modules/cache_control_override/tests/modules/cache_control_override_test/cache_control_override_test.routing.yml
new file mode 100644
index 0000000000000000000000000000000000000000..84596937af315632056384d467a14ec5c6811cde
--- /dev/null
+++ b/web/modules/cache_control_override/tests/modules/cache_control_override_test/cache_control_override_test.routing.yml
@@ -0,0 +1,13 @@
+cache_control_override_test.permanent:
+ path: '/cco'
+ defaults:
+ _controller: '\Drupal\cache_control_override_test\Controller\CacheControl::maxAge'
+ requirements:
+ _access: 'TRUE'
+
+cache_control_override_test.max_age:
+ path: '/cco/{max_age}'
+ defaults:
+ _controller: '\Drupal\cache_control_override_test\Controller\CacheControl::maxAge'
+ requirements:
+ _access: 'TRUE'
diff --git a/web/modules/cache_control_override/tests/modules/cache_control_override_test/src/Controller/CacheControl.php b/web/modules/cache_control_override/tests/modules/cache_control_override_test/src/Controller/CacheControl.php
new file mode 100644
index 0000000000000000000000000000000000000000..28525d86c6c4c71ebb53bf8f947cd496c1b3b1e8
--- /dev/null
+++ b/web/modules/cache_control_override/tests/modules/cache_control_override_test/src/Controller/CacheControl.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\cache_control_override_test\Controller;
+
+use Drupal\Core\Cache\Cache;
+
+/**
+ * Controllers for testing the cache control override.
+ */
+class CacheControl {
+
+ /**
+ * Controller callback: Test content with a specified max age.
+ *
+ * @param int $max_age
+ * Max age value to be used in the response.
+ *
+ * @return array
+ * Render array of page output.
+ */
+ public function maxAge($max_age = Cache::PERMANENT) {
+
+ return [
+ '#markup' => 'Max age test content',
+ '#cache' => ['max-age' => $max_age],
+ ];
+ }
+
+}
diff --git a/web/modules/cache_control_override/tests/src/Functional/CacheControlOverrideMaxAgeTest.php b/web/modules/cache_control_override/tests/src/Functional/CacheControlOverrideMaxAgeTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..30893660f9226177021cee71a34ee0cb03d0bd27
--- /dev/null
+++ b/web/modules/cache_control_override/tests/src/Functional/CacheControlOverrideMaxAgeTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\Tests\cache_control_override\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Tests the cache control override.
+ *
+ * @group cache_control_override
+ */
+class CacheControlOverrideMaxAgeTest extends BrowserTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ public static $modules = [
+ 'cache_control_override',
+ 'cache_control_override_test',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setUp() {
+ parent::setUp();
+
+ $config = $this->config('system.performance');
+ $config->set('cache.page.max_age', 3600);
+ $config->save();
+ }
+
+ /**
+ * Test the cache properties in response header data.
+ */
+ public function testMaxAge() {
+
+ $this->drupalGet('cco');
+ $this->assertSession()->responseContains('Max age test content');
+ $this->assertSession()->responseHeaderContains('Cache-Control', 'max-age=3600, public');
+
+ $this->drupalGet('cco/333');
+ $this->assertSession()->responseHeaderContains('Cache-Control', 'max-age=333, public');
+
+ $this->drupalGet('cco/0');
+ $this->assertSession()->responseHeaderContains('Cache-Control', 'max-age=0, public');
+ }
+
+}