mirror of https://github.com/pikami/cosmium.git
Merge pull request #4 from pikami/erikzeneco/serve_request_paths_with_trailing_slashes
Erikzeneco/serve request paths with trailing slashes
This commit is contained in:
commit
a6b5d32ff7
|
@ -0,0 +1,18 @@
|
||||||
|
package middleware
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func StripTrailingSlashes(r *gin.Engine) gin.HandlerFunc {
|
||||||
|
return func(c *gin.Context) {
|
||||||
|
path := c.Request.URL.Path
|
||||||
|
if len(path) > 1 && path[len(path)-1] == '/' {
|
||||||
|
c.Request.URL.Path = path[:len(path)-1]
|
||||||
|
r.HandleContext(c)
|
||||||
|
c.Abort()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.Next()
|
||||||
|
}
|
||||||
|
}
|
|
@ -13,12 +13,15 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func CreateRouter() *gin.Engine {
|
func CreateRouter() *gin.Engine {
|
||||||
router := gin.Default()
|
router := gin.Default(func(e *gin.Engine) {
|
||||||
|
e.RedirectTrailingSlash = false
|
||||||
|
})
|
||||||
|
|
||||||
if config.Config.Debug {
|
if config.Config.Debug {
|
||||||
router.Use(middleware.RequestLogger())
|
router.Use(middleware.RequestLogger())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
router.Use(middleware.StripTrailingSlashes(router))
|
||||||
router.Use(middleware.Authentication())
|
router.Use(middleware.Authentication())
|
||||||
|
|
||||||
router.GET("/dbs/:databaseId/colls/:collId/pkranges", handlers.GetPartitionKeyRanges)
|
router.GET("/dbs/:databaseId/colls/:collId/pkranges", handlers.GetPartitionKeyRanges)
|
||||||
|
|
|
@ -0,0 +1,41 @@
|
||||||
|
package tests_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/pikami/cosmium/api/config"
|
||||||
|
"github.com/pikami/cosmium/internal/authentication"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Request document with trailing slash like python cosmosdb client does.
|
||||||
|
func Test_Documents_Read_Trailing_Slash(t *testing.T) {
|
||||||
|
ts, _ := documents_InitializeDb(t)
|
||||||
|
defer ts.Close()
|
||||||
|
|
||||||
|
t.Run("Read doc with client that appends slash to path", func(t *testing.T) {
|
||||||
|
resourceIdTemplate := "dbs/%s/colls/%s/docs/%s"
|
||||||
|
path := fmt.Sprintf(resourceIdTemplate, testDatabaseName, testCollectionName, "12345")
|
||||||
|
testUrl := ts.URL + "/" + path + "/"
|
||||||
|
date := time.Now().Format(time.RFC1123)
|
||||||
|
signature := authentication.GenerateSignature("GET", "docs", path, date, config.Config.AccountKey)
|
||||||
|
httpClient := &http.Client{}
|
||||||
|
req, _ := http.NewRequest("GET", testUrl, nil)
|
||||||
|
req.Header.Add("x-ms-date", date)
|
||||||
|
req.Header.Add("authorization", "sig="+url.QueryEscape(signature))
|
||||||
|
res, err := httpClient.Do(req)
|
||||||
|
|
||||||
|
assert.Nil(t, err)
|
||||||
|
|
||||||
|
if res != nil {
|
||||||
|
defer res.Body.Close()
|
||||||
|
assert.Equal(t, http.StatusOK, res.StatusCode, "Expected HTTP status 200 OK")
|
||||||
|
} else {
|
||||||
|
t.FailNow()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
Loading…
Reference in New Issue