Merge pull request #536 from EOxServer/cache-control-headers-for-rend…

…erer

Add cache-control header to urls reachable from VS

eoxserver/services/config.py

@@ -0,0 +1,44 @@
+# ------------------------------------------------------------------------------
+#
+# Project: EOxServer <http://eoxserver.org>
+# Authors: Bernhard Mallinger <bernhard.mallinger@eox.at>
+#
+# ------------------------------------------------------------------------------
+# Copyright (C) 2022 EOX IT Services GmbH
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies of this Software or works derived from this Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+# ------------------------------------------------------------------------------
+
+import typing
+
+from django.conf import settings
+from django.views.decorators.cache import cache_control
+
+_cache_time_str = getattr(settings, "EOXS_RENDERER_CACHE_TIME", None)
+
+EOXS_RENDERER_CACHE_TIME: typing.Optional[int] = (
+    int(_cache_time_str) if _cache_time_str is not None else None
+)
+
+def apply_cache_header(view):
+    return (
+        cache_control(max_age=EOXS_RENDERER_CACHE_TIME)(view)
+        if EOXS_RENDERER_CACHE_TIME is not None
+        else view
+    )

eoxserver/services/opensearch/urls.py

@@ -31,16 +31,20 @@
 except ImportError:
     from django.urls import include, re_path
 
+from eoxserver.services.config import apply_cache_header
 from eoxserver.services.opensearch.views import description, search
 
+
+search_cached = apply_cache_header(search)
+
 app_name = 'opensearch'
 urlpatterns = [
     re_path(r'^$', description, name='description'),
-    re_path(r'^(?P<format_name>[^/]+)/$', search, name='search'),
+    re_path(r'^(?P<format_name>[^/]+)/$', search_cached, name='search'),
     re_path(r'^collections/(?P<collection_id>[^/]+)/', include(([
         re_path(r'^$', description, name='description'),
         re_path(
-            r'^(?P<format_name>[^/]+)/$', search,
+            r'^(?P<format_name>[^/]+)/$', search_cached,
             name='search'
         )
     ], 'collection')))

eoxserver/services/opensearch/views.py

@@ -26,6 +26,7 @@
 #-------------------------------------------------------------------------------
 
 
+from django.conf import settings
 from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt
 

eoxserver/services/urls.py

@@ -35,9 +35,10 @@
     from django.urls import reverse
 
 from eoxserver.services import views
+from eoxserver.services.config import apply_cache_header
 
 urlpatterns = [
-    re_path(r'^$', views.ows, name='ows')
+    re_path(r'^$', apply_cache_header(views.ows), name='ows',)
 ]
 
 

eoxserver/services/views.py

@@ -33,6 +33,7 @@
 import logging
 import traceback
 
+from django.conf import settings
 from django.http import HttpResponse
 try:
     from django.http import StreamingHttpResponse