Merge pull request #66 from robkooper/fix-proxy-and-more

Fix proxy and more

Author: lmarini

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+### Fixed
+- proxy will no correctly handle paths that end with a / at the end.
+
 ## 1.11.0 - 2020-08-31
 
 ### Added

app/controllers/Application.scala

@@ -31,8 +31,8 @@ class Application @Inject() (files: FileService, collections: CollectionService,
    * @param path the path minus the slash
    * @return moved permanently to path without /
    */
-  def untrail(path: String) = Action {
-    MovedPermanently("/" + path)
+  def untrail(path: String) = Action { implicit request =>
+    MovedPermanently(s"${Utils.baseUrl(request, false)}/${path}")
   }
 
   def swaggerUI = Action { implicit request =>

app/controllers/Utils.scala

@@ -14,8 +14,12 @@ object Utils {
    * Return base url given a request. This will add http or https to the front, for example
    * https://localhost:9443 will be returned if it is using https.
    */
-  def baseUrl(request: Request[Any]) = {
-    routes.Files.list().absoluteURL(https(request))(request).replace("/files", "")
+  def baseUrl(request: Request[Any], absolute: Boolean = true) = {
+    if (absolute) {
+      routes.Files.list().absoluteURL(https(request))(request).replace("/files", "")
+    } else {
+      routes.Files.list().url.replace("/files", "")
+    }
   }
 
   /**

conf/routes

@@ -7,6 +7,13 @@
 
 #OPTIONS       /*path                                                                   @controllers.Application.options(path)
 OPTIONS        /*path                                                                   api.ApiHelp.options(path)
+
+# operations are applied in this order, to prevent untrail from removing
+# the trailing / at the end of the /api/proxy calls it is placed before
+# the untrail call
+GET            /api/proxy/:endpoint_key                                                 @api.Proxy.get(endpoint_key: String, pathSuffix: String = null)
+GET            /api/proxy/:endpoint_key/                                                @api.Proxy.get(endpoint_key: String, pathSuffix: String = "")
+GET            /api/proxy/:endpoint_key/*pathSuffix                                     @api.Proxy.get(endpoint_key: String, pathSuffix: String)
 GET            /*path/                                                                  @controllers.Application.untrail(path: String)
 
 # ----------------------------------------------------------------------
@@ -859,17 +866,14 @@ DELETE       /api/standardvocab/:id
 # PROXY API
 # ----------------------------------------------------------------------
 
-GET         /api/proxy/:endpoint_key                                                        @api.Proxy.get(endpoint_key: String, pathSuffix: String = null)
-GET         /api/proxy/:endpoint_key/                                                       @api.Proxy.get(endpoint_key: String, pathSuffix: String = null)
-GET         /api/proxy/:endpoint_key/*pathSuffix                                            @api.Proxy.get(endpoint_key: String, pathSuffix: String)
 POST        /api/proxy/:endpoint_key                                                        @api.Proxy.post(endpoint_key: String, pathSuffix: String = null)
-POST        /api/proxy/:endpoint_key/                                                       @api.Proxy.post(endpoint_key: String, pathSuffix: String = null)
+POST        /api/proxy/:endpoint_key/                                                       @api.Proxy.post(endpoint_key: String, pathSuffix: String = "")
 POST        /api/proxy/:endpoint_key/*pathSuffix                                            @api.Proxy.post(endpoint_key: String, pathSuffix: String)
 PUT         /api/proxy/:endpoint_key                                                        @api.Proxy.put(endpoint_key: String, pathSuffix: String = null)
-PUT         /api/proxy/:endpoint_key/                                                       @api.Proxy.put(endpoint_key: String, pathSuffix: String = null)
+PUT         /api/proxy/:endpoint_key/                                                       @api.Proxy.put(endpoint_key: String, pathSuffix: String = "")
 PUT         /api/proxy/:endpoint_key/*pathSuffix                                            @api.Proxy.put(endpoint_key: String, pathSuffix: String)
 DELETE      /api/proxy/:endpoint_key                                                        @api.Proxy.delete(endpoint_key: String, pathSuffix: String = null)
-DELETE      /api/proxy/:endpoint_key/                                                       @api.Proxy.delete(endpoint_key: String, pathSuffix: String = null)
+DELETE      /api/proxy/:endpoint_key/                                                       @api.Proxy.delete(endpoint_key: String, pathSuffix: String = "")
 DELETE      /api/proxy/:endpoint_key/*pathSuffix                                            @api.Proxy.delete(endpoint_key: String, pathSuffix: String)
 
 # ----------------------------------------------------------------------

public/jsonld/contexts/extractors.jsonld

@@ -3,7 +3,7 @@
 	"extractor": "https://clowder.ncsa.illinois.edu/contexts/extractor#",
 	"id":"extractor/internal_id",
 	"name": {"@id": "extractor:extractor/id", "@type": "@id"},
-	"version": "extractor:version"
+	"version": "extractor:version",
 	"created_at": {
 	      "@id": "extractor:updated",
 	      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
@@ -19,4 +19,4 @@
 	"libraries": "extractor:libraries",
 	"bibtex": "extractor:bibtex",
 	"dependencies":"extractor:dependencies"
-}
+}

public/jsonld/contexts/metadata.jsonld

@@ -20,11 +20,9 @@
     "extractor": "cat:extractor",
     "content": {
       "@id": "https://clowder.ncsa.illinois.edu/metadata#content"
-    }
+    },
     "attached_to": "https://clowder.ncsa.illinois.edu/metadata/attachedTo",
     "resource_type": "https://clowder.ncsa.illinois.edu/resource/type",
     "url": "https://clowder.ncsa.illinois.edu/resource"
   }
 }
-
-