Merge pull request #451 from jjrom/develop

Correct issue #429
jjrom · Oct 14, 2024 · b6335f8 · b6335f8
2 parents f0b5333 + aa82819
commit b6335f8
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 13 deletions.
diff --git a/app/resto/core/RestoConstants.php b/app/resto/core/RestoConstants.php
@@ -20,7 +20,7 @@ class RestoConstants
     // [IMPORTANT] Starting resto 7.x, default routes are defined in RestoRouter class
 
     // resto version
-    const VERSION = '9.0.0-RC15';
+    const VERSION = '9.0.0-RC16';
 
     /* ============================================================
      *              NEVER EVER TOUCH THESE VALUES

diff --git a/app/resto/core/api/STACAPI.php b/app/resto/core/api/STACAPI.php
@@ -1495,9 +1495,6 @@ private function getParentAndChilds($catalogId, $params)
                 if ( isset($parentAndChilds['parent']['title']) ) {
                     $element['title'] = $parentAndChilds['parent']['title'];
                 }
-                if ( isset($catalogs[$i]['rtype']) ) {
-                    $element['resto:type'] = $catalogs[$i]['rtype'];
-                }
                 $parentAndChilds['childs'][] = $element;
             }
 

diff --git a/app/resto/core/dbfunctions/CatalogsFunctions.php b/app/resto/core/dbfunctions/CatalogsFunctions.php
@@ -695,7 +695,7 @@ private function insertIntoCatalogFeature($featureId, $path, $catalogId, $collec
      * @return array
      */
     private function getCleanLinks($catalog, $userid, $baseUrl) {
-
+        
         $output = array(
             'links' => array(),
             'updateCatalogs' => array(),
@@ -715,9 +715,9 @@ private function getCleanLinks($catalog, $userid, $baseUrl) {
             if ( in_array($link['rel'], array('child', 'item', 'items')) ) {
 
                 if ( !isset($link['href']) ) {
-                    return RestoLogUtil::httpError(400, 'One link child has an empty href');    
+                    return RestoLogUtil::httpError(400, 'One link has an empty href');    
                 }
-                
+
                 /*
                  * [IMPORTANT] Only put EXTERNAL item/items to links array. Local one are processed later on
                  */
@@ -748,12 +748,27 @@ private function getCleanLinks($catalog, $userid, $baseUrl) {
 
                 }
 
-                /*
-                 * Store local collection within links
-                 */
-                if ( $link['rel'] === 'child' && str_starts_with($link['href'], $baseUrl . RestoRouter::ROUTE_TO_COLLECTIONS )) {
-                    $output['links'][] = $link;
-                    continue;   
+
+                if ( $link['rel'] === 'child') {
+
+                    /*
+                     * Avoid cycling (i.e. catalog self referencing one of its parent)
+                     */
+                    if (str_starts_with($link['href'], $baseUrl . RestoRouter::ROUTE_TO_CATALOGS )) {
+                        $exploded = explode('/', substr($link['href'], strlen($baseUrl . RestoRouter::ROUTE_TO_CATALOGS) + 1));
+                        if ( count($exploded) <= count(explode('/', $catalog['id'])) ) {
+                            return RestoLogUtil::httpError(400, 'Child ' . $link['href'] . ' is invalid because it references a parent resource');
+                        }
+                    }
+
+                    /*
+                     * Store local collection within links
+                     */
+                    if (str_starts_with($link['href'], $baseUrl . RestoRouter::ROUTE_TO_COLLECTIONS )) {
+                        $output['links'][] = $link;
+                        continue;   
+                    }
+
                 }
 
                 $exploded = explode($baseUrl . RestoRouter::ROUTE_TO_CATALOGS . '/', $link['href']);

diff --git a/docs/COLLECTIONS_AND_CATALOGS.md b/docs/COLLECTIONS_AND_CATALOGS.md
@@ -64,6 +64,12 @@ Then get the feature :
         # The catalog dummyCatalogChild1 is posted under /catalogs/dummyCatalog
         curl -X POST -d@examples/catalogs/dummyCatalogChild1.json "http://admin:admin@localhost:5252/catalogs/dummyCatalog"
 
+## Create a catalog under an existing catalog that cycle on itself
+
+        # The catalog dummyCatalogCycling is posted under /catalogs/dummyCatalogChild1 but reference one of this
+        # parent as a child which is forbiden
+        curl -X POST -d@examples/catalogs/dummyCatalogCycling.json "http://admin:admin@localhost:5252/catalogs/dummyCatalog/dummyCatalogChild1"
+
 ### Create a catalog with item
 
         # The catalog dummyCatalogWithItem is posted under /catalogs/dummyCatalog/dummyCatalogChild1

diff --git a/examples/catalogs/dummyCatalogCycling.json b/examples/catalogs/dummyCatalogCycling.json
@@ -0,0 +1,13 @@
+{
+    "id": "dummyCatalogCycling",
+    "title": "Dummy Catalog cycling",
+    "type": "Catalog",
+    "description":"There is nothing to say on this catalog",
+    "stac_version":"1.0.0",
+    "links":[
+        {
+            "rel":"child",
+            "href":"http://127.0.0.1:5252/catalogs/dummyCatalog/dummyCatalogChild1"
+        }
+    ]
+}