Added more coverage for deep base paths

multible path args with deep base paths now also supported.

Signed-off-by: Dave Shanley <[email protected]>

Author: daveshanley

paths/paths.go

@@ -24,18 +24,21 @@ func FindPath(request *http.Request, document *v3.Document) (*v3.PathItem, []*er
 
     var validationErrors []*errors.ValidationError
 
-    reqPathSegments := strings.Split(request.URL.Path, "/")
-    if reqPathSegments[0] == "" {
-        reqPathSegments = reqPathSegments[1:]
-    }
-
     // extract base path from document to check against paths.
     basePaths := make([]string, len(document.Servers))
     for i, s := range document.Servers {
         u, _ := url.Parse(s.URL)
         basePaths[i] = u.Path
     }
 
+    // strip any base path
+    stripped := stripBaseFromPath(request.URL.Path, basePaths)
+
+    reqPathSegments := strings.Split(stripped, "/")
+    if reqPathSegments[0] == "" {
+        reqPathSegments = reqPathSegments[1:]
+    }
+
     var pItem *v3.PathItem
     var foundPath string
 pathFound:
@@ -225,6 +228,15 @@ func checkPathAgainstBase(docPath, urlPath string, basePaths []string) bool {
     return false
 }
 
+func stripBaseFromPath(path string, basePaths []string) string {
+    for i := range basePaths {
+        if strings.HasPrefix(path, basePaths[i]) {
+            return path[len(basePaths[i]):]
+        }
+    }
+    return path
+}
+
 func comparePaths(mapped, requested []string,
     params []*v3.Parameter, basePaths []string) (bool, []*errors.ValidationError) {
 

paths/paths_test.go

@@ -276,6 +276,28 @@ paths:
 
 }
 
+func TestNewValidator_FindPathWithBaseURLInServer_Args(t *testing.T) {
+
+    spec := `openapi: 3.1.0
+servers:
+  - url: https://things.com/base3/base4/base5/base6/
+paths:
+  /user/{userId}/thing/{thingId}:
+    post:
+      operationId: addUser
+`
+
+    doc, _ := libopenapi.NewDocument([]byte(spec))
+    m, _ := doc.BuildV3Model()
+
+    // check against a deeper base
+    request, _ := http.NewRequest(http.MethodPost, "https://things.com/base3/base4/base5/base6/user/1234/thing/abcd", nil)
+    pathItem, _, _ := FindPath(request, &m.Model)
+    assert.NotNil(t, pathItem)
+    assert.Equal(t, "addUser", pathItem.Post.OperationId)
+
+}
+
 func TestNewValidator_FindPathMissing(t *testing.T) {
 
     spec := `openapi: 3.1.0