Adding redirect to /stac/stac when using twitcher

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.31.2
+current_version = 1.31.3
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2023-09-13T18:07:31Z
+search = {current_version} 2023-09-21T01:15:38Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-09-13T18:07:31Z
+values = 2023-09-21T01:15:38Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -15,6 +15,11 @@
 [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
 ------------------------------------------------------------------------------------------------------------------
 
+[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+
+[1.31.3](https://github.com/bird-house/birdhouse-deploy/tree/1.31.3) (2023-09-21)
+------------------------------------------------------------------------------------------------------------------
+
 ## Fixes
 
 - Move initial ``stac`` service Magpie definition under its component configuration.
@@ -33,6 +38,10 @@
   `optional-components/stac-public-access/config/magpie/permissions.cfg` in order to align
   with permissions-specific contents as accomplished with other components.
 
+- Fix invalid endpoint redirect for `STAC` when using Twitcher/Magpie.
+
+- Apply Magpie permission on `/stac/stac` since the second `/stac` is needed to secure access properly.
+
 [1.31.2](https://github.com/bird-house/birdhouse-deploy/tree/1.31.2) (2023-09-13)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.31.2
+override APP_VERSION := 1.31.3
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

README.rst

@@ -14,13 +14,13 @@ for a full-fledged production platform.
     * - releases
       - | |latest-version| |commits-since|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.31.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.31.3.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.3...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.31.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.31.3-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.31.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.31.3
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-1.31.2 2023-09-13T18:07:31Z
+1.31.3 2023-09-21T01:15:38Z

birdhouse/components/stac/config/proxy/conf.extra-service.d/stac.conf.template

@@ -12,6 +12,11 @@
         include /etc/nginx/conf.d/cors.include;
     }
 
+    # Automatically redirect to /stac/stac and exclude redirect when already using /stac 
+    location ~ ^${TWITCHER_PROTECTED_PATH}/stac(?!/stac) {
+        return 302 ${TWITCHER_PROTECTED_PATH}/stac/stac;
+    }
+
     location /stac-browser/ {
         # STAC API is protected behind Twitcher so we might not need to protect the browser as well.
         # In case we encounter a valid use case in which we need to protect the browser, we might 

birdhouse/config/canarie-api/docker_configuration.py.template

@@ -109,8 +109,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.31.2',
-            'releaseTime': '2023-09-13T18:07:31Z',
+            'version': '1.31.3',
+            'releaseTime': '2023-09-21T01:15:38Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -142,8 +142,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.31.2',
-            'releaseTime': '2023-09-13T18:07:31Z',
+            'version': '1.31.3',
+            'releaseTime': '2023-09-21T01:15:38Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/optional-components/stac-public-access/config/magpie/permissions.cfg

@@ -1,9 +1,11 @@
 permissions:
   - service: stac
+    resource: /stac
     permission: read
     group: anonymous
     action: create
   - service: stac
+    resource: /stac
     permission: write
     group: stac-admin
     action: create

docs/source/conf.py

@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.31.2'
+version = '1.31.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.31.2'
+release = '1.31.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.