]> source.dussan.org Git - gitea.git/commitdiff
Upgrade chi to v5 (#17298)
authorLunny Xiao <xiaolunwen@gmail.com>
Thu, 14 Oct 2021 02:50:23 +0000 (10:50 +0800)
committerGitHub <noreply@github.com>
Thu, 14 Oct 2021 02:50:23 +0000 (22:50 -0400)
35 files changed:
go.mod
go.sum
modules/context/context.go
modules/test/context_tests.go
modules/validation/binding_test.go
modules/web/route.go
modules/web/route_test.go
services/forms/user_form.go
vendor/gitea.com/go-chi/binding/.drone.yml
vendor/gitea.com/go-chi/binding/binding.go
vendor/gitea.com/go-chi/binding/go.mod
vendor/gitea.com/go-chi/binding/go.sum
vendor/gitea.com/go-chi/cache/file.go
vendor/gitea.com/go-chi/cache/memory.go
vendor/gitea.com/go-chi/captcha/.drone.yml
vendor/gitea.com/go-chi/captcha/README.md
vendor/gitea.com/go-chi/captcha/captcha.go
vendor/gitea.com/go-chi/captcha/go.mod
vendor/gitea.com/go-chi/captcha/go.sum
vendor/gitea.com/go-chi/session/README.md
vendor/gitea.com/go-chi/session/go.mod
vendor/gitea.com/go-chi/session/go.sum
vendor/github.com/go-chi/chi/v5/.gitignore [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/CHANGELOG.md [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/CONTRIBUTING.md [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/LICENSE [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/Makefile [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/README.md [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/chain.go [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/chi.go [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/context.go [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/go.mod [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/mux.go [new file with mode: 0644]
vendor/github.com/go-chi/chi/v5/tree.go [new file with mode: 0644]
vendor/modules.txt

diff --git a/go.mod b/go.mod
index e5b1d1b6e5f7eba9099f7b22514ca28b59234c00..e53d240914ccfd8d6f8fea75f246f31e7d9f5add 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -6,10 +6,10 @@ require (
        cloud.google.com/go v0.78.0 // indirect
        code.gitea.io/gitea-vet v0.2.1
        code.gitea.io/sdk/gitea v0.14.0
-       gitea.com/go-chi/binding v0.0.0-20210301195521-1fe1c9a555e7
-       gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e
-       gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e
-       gitea.com/go-chi/session v0.0.0-20210913064732-2ac132b0fa07
+       gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be
+       gitea.com/go-chi/cache v0.0.0-20211013020926-78790b11abf1
+       gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5
+       gitea.com/go-chi/session v0.0.0-20211013065435-7d334f340c09
        gitea.com/lunny/levelqueue v0.4.1
        github.com/Microsoft/go-winio v0.5.0 // indirect
        github.com/NYTimes/gziphandler v1.1.1
@@ -37,6 +37,7 @@ require (
        github.com/gliderlabs/ssh v0.3.3
        github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect
        github.com/go-chi/chi v1.5.4
+       github.com/go-chi/chi/v5 v5.0.4
        github.com/go-chi/cors v1.2.0
        github.com/go-enry/go-enry/v2 v2.7.1
        github.com/go-git/go-billy/v5 v5.3.1
diff --git a/go.sum b/go.sum
index 2ef9e9f9fd0e9c7c3bfe78e779acf6fafdada849..d86feed9ef1b01097be548c398eefd135ec68b70 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -41,14 +41,15 @@ code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFj
 code.gitea.io/sdk/gitea v0.14.0 h1:m4J352I3p9+bmJUfS+g0odeQzBY/5OXP91Gv6D4fnJ0=
 code.gitea.io/sdk/gitea v0.14.0/go.mod h1:89WiyOX1KEcvjP66sRHdu0RafojGo60bT9UqW17VbWs=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gitea.com/go-chi/binding v0.0.0-20210301195521-1fe1c9a555e7 h1:xCVJPY823C8RWpgMabTw2kOglDrg0iS3GcQU6wdwHkU=
-gitea.com/go-chi/binding v0.0.0-20210301195521-1fe1c9a555e7/go.mod h1:AyfTrwtfYN54R/HmVvMYPnSTenH5bVoyh8x6tBluxEA=
-gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e h1:zgPGaf3kXP0cVm9J0l8ZA2+XDzILYATg0CXbihR6N+o=
+gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY=
+gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do=
 gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0=
-gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e h1:YjaQU6XFicdhPN+MlGolcXO8seYY2+EY5g7vZPB17CQ=
-gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e/go.mod h1:nfA7JaGv3hbGQ1ktdhAsZhdS84qKffI8NMlHr+Opsog=
-gitea.com/go-chi/session v0.0.0-20210913064732-2ac132b0fa07 h1:1xF0xbIgDWnBB0iURAUFCoac4KfhGDdI7y7+3/8I8i4=
-gitea.com/go-chi/session v0.0.0-20210913064732-2ac132b0fa07/go.mod h1:Ozg8IchVNb/Udg+ui39iHRYqVHSvf3C99ixdpLR8Vu0=
+gitea.com/go-chi/cache v0.0.0-20211013020926-78790b11abf1 h1:Z7DcvTkxt8ovcENgPsQ7xzrGNSQmmIjGS9fJEb1l8jk=
+gitea.com/go-chi/cache v0.0.0-20211013020926-78790b11abf1/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0=
+gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 h1:J/1i8u40TbcLP/w2w2KCkgW2PelIqYkD5UOwu8IOvVU=
+gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5/go.mod h1:hQ9SYHKdOX968wJglb/NMQ+UqpOKwW4L+EYdvkWjHSo=
+gitea.com/go-chi/session v0.0.0-20211013065435-7d334f340c09 h1:1+K+6uOXrnSfLHXvu8jpuoNEWA3/NULOlLSRZwaij+c=
+gitea.com/go-chi/session v0.0.0-20211013065435-7d334f340c09/go.mod h1:fc/pjt5EqNKgqQXYzcas1Z5L5whkZHyOvTA7OzWVJck=
 gitea.com/lunny/levelqueue v0.4.1 h1:RZ+AFx5gBsZuyqCvofhAkPQ9uaVDPJnsULoJZIYaJNw=
 gitea.com/lunny/levelqueue v0.4.1/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
@@ -320,11 +321,11 @@ github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1T
 github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 github.com/go-asn1-ber/asn1-ber v1.5.3 h1:u7utq56RUFiynqUzgVMFDymapcOtQ/MZkh3H4QYkxag=
 github.com/go-asn1-ber/asn1-ber v1.5.3/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k=
 github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs=
 github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg=
-github.com/go-chi/chi/v5 v5.0.1 h1:ALxjCrTf1aflOlkhMnCUP86MubbWFrzB3gkRPReLpTo=
 github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
+github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.0 h1:tV1g1XENQ8ku4Bq3K9ub2AtgG+p16SmzeMSGTwrOKdE=
 github.com/go-chi/cors v1.2.0/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-enry/go-enry/v2 v2.7.1 h1:WCqtfyteIz61GYk9lRVy8HblvIv4cP9GIiwm/6txCbU=
@@ -491,6 +492,7 @@ github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/V
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
+github.com/goccy/go-json v0.4.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.7.4 h1:B44qRUFwz/vxPKPISQ1KhvzRi9kZ28RAf6YtjriBZ5k=
 github.com/goccy/go-json v0.7.4/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
index 2076ef82ab8e2a05a155e16e4ff7b31229cb692b..29f52c53cd1a48e67e9174f812dac0ec9a46db29 100644 (file)
@@ -33,7 +33,7 @@ import (
 
        "gitea.com/go-chi/cache"
        "gitea.com/go-chi/session"
-       "github.com/go-chi/chi"
+       chi "github.com/go-chi/chi/v5"
        "github.com/unknwon/com"
        "github.com/unknwon/i18n"
        "github.com/unrolled/render"
index 8a4d2d8bce0eb3ec6cb785b80c8f1340bbff7dc4..02723d8c38147a72377fb6eef42bcbc534e516d1 100644 (file)
@@ -19,7 +19,7 @@ import (
        "code.gitea.io/gitea/modules/git"
        "code.gitea.io/gitea/modules/web/middleware"
 
-       "github.com/go-chi/chi"
+       chi "github.com/go-chi/chi/v5"
        "github.com/stretchr/testify/assert"
        "github.com/unrolled/render"
 )
index d3b4e686ae2923204010020439ba3d6baf9fe894..aa8a76552448062b5ec764e251c8873723443830 100644 (file)
@@ -10,7 +10,7 @@ import (
        "testing"
 
        "gitea.com/go-chi/binding"
-       "github.com/go-chi/chi"
+       chi "github.com/go-chi/chi/v5"
        "github.com/stretchr/testify/assert"
 )
 
index 9b08510264bfe196ee4197192f3ec3548ff40167..ad9cea8bb6e14cfeb57d3fa413a3fa056f07b343 100644 (file)
@@ -15,7 +15,7 @@ import (
        "code.gitea.io/gitea/modules/web/middleware"
 
        "gitea.com/go-chi/binding"
-       "github.com/go-chi/chi"
+       chi "github.com/go-chi/chi/v5"
 )
 
 // Wrap converts all kinds of routes to standard library one
index 03955f0f2d97ffe2faff1c08ce127bc9da616335..a8470fec94f577799177ef19ff572d69fa4184fb 100644 (file)
@@ -10,7 +10,7 @@ import (
        "net/http/httptest"
        "testing"
 
-       "github.com/go-chi/chi"
+       chi "github.com/go-chi/chi/v5"
        "github.com/stretchr/testify/assert"
 )
 
index 7d6b976936d5a7b6ad5a5464d37d6c6fa2b66b0c..241ebdc0d9394f69e0973ada41e1b172a65b0ae4 100644 (file)
@@ -85,7 +85,7 @@ func (f *InstallForm) Validate(req *http.Request, errs binding.Errors) binding.E
 // RegisterForm form for registering
 type RegisterForm struct {
        UserName           string `binding:"Required;AlphaDashDot;MaxSize(40)"`
-       Email              string `binding:"Required;Email;MaxSize(254)"`
+       Email              string `binding:"Required;MaxSize(254)"`
        Password           string `binding:"MaxSize(255)"`
        Retype             string
        GRecaptchaResponse string `form:"g-recaptcha-response"`
index 9baf4f1cf7594225bba8c48ffeaf9bfd2fb111a6..3cfd6c32e28f90056695e1ed3adcb4be8ccd4ce9 100644 (file)
@@ -1,9 +1,14 @@
+---
 kind: pipeline
-name: go1-1-1
+name: go1-13
+
+platform:
+  os: linux
+  arch: arm64
 
 steps:
 - name: test
-  image: golang:1.11
+  image: golang:1.13
   environment:
     GOPROXY: https://goproxy.cn
   commands:
@@ -12,11 +17,15 @@ steps:
 
 ---
 kind: pipeline
-name: go1-1-2
+name: go1-16
+
+platform:
+  os: linux
+  arch: arm64
 
 steps:
 - name: test
-  image: golang:1.12
+  image: golang:1.16
   environment:
     GOPROXY: https://goproxy.cn
   commands:
index 455b9b8832ebcd0d0807bed475d2f7a2c5c6a3b4..a129f552352c77117e4eef99c64195c70192548a 100644 (file)
@@ -29,7 +29,7 @@ import (
        "strings"
        "unicode/utf8"
 
-       jsoniter "github.com/json-iterator/go"
+       "github.com/goccy/go-json"
        "github.com/unknwon/com"
 )
 
@@ -89,7 +89,6 @@ func errorHandler(errs Errors, rw http.ResponseWriter) {
                } else {
                        rw.WriteHeader(STATUS_UNPROCESSABLE_ENTITY)
                }
-               json := jsoniter.ConfigCompatibleWithStandardLibrary
                errOutput, _ := json.Marshal(errs)
                rw.Write(errOutput)
                return
@@ -172,7 +171,6 @@ func JSON(req *http.Request, jsonStruct interface{}) Errors {
 
        if req.Body != nil {
                defer req.Body.Close()
-               json := jsoniter.ConfigCompatibleWithStandardLibrary
                err := json.NewDecoder(req.Body).Decode(jsonStruct)
                if err != nil && err != io.EOF {
                        errors.Add([]string{}, ERR_DESERIALIZATION, err.Error())
@@ -233,9 +231,9 @@ func Validate(req *http.Request, obj interface{}) Errors {
 }
 
 var (
-       AlphaDashPattern    = regexp.MustCompile("[^\\d\\w-_]")
-       AlphaDashDotPattern = regexp.MustCompile("[^\\d\\w-_\\.]")
-       EmailPattern        = regexp.MustCompile("[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[a-zA-Z0-9](?:[\\w-]*[\\w])?")
+       AlphaDashPattern    = regexp.MustCompile(`[^\d\w-_]`)
+       AlphaDashDotPattern = regexp.MustCompile(`[^\d\w-_\.]`)
+       EmailPattern        = regexp.MustCompile(`\A[\w!#$%&'*+/=?^_`+"`"+`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`+"`"+`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[a-zA-Z0-9](?:[\w-]*[\w])?\z`)
 )
 
 // Copied from github.com/asaskevich/govalidator.
@@ -250,7 +248,7 @@ var (
        urlSubdomainRx = `((www\.)|([a-zA-Z0-9]([-\.][-\._a-zA-Z0-9]+)*))`
        urlPortRx      = `(:(\d{1,5}))`
        urlPathRx      = `((\/|\?|#)[^\s]*)`
-       URLPattern     = regexp.MustCompile(`^` + urlSchemaRx + `?` + urlUsernameRx + `?` + `((` + urlIPRx + `|(\[` + ipRx + `\])|(([a-zA-Z0-9]([a-zA-Z0-9-_]+)?[a-zA-Z0-9]([-\.][a-zA-Z0-9]+)*)|(` + urlSubdomainRx + `?))?(([a-zA-Z\x{00a1}-\x{ffff}0-9]+-?-?)*[a-zA-Z\x{00a1}-\x{ffff}0-9]+)(?:\.([a-zA-Z\x{00a1}-\x{ffff}]{1,}))?))\.?` + urlPortRx + `?` + urlPathRx + `?$`)
+       URLPattern     = regexp.MustCompile(`\A` + urlSchemaRx + `?` + urlUsernameRx + `?` + `((` + urlIPRx + `|(\[` + ipRx + `\])|(([a-zA-Z0-9]([a-zA-Z0-9-_]+)?[a-zA-Z0-9]([-\.][a-zA-Z0-9]+)*)|(` + urlSubdomainRx + `?))?(([a-zA-Z\x{00a1}-\x{ffff}0-9]+-?-?)*[a-zA-Z\x{00a1}-\x{ffff}0-9]+)(?:\.([a-zA-Z\x{00a1}-\x{ffff}]{1,}))?))\.?` + urlPortRx + `?` + urlPathRx + `?\z`)
 )
 
 // IsURL check if the string is an URL.
@@ -390,32 +388,41 @@ func validateField(errors Errors, zero interface{}, field reflect.StructField, f
                }
        }
 
+       rules := strings.Split(field.Tag.Get("binding"), ";")
+
+       if reflect.DeepEqual(zero, fieldValue) {
+               for _, rule := range rules {
+                       if rule == "Required" {
+                               errors.Add([]string{field.Name}, ERR_REQUIRED, "Required")
+                               break
+                       }
+                       if strings.HasPrefix(rule, "Default(") {
+                               if fieldVal.CanSet() {
+                                       errors = setWithProperType(field.Type.Kind(), rule[8:len(rule)-1], fieldVal, field.Tag.Get("form"), errors)
+                               } else {
+                                       errors.Add([]string{field.Name}, ERR_EXCLUDE, "Default")
+                               }
+                               break
+                       }
+               }
+
+               return errors
+       }
+
 VALIDATE_RULES:
-       for _, rule := range strings.Split(field.Tag.Get("binding"), ";") {
+       for _, rule := range rules {
                if len(rule) == 0 {
                        continue
                }
 
                switch {
-               case rule == "OmitEmpty":
-                       if reflect.DeepEqual(zero, fieldValue) {
-                               break VALIDATE_RULES
-                       }
                case rule == "Required":
-                       v := reflect.ValueOf(fieldValue)
-                       if v.Kind() == reflect.Slice {
-                               if v.Len() == 0 {
-                                       errors.Add([]string{field.Name}, ERR_REQUIRED, "Required")
-                                       break VALIDATE_RULES
-                               }
-
-                               continue
-                       }
+                       continue
+               case strings.HasPrefix(rule, "Default("):
+                       continue
+               case rule == "OmitEmpty": // legacy
+                       continue
 
-                       if reflect.DeepEqual(zero, fieldValue) {
-                               errors.Add([]string{field.Name}, ERR_REQUIRED, "Required")
-                               break VALIDATE_RULES
-                       }
                case rule == "AlphaDash":
                        if AlphaDashPattern.MatchString(fmt.Sprintf("%v", fieldValue)) {
                                errors.Add([]string{field.Name}, ERR_ALPHA_DASH, "AlphaDash")
@@ -432,8 +439,7 @@ VALIDATE_RULES:
                                errors.Add([]string{field.Name}, ERR_SIZE, "Size")
                                break VALIDATE_RULES
                        }
-                       v := reflect.ValueOf(fieldValue)
-                       if v.Kind() == reflect.Slice && v.Len() != size {
+                       if fieldVal.Kind() == reflect.Slice && fieldVal.Len() != size {
                                errors.Add([]string{field.Name}, ERR_SIZE, "Size")
                                break VALIDATE_RULES
                        }
@@ -443,8 +449,7 @@ VALIDATE_RULES:
                                errors.Add([]string{field.Name}, ERR_MIN_SIZE, "MinSize")
                                break VALIDATE_RULES
                        }
-                       v := reflect.ValueOf(fieldValue)
-                       if v.Kind() == reflect.Slice && v.Len() < min {
+                       if fieldVal.Kind() == reflect.Slice && fieldVal.Len() < min {
                                errors.Add([]string{field.Name}, ERR_MIN_SIZE, "MinSize")
                                break VALIDATE_RULES
                        }
@@ -454,8 +459,7 @@ VALIDATE_RULES:
                                errors.Add([]string{field.Name}, ERR_MAX_SIZE, "MaxSize")
                                break VALIDATE_RULES
                        }
-                       v := reflect.ValueOf(fieldValue)
-                       if v.Kind() == reflect.Slice && v.Len() > max {
+                       if fieldVal.Kind() == reflect.Slice && fieldVal.Len() > max {
                                errors.Add([]string{field.Name}, ERR_MAX_SIZE, "MaxSize")
                                break VALIDATE_RULES
                        }
@@ -476,9 +480,7 @@ VALIDATE_RULES:
                        }
                case rule == "Url":
                        str := fmt.Sprintf("%v", fieldValue)
-                       if len(str) == 0 {
-                               continue
-                       } else if !isURL(str) {
+                       if !isURL(str) {
                                errors.Add([]string{field.Name}, ERR_URL, "Url")
                                break VALIDATE_RULES
                        }
@@ -502,15 +504,6 @@ VALIDATE_RULES:
                                errors.Add([]string{field.Name}, ERR_EXCLUDE, "Exclude")
                                break VALIDATE_RULES
                        }
-               case strings.HasPrefix(rule, "Default("):
-                       if reflect.DeepEqual(zero, fieldValue) {
-                               if fieldVal.CanAddr() {
-                                       errors = setWithProperType(field.Type.Kind(), rule[8:len(rule)-1], fieldVal, field.Tag.Get("form"), errors)
-                               } else {
-                                       errors.Add([]string{field.Name}, ERR_EXCLUDE, "Default")
-                                       break VALIDATE_RULES
-                               }
-                       }
                default:
                        // Apply custom validation rules
                        var isValid bool
index ada44675234b428345fe45283792c8201391e6e1..f6b6225d65b2154d6b9650d7b3b978fb5413a48b 100644 (file)
@@ -3,8 +3,8 @@ module gitea.com/go-chi/binding
 go 1.13
 
 require (
-       github.com/go-chi/chi v1.5.1
-       github.com/json-iterator/go v1.1.10
-       github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
+       github.com/go-chi/chi/v5 v5.0.4
+       github.com/goccy/go-json v0.4.11
+       github.com/stretchr/testify v1.3.0
        github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e
 )
index af9a07b2e8e526a2bdb46a9edee2f617c9e3048d..cd40905947b4492008e8cb58a191dabc7dd4b2b9 100644 (file)
@@ -1,37 +1,21 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w=
-github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
+github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/goccy/go-json v0.4.11 h1:92nyX606ZN/cUFwctfxwDWm8YWSA38Zlv9s7taFeLyo=
+github.com/goccy/go-json v0.4.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w=
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8=
-github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e h1:GSGeB9EAKY2spCABz6xOX5DbxZEXolK+nBSvmsQwRjM=
 github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e/go.mod h1:tOOxU81rwgoCLoOVVPHb6T/wt8HZygqH5id+GNnlCXM=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
index d07ab0b11eff3cf210f252fbbfd7363f3bbfa2c3..9635519620f91c8b7fc32cf4d121388fab5d8b22 100644 (file)
@@ -25,8 +25,6 @@ import (
        "path/filepath"
        "sync"
        "time"
-
-       "github.com/unknwon/com"
 )
 
 // Item represents a cache item.
@@ -136,7 +134,10 @@ func (c *FileCacher) Decr(key string) error {
 
 // IsExist returns true if cached value exists.
 func (c *FileCacher) IsExist(key string) bool {
-       return com.IsExist(c.filepath(key))
+       if item, err := c.read(key); err == nil {
+               return !item.hasExpired()
+       }
+       return false
 }
 
 // Flush deletes all cached data.
index 2d5a8fac4daa31b81e570634de508b9ea7ccad97..7b470e9fc5cf10dfe48750eb4a485ecd2579201c 100644 (file)
@@ -116,8 +116,10 @@ func (c *MemoryCacher) IsExist(key string) bool {
        c.lock.RLock()
        defer c.lock.RUnlock()
 
-       _, ok := c.items[key]
-       return ok
+       if item, ok := c.items[key]; ok {
+               return !item.hasExpired()
+       }
+       return false
 }
 
 // Flush deletes all cached data.
index 1db7ea30e3abfedb44c65543c5ba9f5678b8cf77..3cfd6c32e28f90056695e1ed3adcb4be8ccd4ce9 100644 (file)
@@ -1,24 +1,33 @@
+---
 kind: pipeline
-name: go1-1-1
+name: go1-13
+
+platform:
+  os: linux
+  arch: arm64
 
 steps:
 - name: test
-  image: golang:1.11
+  image: golang:1.13
   environment:
-      GOPROXY: https://goproxy.cn
+    GOPROXY: https://goproxy.cn
   commands:
   - go build -v
   - go test -v -race -coverprofile=coverage.txt -covermode=atomic
 
 ---
 kind: pipeline
-name: go1-1-2
+name: go1-16
+
+platform:
+  os: linux
+  arch: arm64
 
 steps:
 - name: test
-  image: golang:1.12
+  image: golang:1.16
   environment:
-      GOPROXY: https://goproxy.cn
+    GOPROXY: https://goproxy.cn
   commands:
   - go build -v
   - go test -v -race -coverprofile=coverage.txt -covermode=atomic
\ No newline at end of file
index f55b2e925e75458372a527341178e3a81bff8527..c321bfb3845a766cf0741cac2ac143e35ca16694 100644 (file)
@@ -1,15 +1,14 @@
-# captcha [![Build Status](https://drone.gitea.com/api/badges/macaron/captcha/status.svg)](https://drone.gitea.com/macaron/captcha)
+# captcha [![Build Status](https://drone.gitea.com/api/badges/go-chi/captcha/status.svg)](https://drone.gitea.com/go-chi/captcha)
 
-Middleware captcha provides captcha service for [Macaron](https://gitea.com/macaron/macaron).
+Middleware captcha provides captcha service for [chi](https://github.com/go-chi/chi).
 
 ### Installation
 
-       go get gitea.com/macaron/captcha
+       go get gitea.com/go-chi/captcha
 
 ## Getting Help
 
-- [API Reference](https://gowalker.org/gitea.com/macaron/captcha)
-- [Documentation](http://go-macaron.com/docs/middlewares/captcha)
+- [API Reference](https://pkg.go.dev/gitea.com/go-chi/captcha)
 
 ## License
 
index 9d7e1f2ccbc25c9a6f9b591f1275f0cc17f0f6a0..89453686a98c94e5b91599768ac28b44abcee4ca 100644 (file)
@@ -13,7 +13,7 @@
 // License for the specific language governing permissions and limitations
 // under the License.
 
-// Package captcha a middleware that provides captcha service for Macaron.
+// Package captcha a middleware that provides captcha service for chi.
 package captcha
 
 import (
@@ -202,7 +202,7 @@ func NewCaptcha(opts ...Options) *Captcha {
        }
 }
 
-// Captchaer is a middleware that maps a captcha.Captcha service into the Macaron handler chain.
+// Captchaer is a middleware that maps a captcha.Captcha service into the chi handler chain.
 // An single variadic captcha.Options struct can be optionally provided to configure.
 // This should be register after cache.Cacher.
 func Captchaer(cpt *Captcha) func(http.Handler) http.Handler {
index adbf9ffb40daa519912977e201ebeba6d57126ba..9821ed90493156045537ee777e867e1a4dd2ec0c 100644 (file)
@@ -4,7 +4,7 @@ go 1.11
 
 require (
        gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e
-       github.com/go-chi/chi v1.5.1
+       github.com/go-chi/chi/v5 v5.0.4
        github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
        github.com/unknwon/com v0.0.0-20190804042917-757f69c95f3e
 )
index ab69564a0cae130fc5e1e3b33d25ae27063a93f8..a5946cd920cd73524f75a8100cfebfca63f33985 100644 (file)
@@ -6,8 +6,8 @@ github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGii
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w=
-github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k=
+github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
+github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-redis/redis v6.15.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -66,7 +66,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/ini.v1 v1.44.2 h1:N6kNUPqiIyxP+s/aINPzRvNpcTVV30qLC0t6ZjZFlUU=
 gopkg.in/ini.v1 v1.44.2/go.mod h1:M3Cogqpuv0QCi3ExAY5V4uOt4qb/R3xZubo9m8lK5wg=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
index ed3258fcef61d34e86b7a3ee6020670d075c560b..e60da110e7e764d2e65c6eedd775eda6de63ba66 100644 (file)
@@ -1,6 +1,6 @@
 # Session
 
-Middleware session provides session management which copied from [Macaron Session](https://gitea.com/go-chi/session) for [go-chi](https://github.com/go-chi/chi). It can use many session providers, including memory, file, Redis, Memcache, PostgreSQL, MySQL, Couchbase, Ledis and Nodb.
+Middleware session provides session management which based on a [fork](https://gitea.com/macaron/session) of [Macaron Session](https://github.com/go-macaron/session) for [go-chi](https://github.com/go-chi/chi). It can use many session providers, including memory, file, Redis, Memcache, PostgreSQL, MySQL, Couchbase, Ledis and Nodb.
 
 ## Installation
 
@@ -10,8 +10,8 @@ go get gitea.com/go-chi/session
 
 ## Credits
 
-This package is a modified version of [go-macaron/session](github.com/go-macaron/session).
+This package is a modified version of [go-macaron/session](https://github.com/go-macaron/session).
 
 ## License
 
-This project is under the Apache License, Version 2.0. See the [LICENSE](LICENSE) file for the full license text.
\ No newline at end of file
+This project is under the Apache License, Version 2.0. See the [LICENSE](LICENSE) file for the full license text.
index 66120800477c1bbd86d54539e3c1741f9bc3793c..6a1a16a7fa3910decfd0fd2b6a95dc5350a7b490 100644 (file)
@@ -9,7 +9,7 @@ require (
        github.com/couchbase/goutils v0.0.0-20201030094643-5e82bb967e67 // indirect
        github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76 // indirect
        github.com/edsrzf/mmap-go v1.0.0 // indirect
-       github.com/go-chi/chi v1.5.1
+       github.com/go-chi/chi/v5 v5.0.4
        github.com/go-redis/redis/v8 v8.4.0
        github.com/go-sql-driver/mysql v1.4.1
        github.com/lib/pq v1.2.0
index e2c174b0c76e8ff827057edb8aed9a8d11bd1f74..dbaaec20b339556c8167e2efe2c0a09bfafae565 100644 (file)
@@ -10,7 +10,6 @@ github.com/couchbase/goutils v0.0.0-20201030094643-5e82bb967e67 h1:NCqJ6fwen6YP0
 github.com/couchbase/goutils v0.0.0-20201030094643-5e82bb967e67/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
 github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76 h1:Lgdd/Qp96Qj8jqLpq2cI1I1X7BJnu06efS+XkhRoLUQ=
 github.com/cupcake/rdb v0.0.0-20161107195141-43ba34106c76/go.mod h1:vYwsqCOLxGiisLwp9rITslkFNpZD5rz43tf41QFkTWY=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -18,18 +17,16 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w=
-github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k=
+github.com/go-chi/chi/v5 v5.0.4 h1:5e494iHzsYBiyXQAHHuI4tyJS9M3V84OuX3ufIIGHFo=
+github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-redis/redis/v8 v8.4.0 h1:J5NCReIgh3QgUJu398hUncxDExN4gMOHI11NVbVicGQ=
 github.com/go-redis/redis/v8 v8.4.0/go.mod h1:A1tbYoHSa1fXwN+//ljcCYYJeLmVrwL9hbQN45Jdy0M=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -48,7 +45,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
 github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
@@ -58,12 +54,10 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M=
 github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
@@ -118,7 +112,6 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -137,7 +130,6 @@ google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyz
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
diff --git a/vendor/github.com/go-chi/chi/v5/.gitignore b/vendor/github.com/go-chi/chi/v5/.gitignore
new file mode 100644 (file)
index 0000000..ba22c99
--- /dev/null
@@ -0,0 +1,3 @@
+.idea
+*.sw?
+.vscode
diff --git a/vendor/github.com/go-chi/chi/v5/CHANGELOG.md b/vendor/github.com/go-chi/chi/v5/CHANGELOG.md
new file mode 100644 (file)
index 0000000..bb255ac
--- /dev/null
@@ -0,0 +1,300 @@
+# Changelog
+
+## v5.0.4 (2021-08-29)
+
+- History of changes: see https://github.com/go-chi/chi/compare/v5.0.3...v5.0.4
+
+
+## v5.0.3 (2021-04-29)
+
+- History of changes: see https://github.com/go-chi/chi/compare/v5.0.2...v5.0.3
+
+
+## v5.0.2 (2021-03-25)
+
+- History of changes: see https://github.com/go-chi/chi/compare/v5.0.1...v5.0.2
+
+
+## v5.0.1 (2021-03-10)
+
+- Small improvements
+- History of changes: see https://github.com/go-chi/chi/compare/v5.0.0...v5.0.1
+
+
+## v5.0.0 (2021-02-27)
+
+- chi v5, `github.com/go-chi/chi/v5` introduces the adoption of Go's SIV to adhere to the current state-of-the-tools in Go.
+- chi v1.5.x did not work out as planned, as the Go tooling is too powerful and chi's adoption is too wide.
+  The most responsible thing to do for everyone's benefit is to just release v5 with SIV, so I present to you all,
+  chi v5 at `github.com/go-chi/chi/v5`. I hope someday the developer experience and ergonomics I've been seeking
+  will still come to fruition in some form, see https://github.com/golang/go/issues/44550
+- History of changes: see https://github.com/go-chi/chi/compare/v1.5.4...v5.0.0
+
+
+## v1.5.4 (2021-02-27)
+
+- Undo prior retraction in v1.5.3 as we prepare for v5.0.0 release
+- History of changes: see https://github.com/go-chi/chi/compare/v1.5.3...v1.5.4
+
+
+## v1.5.3 (2021-02-21)
+
+- Update go.mod to go 1.16 with new retract directive marking all versions without prior go.mod support
+- History of changes: see https://github.com/go-chi/chi/compare/v1.5.2...v1.5.3
+
+
+## v1.5.2 (2021-02-10)
+
+- Reverting allocation optimization as a precaution as go test -race fails.
+- Minor improvements, see history below
+- History of changes: see https://github.com/go-chi/chi/compare/v1.5.1...v1.5.2
+
+
+## v1.5.1 (2020-12-06)
+
+- Performance improvement: removing 1 allocation by foregoing context.WithValue, thank you @bouk for
+  your contribution (https://github.com/go-chi/chi/pull/555). Note: new benchmarks posted in README.
+- `middleware.CleanPath`: new middleware that clean's request path of double slashes
+- deprecate & remove `chi.ServerBaseContext` in favour of stdlib `http.Server#BaseContext`
+- plus other tiny improvements, see full commit history below
+- History of changes: see https://github.com/go-chi/chi/compare/v4.1.2...v1.5.1
+
+
+## v1.5.0 (2020-11-12) - now with go.mod support
+
+`chi` dates back to 2016 with it's original implementation as one of the first routers to adopt the newly introduced
+context.Context api to the stdlib -- set out to design a router that is faster, more modular and simpler than anything
+else out there -- while not introducing any custom handler types or dependencies. Today, `chi` still has zero dependencies,
+and in many ways is future proofed from changes, given it's minimal nature. Between versions, chi's iterations have been very
+incremental, with the architecture and api being the same today as it was originally designed in 2016. For this reason it 
+makes chi a pretty easy project to maintain, as well thanks to the many amazing community contributions over the years
+to who all help make chi better (total of 86 contributors to date -- thanks all!).
+
+Chi has been an labour of love, art and engineering, with the goals to offer beautiful ergonomics, flexibility, performance
+and simplicity when building HTTP services with Go. I've strived to keep the router very minimal in surface area / code size,
+and always improving the code wherever possible -- and as of today the `chi` package is just 1082 lines of code (not counting
+middlewares, which are all optional). As well, I don't have the exact metrics, but from my analysis and email exchanges from
+companies and developers, chi is used by thousands of projects around the world -- thank you all as there is no better form of
+joy for me than to have art I had started be helpful and enjoyed by others. And of course I use chi in all of my own projects too :)
+
+For me, the asthetics of chi's code and usage are very important. With the introduction of Go's module support 
+(which I'm a big fan of), chi's past versioning scheme choice to v2, v3 and v4 would mean I'd require the import path
+of "github.com/go-chi/chi/v4", leading to the lengthy discussion at https://github.com/go-chi/chi/issues/462.
+Haha, to some, you may be scratching your head why I've spent > 1 year stalling to adopt "/vXX" convention in the import
+path -- which isn't horrible in general -- but for chi, I'm unable to accept it as I strive for perfection in it's API design,
+aesthetics and simplicity. It just doesn't feel good to me given chi's simple nature -- I do not foresee a "v5" or "v6",
+and upgrading between versions in the future will also be just incremental.
+
+I do understand versioning is a part of the API design as well, which is why the solution for a while has been to "do nothing",
+as Go supports both old and new import paths with/out go.mod. However, now that Go module support has had time to iron out kinks and
+is adopted everywhere, it's time for chi to get with the times. Luckily, I've discovered a path forward that will make me happy,
+while also not breaking anyone's app who adopted a prior versioning from tags in v2/v3/v4. I've made an experimental release of
+v1.5.0 with go.mod silently, and tested it with new and old projects, to ensure the developer experience is preserved, and it's
+largely unnoticed. Fortunately, Go's toolchain will check the tags of a repo and consider the "latest" tag the one with go.mod.
+However, you can still request a specific older tag such as v4.1.2, and everything will "just work". But new users can just
+`go get github.com/go-chi/chi` or `go get github.com/go-chi/chi@latest` and they will get the latest version which contains
+go.mod support, which is v1.5.0+. `chi` will not change very much over the years, just like it hasn't changed much from 4 years ago.
+Therefore, we will stay on v1.x from here on, starting from v1.5.0. Any breaking changes will bump a "minor" release and
+backwards-compatible improvements/fixes will bump a "tiny" release.
+
+For existing projects who want to upgrade to the latest go.mod version, run: `go get -u github.com/go-chi/chi@v1.5.0`,
+which will get you on the go.mod version line (as Go's mod cache may still remember v4.x). Brand new systems can run
+`go get -u github.com/go-chi/chi` or `go get -u github.com/go-chi/chi@latest` to install chi, which will install v1.5.0+
+built with go.mod support.
+
+My apologies to the developers who will disagree with the decisions above, but, hope you'll try it and see it's a very
+minor request which is backwards compatible and won't break your existing installations.
+
+Cheers all, happy coding!
+
+
+---
+
+
+## v4.1.2 (2020-06-02)
+
+- fix that handles MethodNotAllowed with path variables, thank you @caseyhadden for your contribution
+- fix to replace nested wildcards correctly in RoutePattern, thank you @@unmultimedio for your contribution
+- History of changes: see https://github.com/go-chi/chi/compare/v4.1.1...v4.1.2
+
+
+## v4.1.1 (2020-04-16)
+
+- fix for issue https://github.com/go-chi/chi/issues/411 which allows for overlapping regexp
+  route to the correct handler through a recursive tree search, thanks to @Jahaja for the PR/fix!
+- new middleware.RouteHeaders as a simple router for request headers with wildcard support
+- History of changes: see https://github.com/go-chi/chi/compare/v4.1.0...v4.1.1
+
+
+## v4.1.0 (2020-04-1)
+
+- middleware.LogEntry: Write method on interface now passes the response header
+  and an extra interface type useful for custom logger implementations.
+- middleware.WrapResponseWriter: minor fix
+- middleware.Recoverer: a bit prettier
+- History of changes: see https://github.com/go-chi/chi/compare/v4.0.4...v4.1.0
+
+## v4.0.4 (2020-03-24)
+
+- middleware.Recoverer: new pretty stack trace printing (https://github.com/go-chi/chi/pull/496)
+- a few minor improvements and fixes
+- History of changes: see https://github.com/go-chi/chi/compare/v4.0.3...v4.0.4
+
+
+## v4.0.3 (2020-01-09)
+
+- core: fix regexp routing to include default value when param is not matched
+- middleware: rewrite of middleware.Compress
+- middleware: suppress http.ErrAbortHandler in middleware.Recoverer
+- History of changes: see https://github.com/go-chi/chi/compare/v4.0.2...v4.0.3
+
+
+## v4.0.2 (2019-02-26)
+
+- Minor fixes
+- History of changes: see https://github.com/go-chi/chi/compare/v4.0.1...v4.0.2
+
+
+## v4.0.1 (2019-01-21)
+
+- Fixes issue with compress middleware: #382 #385
+- History of changes: see https://github.com/go-chi/chi/compare/v4.0.0...v4.0.1
+
+
+## v4.0.0 (2019-01-10)
+
+- chi v4 requires Go 1.10.3+ (or Go 1.9.7+) - we have deprecated support for Go 1.7 and 1.8
+- router: respond with 404 on router with no routes (#362)
+- router: additional check to ensure wildcard is at the end of a url pattern (#333)
+- middleware: deprecate use of http.CloseNotifier (#347)
+- middleware: fix RedirectSlashes to include query params on redirect (#334)
+- History of changes: see https://github.com/go-chi/chi/compare/v3.3.4...v4.0.0
+
+
+## v3.3.4 (2019-01-07)
+
+- Minor middleware improvements. No changes to core library/router. Moving v3 into its
+- own branch as a version of chi for Go 1.7, 1.8, 1.9, 1.10, 1.11
+- History of changes: see https://github.com/go-chi/chi/compare/v3.3.3...v3.3.4
+
+
+## v3.3.3 (2018-08-27)
+
+- Minor release
+- See https://github.com/go-chi/chi/compare/v3.3.2...v3.3.3
+
+
+## v3.3.2 (2017-12-22)
+
+- Support to route trailing slashes on mounted sub-routers (#281)
+- middleware: new `ContentCharset` to check matching charsets. Thank you
+  @csucu for your community contribution!
+
+
+## v3.3.1 (2017-11-20)
+
+- middleware: new `AllowContentType` handler for explicit whitelist of accepted request Content-Types
+- middleware: new `SetHeader` handler for short-hand middleware to set a response header key/value
+- Minor bug fixes
+
+
+## v3.3.0 (2017-10-10)
+
+- New chi.RegisterMethod(method) to add support for custom HTTP methods, see _examples/custom-method for usage
+- Deprecated LINK and UNLINK methods from the default list, please use `chi.RegisterMethod("LINK")` and `chi.RegisterMethod("UNLINK")` in an `init()` function
+
+
+## v3.2.1 (2017-08-31)
+
+- Add new `Match(rctx *Context, method, path string) bool` method to `Routes` interface
+  and `Mux`. Match searches the mux's routing tree for a handler that matches the method/path
+- Add new `RouteMethod` to `*Context`
+- Add new `Routes` pointer to `*Context`
+- Add new `middleware.GetHead` to route missing HEAD requests to GET handler
+- Updated benchmarks (see README)
+
+
+## v3.1.5 (2017-08-02)
+
+- Setup golint and go vet for the project
+- As per golint, we've redefined `func ServerBaseContext(h http.Handler, baseCtx context.Context) http.Handler`
+  to `func ServerBaseContext(baseCtx context.Context, h http.Handler) http.Handler`
+
+
+## v3.1.0 (2017-07-10)
+
+- Fix a few minor issues after v3 release
+- Move `docgen` sub-pkg to https://github.com/go-chi/docgen
+- Move `render` sub-pkg to https://github.com/go-chi/render
+- Add new `URLFormat` handler to chi/middleware sub-pkg to make working with url mime 
+  suffixes easier, ie. parsing `/articles/1.json` and `/articles/1.xml`. See comments in
+  https://github.com/go-chi/chi/blob/master/middleware/url_format.go for example usage.
+
+
+## v3.0.0 (2017-06-21)
+
+- Major update to chi library with many exciting updates, but also some *breaking changes*
+- URL parameter syntax changed from `/:id` to `/{id}` for even more flexible routing, such as
+  `/articles/{month}-{day}-{year}-{slug}`, `/articles/{id}`, and `/articles/{id}.{ext}` on the
+  same router
+- Support for regexp for routing patterns, in the form of `/{paramKey:regExp}` for example:
+  `r.Get("/articles/{name:[a-z]+}", h)` and `chi.URLParam(r, "name")`
+- Add `Method` and `MethodFunc` to `chi.Router` to allow routing definitions such as
+  `r.Method("GET", "/", h)` which provides a cleaner interface for custom handlers like
+  in `_examples/custom-handler`
+- Deprecating `mux#FileServer` helper function. Instead, we encourage users to create their
+  own using file handler with the stdlib, see `_examples/fileserver` for an example
+- Add support for LINK/UNLINK http methods via `r.Method()` and `r.MethodFunc()`
+- Moved the chi project to its own organization, to allow chi-related community packages to
+  be easily discovered and supported, at: https://github.com/go-chi
+- *NOTE:* please update your import paths to `"github.com/go-chi/chi"`
+- *NOTE:* chi v2 is still available at https://github.com/go-chi/chi/tree/v2
+
+
+## v2.1.0 (2017-03-30)
+
+- Minor improvements and update to the chi core library
+- Introduced a brand new `chi/render` sub-package to complete the story of building
+  APIs to offer a pattern for managing well-defined request / response payloads. Please
+  check out the updated `_examples/rest` example for how it works.
+- Added `MethodNotAllowed(h http.HandlerFunc)` to chi.Router interface
+
+
+## v2.0.0 (2017-01-06)
+
+- After many months of v2 being in an RC state with many companies and users running it in
+  production, the inclusion of some improvements to the middlewares, we are very pleased to
+  announce v2.0.0 of chi.
+
+
+## v2.0.0-rc1 (2016-07-26)
+
+- Huge update! chi v2 is a large refactor targetting Go 1.7+. As of Go 1.7, the popular
+  community `"net/context"` package has been included in the standard library as `"context"` and
+  utilized by `"net/http"` and `http.Request` to managing deadlines, cancelation signals and other
+  request-scoped values. We're very excited about the new context addition and are proud to
+  introduce chi v2, a minimal and powerful routing package for building large HTTP services,
+  with zero external dependencies. Chi focuses on idiomatic design and encourages the use of 
+  stdlib HTTP handlers and middlwares.
+- chi v2 deprecates its `chi.Handler` interface and requires `http.Handler` or `http.HandlerFunc`
+- chi v2 stores URL routing parameters and patterns in the standard request context: `r.Context()`
+- chi v2 lower-level routing context is accessible by `chi.RouteContext(r.Context()) *chi.Context`,
+  which provides direct access to URL routing parameters, the routing path and the matching
+  routing patterns.
+- Users upgrading from chi v1 to v2, need to:
+  1. Update the old chi.Handler signature, `func(ctx context.Context, w http.ResponseWriter, r *http.Request)` to
+     the standard http.Handler: `func(w http.ResponseWriter, r *http.Request)`
+  2. Use `chi.URLParam(r *http.Request, paramKey string) string`
+     or `URLParamFromCtx(ctx context.Context, paramKey string) string` to access a url parameter value
+
+
+## v1.0.0 (2016-07-01)
+
+- Released chi v1 stable https://github.com/go-chi/chi/tree/v1.0.0 for Go 1.6 and older.
+
+
+## v0.9.0 (2016-03-31)
+
+- Reuse context objects via sync.Pool for zero-allocation routing [#33](https://github.com/go-chi/chi/pull/33)
+- BREAKING NOTE: due to subtle API changes, previously `chi.URLParams(ctx)["id"]` used to access url parameters
+  has changed to: `chi.URLParam(ctx, "id")`
diff --git a/vendor/github.com/go-chi/chi/v5/CONTRIBUTING.md b/vendor/github.com/go-chi/chi/v5/CONTRIBUTING.md
new file mode 100644 (file)
index 0000000..c0ac2df
--- /dev/null
@@ -0,0 +1,31 @@
+# Contributing
+
+## Prerequisites
+
+1. [Install Go][go-install].
+2. Download the sources and switch the working directory:
+
+    ```bash
+    go get -u -d github.com/go-chi/chi
+    cd $GOPATH/src/github.com/go-chi/chi
+    ```
+
+## Submitting a Pull Request
+
+A typical workflow is:
+
+1. [Fork the repository.][fork] [This tip maybe also helpful.][go-fork-tip]
+2. [Create a topic branch.][branch]
+3. Add tests for your change.
+4. Run `go test`. If your tests pass, return to the step 3.
+5. Implement the change and ensure the steps from the previous step pass.
+6. Run `goimports -w .`, to ensure the new code conforms to Go formatting guideline.
+7. [Add, commit and push your changes.][git-help]
+8. [Submit a pull request.][pull-req]
+
+[go-install]: https://golang.org/doc/install
+[go-fork-tip]: http://blog.campoy.cat/2014/03/github-and-go-forking-pull-requests-and.html
+[fork]: https://help.github.com/articles/fork-a-repo
+[branch]: http://learn.github.com/p/branching.html
+[git-help]: https://guides.github.com
+[pull-req]: https://help.github.com/articles/using-pull-requests
diff --git a/vendor/github.com/go-chi/chi/v5/LICENSE b/vendor/github.com/go-chi/chi/v5/LICENSE
new file mode 100644 (file)
index 0000000..d99f02f
--- /dev/null
@@ -0,0 +1,20 @@
+Copyright (c) 2015-present Peter Kieltyka (https://github.com/pkieltyka), Google Inc.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/vendor/github.com/go-chi/chi/v5/Makefile b/vendor/github.com/go-chi/chi/v5/Makefile
new file mode 100644 (file)
index 0000000..970a219
--- /dev/null
@@ -0,0 +1,18 @@
+all:
+       @echo "**********************************************************"
+       @echo "**                    chi build tool                    **"
+       @echo "**********************************************************"
+
+
+test:
+       go clean -testcache && $(MAKE) test-router && $(MAKE) test-middleware
+
+test-router:
+       go test -race -v .
+
+test-middleware:
+       go test -race -v ./middleware
+
+.PHONY: docs
+docs:
+       npx docsify-cli serve ./docs
diff --git a/vendor/github.com/go-chi/chi/v5/README.md b/vendor/github.com/go-chi/chi/v5/README.md
new file mode 100644 (file)
index 0000000..5d504d1
--- /dev/null
@@ -0,0 +1,500 @@
+# <img alt="chi" src="https://cdn.rawgit.com/go-chi/chi/master/_examples/chi.svg" width="220" />
+
+
+[![GoDoc Widget]][GoDoc] [![Travis Widget]][Travis]
+
+`chi` is a lightweight, idiomatic and composable router for building Go HTTP services. It's
+especially good at helping you write large REST API services that are kept maintainable as your
+project grows and changes. `chi` is built on the new `context` package introduced in Go 1.7 to
+handle signaling, cancelation and request-scoped values across a handler chain.
+
+The focus of the project has been to seek out an elegant and comfortable design for writing
+REST API servers, written during the development of the Pressly API service that powers our
+public API service, which in turn powers all of our client-side applications.
+
+The key considerations of chi's design are: project structure, maintainability, standard http
+handlers (stdlib-only), developer productivity, and deconstructing a large system into many small
+parts. The core router `github.com/go-chi/chi` is quite small (less than 1000 LOC), but we've also
+included some useful/optional subpackages: [middleware](/middleware), [render](https://github.com/go-chi/render)
+and [docgen](https://github.com/go-chi/docgen). We hope you enjoy it too!
+
+## Install
+
+`go get -u github.com/go-chi/chi/v5`
+
+
+## Features
+
+* **Lightweight** - cloc'd in ~1000 LOC for the chi router
+* **Fast** - yes, see [benchmarks](#benchmarks)
+* **100% compatible with net/http** - use any http or middleware pkg in the ecosystem that is also compatible with `net/http`
+* **Designed for modular/composable APIs** - middlewares, inline middlewares, route groups and sub-router mounting
+* **Context control** - built on new `context` package, providing value chaining, cancellations and timeouts
+* **Robust** - in production at Pressly, CloudFlare, Heroku, 99Designs, and many others (see [discussion](https://github.com/go-chi/chi/issues/91))
+* **Doc generation** - `docgen` auto-generates routing documentation from your source to JSON or Markdown
+* **Go.mod support** - as of v5, go.mod support (see [CHANGELOG](https://github.com/go-chi/chi/blob/master/CHANGELOG.md))
+* **No external dependencies** - plain ol' Go stdlib + net/http
+
+
+## Examples
+
+See [_examples/](https://github.com/go-chi/chi/blob/master/_examples/) for a variety of examples.
+
+
+**As easy as:**
+
+```go
+package main
+
+import (
+       "net/http"
+
+       "github.com/go-chi/chi/v5"
+       "github.com/go-chi/chi/v5/middleware"
+)
+
+func main() {
+       r := chi.NewRouter()
+       r.Use(middleware.Logger)
+       r.Get("/", func(w http.ResponseWriter, r *http.Request) {
+               w.Write([]byte("welcome"))
+       })
+       http.ListenAndServe(":3000", r)
+}
+```
+
+**REST Preview:**
+
+Here is a little preview of how routing looks like with chi. Also take a look at the generated routing docs
+in JSON ([routes.json](https://github.com/go-chi/chi/blob/master/_examples/rest/routes.json)) and in
+Markdown ([routes.md](https://github.com/go-chi/chi/blob/master/_examples/rest/routes.md)).
+
+I highly recommend reading the source of the [examples](https://github.com/go-chi/chi/blob/master/_examples/) listed
+above, they will show you all the features of chi and serve as a good form of documentation.
+
+```go
+import (
+  //...
+  "context"
+  "github.com/go-chi/chi/v5"
+  "github.com/go-chi/chi/v5/middleware"
+)
+
+func main() {
+  r := chi.NewRouter()
+
+  // A good base middleware stack
+  r.Use(middleware.RequestID)
+  r.Use(middleware.RealIP)
+  r.Use(middleware.Logger)
+  r.Use(middleware.Recoverer)
+
+  // Set a timeout value on the request context (ctx), that will signal
+  // through ctx.Done() that the request has timed out and further
+  // processing should be stopped.
+  r.Use(middleware.Timeout(60 * time.Second))
+
+  r.Get("/", func(w http.ResponseWriter, r *http.Request) {
+    w.Write([]byte("hi"))
+  })
+
+  // RESTy routes for "articles" resource
+  r.Route("/articles", func(r chi.Router) {
+    r.With(paginate).Get("/", listArticles)                           // GET /articles
+    r.With(paginate).Get("/{month}-{day}-{year}", listArticlesByDate) // GET /articles/01-16-2017
+
+    r.Post("/", createArticle)                                        // POST /articles
+    r.Get("/search", searchArticles)                                  // GET /articles/search
+
+    // Regexp url parameters:
+    r.Get("/{articleSlug:[a-z-]+}", getArticleBySlug)                // GET /articles/home-is-toronto
+
+    // Subrouters:
+    r.Route("/{articleID}", func(r chi.Router) {
+      r.Use(ArticleCtx)
+      r.Get("/", getArticle)                                          // GET /articles/123
+      r.Put("/", updateArticle)                                       // PUT /articles/123
+      r.Delete("/", deleteArticle)                                    // DELETE /articles/123
+    })
+  })
+
+  // Mount the admin sub-router
+  r.Mount("/admin", adminRouter())
+
+  http.ListenAndServe(":3333", r)
+}
+
+func ArticleCtx(next http.Handler) http.Handler {
+  return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+    articleID := chi.URLParam(r, "articleID")
+    article, err := dbGetArticle(articleID)
+    if err != nil {
+      http.Error(w, http.StatusText(404), 404)
+      return
+    }
+    ctx := context.WithValue(r.Context(), "article", article)
+    next.ServeHTTP(w, r.WithContext(ctx))
+  })
+}
+
+func getArticle(w http.ResponseWriter, r *http.Request) {
+  ctx := r.Context()
+  article, ok := ctx.Value("article").(*Article)
+  if !ok {
+    http.Error(w, http.StatusText(422), 422)
+    return
+  }
+  w.Write([]byte(fmt.Sprintf("title:%s", article.Title)))
+}
+
+// A completely separate router for administrator routes
+func adminRouter() http.Handler {
+  r := chi.NewRouter()
+  r.Use(AdminOnly)
+  r.Get("/", adminIndex)
+  r.Get("/accounts", adminListAccounts)
+  return r
+}
+
+func AdminOnly(next http.Handler) http.Handler {
+  return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+    ctx := r.Context()
+    perm, ok := ctx.Value("acl.permission").(YourPermissionType)
+    if !ok || !perm.IsAdmin() {
+      http.Error(w, http.StatusText(403), 403)
+      return
+    }
+    next.ServeHTTP(w, r)
+  })
+}
+```
+
+
+## Router interface
+
+chi's router is based on a kind of [Patricia Radix trie](https://en.wikipedia.org/wiki/Radix_tree).
+The router is fully compatible with `net/http`.
+
+Built on top of the tree is the `Router` interface:
+
+```go
+// Router consisting of the core routing methods used by chi's Mux,
+// using only the standard net/http.
+type Router interface {
+       http.Handler
+       Routes
+
+       // Use appends one or more middlewares onto the Router stack.
+       Use(middlewares ...func(http.Handler) http.Handler)
+
+       // With adds inline middlewares for an endpoint handler.
+       With(middlewares ...func(http.Handler) http.Handler) Router
+
+       // Group adds a new inline-Router along the current routing
+       // path, with a fresh middleware stack for the inline-Router.
+       Group(fn func(r Router)) Router
+
+       // Route mounts a sub-Router along a `pattern`` string.
+       Route(pattern string, fn func(r Router)) Router
+
+       // Mount attaches another http.Handler along ./pattern/*
+       Mount(pattern string, h http.Handler)
+
+       // Handle and HandleFunc adds routes for `pattern` that matches
+       // all HTTP methods.
+       Handle(pattern string, h http.Handler)
+       HandleFunc(pattern string, h http.HandlerFunc)
+
+       // Method and MethodFunc adds routes for `pattern` that matches
+       // the `method` HTTP method.
+       Method(method, pattern string, h http.Handler)
+       MethodFunc(method, pattern string, h http.HandlerFunc)
+
+       // HTTP-method routing along `pattern`
+       Connect(pattern string, h http.HandlerFunc)
+       Delete(pattern string, h http.HandlerFunc)
+       Get(pattern string, h http.HandlerFunc)
+       Head(pattern string, h http.HandlerFunc)
+       Options(pattern string, h http.HandlerFunc)
+       Patch(pattern string, h http.HandlerFunc)
+       Post(pattern string, h http.HandlerFunc)
+       Put(pattern string, h http.HandlerFunc)
+       Trace(pattern string, h http.HandlerFunc)
+
+       // NotFound defines a handler to respond whenever a route could
+       // not be found.
+       NotFound(h http.HandlerFunc)
+
+       // MethodNotAllowed defines a handler to respond whenever a method is
+       // not allowed.
+       MethodNotAllowed(h http.HandlerFunc)
+}
+
+// Routes interface adds two methods for router traversal, which is also
+// used by the github.com/go-chi/docgen package to generate documentation for Routers.
+type Routes interface {
+       // Routes returns the routing tree in an easily traversable structure.
+       Routes() []Route
+
+       // Middlewares returns the list of middlewares in use by the router.
+       Middlewares() Middlewares
+
+       // Match searches the routing tree for a handler that matches
+       // the method/path - similar to routing a http request, but without
+       // executing the handler thereafter.
+       Match(rctx *Context, method, path string) bool
+}
+```
+
+Each routing method accepts a URL `pattern` and chain of `handlers`. The URL pattern
+supports named params (ie. `/users/{userID}`) and wildcards (ie. `/admin/*`). URL parameters
+can be fetched at runtime by calling `chi.URLParam(r, "userID")` for named parameters
+and `chi.URLParam(r, "*")` for a wildcard parameter.
+
+
+### Middleware handlers
+
+chi's middlewares are just stdlib net/http middleware handlers. There is nothing special
+about them, which means the router and all the tooling is designed to be compatible and
+friendly with any middleware in the community. This offers much better extensibility and reuse
+of packages and is at the heart of chi's purpose.
+
+Here is an example of a standard net/http middleware where we assign a context key `"user"`
+the value of `"123"`. This middleware sets a hypothetical user identifier on the request
+context and calls the next handler in the chain.
+
+```go
+// HTTP middleware setting a value on the request context
+func MyMiddleware(next http.Handler) http.Handler {
+  return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+    // create new context from `r` request context, and assign key `"user"`
+    // to value of `"123"`
+    ctx := context.WithValue(r.Context(), "user", "123")
+
+    // call the next handler in the chain, passing the response writer and
+    // the updated request object with the new context value.
+    //
+    // note: context.Context values are nested, so any previously set
+    // values will be accessible as well, and the new `"user"` key
+    // will be accessible from this point forward.
+    next.ServeHTTP(w, r.WithContext(ctx))
+  })
+}
+```
+
+
+### Request handlers
+
+chi uses standard net/http request handlers. This little snippet is an example of a http.Handler
+func that reads a user identifier from the request context - hypothetically, identifying
+the user sending an authenticated request, validated+set by a previous middleware handler.
+
+```go
+// HTTP handler accessing data from the request context.
+func MyRequestHandler(w http.ResponseWriter, r *http.Request) {
+  // here we read from the request context and fetch out `"user"` key set in
+  // the MyMiddleware example above.
+  user := r.Context().Value("user").(string)
+
+  // respond to the client
+  w.Write([]byte(fmt.Sprintf("hi %s", user)))
+}
+```
+
+
+### URL parameters
+
+chi's router parses and stores URL parameters right onto the request context. Here is
+an example of how to access URL params in your net/http handlers. And of course, middlewares
+are able to access the same information.
+
+```go
+// HTTP handler accessing the url routing parameters.
+func MyRequestHandler(w http.ResponseWriter, r *http.Request) {
+  // fetch the url parameter `"userID"` from the request of a matching
+  // routing pattern. An example routing pattern could be: /users/{userID}
+  userID := chi.URLParam(r, "userID")
+
+  // fetch `"key"` from the request context
+  ctx := r.Context()
+  key := ctx.Value("key").(string)
+
+  // respond to the client
+  w.Write([]byte(fmt.Sprintf("hi %v, %v", userID, key)))
+}
+```
+
+
+## Middlewares
+
+chi comes equipped with an optional `middleware` package, providing a suite of standard
+`net/http` middlewares. Please note, any middleware in the ecosystem that is also compatible
+with `net/http` can be used with chi's mux.
+
+### Core middlewares
+
+----------------------------------------------------------------------------------------------------
+| chi/middleware Handler | description                                                             |
+| :--------------------- | :---------------------------------------------------------------------- |
+| [AllowContentEncoding] | Enforces a whitelist of request Content-Encoding headers                |
+| [AllowContentType]     | Explicit whitelist of accepted request Content-Types                    |
+| [BasicAuth]            | Basic HTTP authentication                                               |
+| [Compress]             | Gzip compression for clients that accept compressed responses           |
+| [ContentCharset]       | Ensure charset for Content-Type request headers                         |
+| [CleanPath]            | Clean double slashes from request path                                  |
+| [GetHead]              | Automatically route undefined HEAD requests to GET handlers             |
+| [Heartbeat]            | Monitoring endpoint to check the servers pulse                          |
+| [Logger]               | Logs the start and end of each request with the elapsed processing time |
+| [NoCache]              | Sets response headers to prevent clients from caching                   |
+| [Profiler]             | Easily attach net/http/pprof to your routers                            |
+| [RealIP]               | Sets a http.Request's RemoteAddr to either X-Real-IP or X-Forwarded-For |
+| [Recoverer]            | Gracefully absorb panics and prints the stack trace                     |
+| [RequestID]            | Injects a request ID into the context of each request                   |
+| [RedirectSlashes]      | Redirect slashes on routing paths                                       |
+| [RouteHeaders]         | Route handling for request headers                                      |
+| [SetHeader]            | Short-hand middleware to set a response header key/value                |
+| [StripSlashes]         | Strip slashes on routing paths                                          |
+| [Throttle]             | Puts a ceiling on the number of concurrent requests                     |
+| [Timeout]              | Signals to the request context when the timeout deadline is reached     |
+| [URLFormat]            | Parse extension from url and put it on request context                  |
+| [WithValue]            | Short-hand middleware to set a key/value on the request context         |
+----------------------------------------------------------------------------------------------------
+
+[AllowContentEncoding]: https://pkg.go.dev/github.com/go-chi/chi/middleware#AllowContentEncoding
+[AllowContentType]: https://pkg.go.dev/github.com/go-chi/chi/middleware#AllowContentType
+[BasicAuth]: https://pkg.go.dev/github.com/go-chi/chi/middleware#BasicAuth
+[Compress]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Compress
+[ContentCharset]: https://pkg.go.dev/github.com/go-chi/chi/middleware#ContentCharset
+[CleanPath]: https://pkg.go.dev/github.com/go-chi/chi/middleware#CleanPath
+[GetHead]: https://pkg.go.dev/github.com/go-chi/chi/middleware#GetHead
+[GetReqID]: https://pkg.go.dev/github.com/go-chi/chi/middleware#GetReqID
+[Heartbeat]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Heartbeat
+[Logger]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Logger
+[NoCache]: https://pkg.go.dev/github.com/go-chi/chi/middleware#NoCache
+[Profiler]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Profiler
+[RealIP]: https://pkg.go.dev/github.com/go-chi/chi/middleware#RealIP
+[Recoverer]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Recoverer
+[RedirectSlashes]: https://pkg.go.dev/github.com/go-chi/chi/middleware#RedirectSlashes
+[RequestLogger]: https://pkg.go.dev/github.com/go-chi/chi/middleware#RequestLogger
+[RequestID]: https://pkg.go.dev/github.com/go-chi/chi/middleware#RequestID
+[RouteHeaders]: https://pkg.go.dev/github.com/go-chi/chi/middleware#RouteHeaders
+[SetHeader]: https://pkg.go.dev/github.com/go-chi/chi/middleware#SetHeader
+[StripSlashes]: https://pkg.go.dev/github.com/go-chi/chi/middleware#StripSlashes
+[Throttle]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Throttle
+[ThrottleBacklog]: https://pkg.go.dev/github.com/go-chi/chi/middleware#ThrottleBacklog
+[ThrottleWithOpts]: https://pkg.go.dev/github.com/go-chi/chi/middleware#ThrottleWithOpts
+[Timeout]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Timeout
+[URLFormat]: https://pkg.go.dev/github.com/go-chi/chi/middleware#URLFormat
+[WithLogEntry]: https://pkg.go.dev/github.com/go-chi/chi/middleware#WithLogEntry
+[WithValue]: https://pkg.go.dev/github.com/go-chi/chi/middleware#WithValue
+[Compressor]: https://pkg.go.dev/github.com/go-chi/chi/middleware#Compressor
+[DefaultLogFormatter]: https://pkg.go.dev/github.com/go-chi/chi/middleware#DefaultLogFormatter
+[EncoderFunc]: https://pkg.go.dev/github.com/go-chi/chi/middleware#EncoderFunc
+[HeaderRoute]: https://pkg.go.dev/github.com/go-chi/chi/middleware#HeaderRoute
+[HeaderRouter]: https://pkg.go.dev/github.com/go-chi/chi/middleware#HeaderRouter
+[LogEntry]: https://pkg.go.dev/github.com/go-chi/chi/middleware#LogEntry
+[LogFormatter]: https://pkg.go.dev/github.com/go-chi/chi/middleware#LogFormatter
+[LoggerInterface]: https://pkg.go.dev/github.com/go-chi/chi/middleware#LoggerInterface
+[ThrottleOpts]: https://pkg.go.dev/github.com/go-chi/chi/middleware#ThrottleOpts
+[WrapResponseWriter]: https://pkg.go.dev/github.com/go-chi/chi/middleware#WrapResponseWriter
+
+### Extra middlewares & packages
+
+Please see https://github.com/go-chi for additional packages.
+
+--------------------------------------------------------------------------------------------------------------------
+| package                                            | description                                                 |
+|:---------------------------------------------------|:-------------------------------------------------------------
+| [cors](https://github.com/go-chi/cors)             | Cross-origin resource sharing (CORS)                        |
+| [docgen](https://github.com/go-chi/docgen)         | Print chi.Router routes at runtime                          |
+| [jwtauth](https://github.com/go-chi/jwtauth)       | JWT authentication                                          |
+| [hostrouter](https://github.com/go-chi/hostrouter) | Domain/host based request routing                           |
+| [httplog](https://github.com/go-chi/httplog)       | Small but powerful structured HTTP request logging          |
+| [httprate](https://github.com/go-chi/httprate)     | HTTP request rate limiter                                   |
+| [httptracer](https://github.com/go-chi/httptracer) | HTTP request performance tracing library                    |
+| [httpvcr](https://github.com/go-chi/httpvcr)       | Write deterministic tests for external sources              |
+| [stampede](https://github.com/go-chi/stampede)     | HTTP request coalescer                                      |
+--------------------------------------------------------------------------------------------------------------------
+
+
+## context?
+
+`context` is a tiny pkg that provides simple interface to signal context across call stacks
+and goroutines. It was originally written by [Sameer Ajmani](https://github.com/Sajmani)
+and is available in stdlib since go1.7.
+
+Learn more at https://blog.golang.org/context
+
+and..
+* Docs: https://golang.org/pkg/context
+* Source: https://github.com/golang/go/tree/master/src/context
+
+
+## Benchmarks
+
+The benchmark suite: https://github.com/pkieltyka/go-http-routing-benchmark
+
+Results as of Nov 29, 2020 with Go 1.15.5 on Linux AMD 3950x
+
+```shell
+BenchmarkChi_Param             3075895         384 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_Param5            2116603         566 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_Param20            964117        1227 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_ParamWrite        2863413         420 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_GithubStatic      3045488         395 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_GithubParam       2204115         540 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_GithubAll           10000      113811 ns/op           81203 B/op    406 allocs/op
+BenchmarkChi_GPlusStatic       3337485         359 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_GPlusParam        2825853         423 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_GPlus2Params      2471697         483 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_GPlusAll           194220        5950 ns/op            5200 B/op     26 allocs/op
+BenchmarkChi_ParseStatic       3365324         356 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_ParseParam        2976614         404 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_Parse2Params      2638084         439 ns/op             400 B/op      2 allocs/op
+BenchmarkChi_ParseAll           109567       11295 ns/op           10400 B/op     52 allocs/op
+BenchmarkChi_StaticAll           16846       71308 ns/op           62802 B/op    314 allocs/op
+```
+
+Comparison with other routers: https://gist.github.com/pkieltyka/123032f12052520aaccab752bd3e78cc
+
+NOTE: the allocs in the benchmark above are from the calls to http.Request's
+`WithContext(context.Context)` method that clones the http.Request, sets the `Context()`
+on the duplicated (alloc'd) request and returns it the new request object. This is just
+how setting context on a request in Go works.
+
+
+## Credits
+
+* Carl Jackson for https://github.com/zenazn/goji
+  * Parts of chi's thinking comes from goji, and chi's middleware package
+    sources from goji.
+* Armon Dadgar for https://github.com/armon/go-radix
+* Contributions: [@VojtechVitek](https://github.com/VojtechVitek)
+
+We'll be more than happy to see [your contributions](./CONTRIBUTING.md)!
+
+
+## Beyond REST
+
+chi is just a http router that lets you decompose request handling into many smaller layers.
+Many companies use chi to write REST services for their public APIs. But, REST is just a convention
+for managing state via HTTP, and there's a lot of other pieces required to write a complete client-server
+system or network of microservices.
+
+Looking beyond REST, I also recommend some newer works in the field:
+* [webrpc](https://github.com/webrpc/webrpc) - Web-focused RPC client+server framework with code-gen
+* [gRPC](https://github.com/grpc/grpc-go) - Google's RPC framework via protobufs
+* [graphql](https://github.com/99designs/gqlgen) - Declarative query language
+* [NATS](https://nats.io) - lightweight pub-sub
+
+
+## License
+
+Copyright (c) 2015-present [Peter Kieltyka](https://github.com/pkieltyka)
+
+Licensed under [MIT License](./LICENSE)
+
+[GoDoc]: https://pkg.go.dev/github.com/go-chi/chi?tab=versions
+[GoDoc Widget]: https://godoc.org/github.com/go-chi/chi?status.svg
+[Travis]: https://travis-ci.org/go-chi/chi
+[Travis Widget]: https://travis-ci.org/go-chi/chi.svg?branch=master
diff --git a/vendor/github.com/go-chi/chi/v5/chain.go b/vendor/github.com/go-chi/chi/v5/chain.go
new file mode 100644 (file)
index 0000000..a227841
--- /dev/null
@@ -0,0 +1,49 @@
+package chi
+
+import "net/http"
+
+// Chain returns a Middlewares type from a slice of middleware handlers.
+func Chain(middlewares ...func(http.Handler) http.Handler) Middlewares {
+       return Middlewares(middlewares)
+}
+
+// Handler builds and returns a http.Handler from the chain of middlewares,
+// with `h http.Handler` as the final handler.
+func (mws Middlewares) Handler(h http.Handler) http.Handler {
+       return &ChainHandler{h, chain(mws, h), mws}
+}
+
+// HandlerFunc builds and returns a http.Handler from the chain of middlewares,
+// with `h http.Handler` as the final handler.
+func (mws Middlewares) HandlerFunc(h http.HandlerFunc) http.Handler {
+       return &ChainHandler{h, chain(mws, h), mws}
+}
+
+// ChainHandler is a http.Handler with support for handler composition and
+// execution.
+type ChainHandler struct {
+       Endpoint    http.Handler
+       chain       http.Handler
+       Middlewares Middlewares
+}
+
+func (c *ChainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+       c.chain.ServeHTTP(w, r)
+}
+
+// chain builds a http.Handler composed of an inline middleware stack and endpoint
+// handler in the order they are passed.
+func chain(middlewares []func(http.Handler) http.Handler, endpoint http.Handler) http.Handler {
+       // Return ahead of time if there aren't any middlewares for the chain
+       if len(middlewares) == 0 {
+               return endpoint
+       }
+
+       // Wrap the end handler with the middleware chain
+       h := middlewares[len(middlewares)-1](endpoint)
+       for i := len(middlewares) - 2; i >= 0; i-- {
+               h = middlewares[i](h)
+       }
+
+       return h
+}
diff --git a/vendor/github.com/go-chi/chi/v5/chi.go b/vendor/github.com/go-chi/chi/v5/chi.go
new file mode 100644 (file)
index 0000000..d2e5354
--- /dev/null
@@ -0,0 +1,134 @@
+//
+// Package chi is a small, idiomatic and composable router for building HTTP services.
+//
+// chi requires Go 1.10 or newer.
+//
+// Example:
+//  package main
+//
+//  import (
+//     "net/http"
+//
+//     "github.com/go-chi/chi/v5"
+//     "github.com/go-chi/chi/v5/middleware"
+//  )
+//
+//  func main() {
+//     r := chi.NewRouter()
+//     r.Use(middleware.Logger)
+//     r.Use(middleware.Recoverer)
+//
+//     r.Get("/", func(w http.ResponseWriter, r *http.Request) {
+//             w.Write([]byte("root."))
+//     })
+//
+//     http.ListenAndServe(":3333", r)
+//  }
+//
+// See github.com/go-chi/chi/_examples/ for more in-depth examples.
+//
+// URL patterns allow for easy matching of path components in HTTP
+// requests. The matching components can then be accessed using
+// chi.URLParam(). All patterns must begin with a slash.
+//
+// A simple named placeholder {name} matches any sequence of characters
+// up to the next / or the end of the URL. Trailing slashes on paths must
+// be handled explicitly.
+//
+// A placeholder with a name followed by a colon allows a regular
+// expression match, for example {number:\\d+}. The regular expression
+// syntax is Go's normal regexp RE2 syntax, except that regular expressions
+// including { or } are not supported, and / will never be
+// matched. An anonymous regexp pattern is allowed, using an empty string
+// before the colon in the placeholder, such as {:\\d+}
+//
+// The special placeholder of asterisk matches the rest of the requested
+// URL. Any trailing characters in the pattern are ignored. This is the only
+// placeholder which will match / characters.
+//
+// Examples:
+//  "/user/{name}" matches "/user/jsmith" but not "/user/jsmith/info" or "/user/jsmith/"
+//  "/user/{name}/info" matches "/user/jsmith/info"
+//  "/page/*" matches "/page/intro/latest"
+//  "/page/*/index" also matches "/page/intro/latest"
+//  "/date/{yyyy:\\d\\d\\d\\d}/{mm:\\d\\d}/{dd:\\d\\d}" matches "/date/2017/04/01"
+//
+package chi
+
+import "net/http"
+
+// NewRouter returns a new Mux object that implements the Router interface.
+func NewRouter() *Mux {
+       return NewMux()
+}
+
+// Router consisting of the core routing methods used by chi's Mux,
+// using only the standard net/http.
+type Router interface {
+       http.Handler
+       Routes
+
+       // Use appends one or more middlewares onto the Router stack.
+       Use(middlewares ...func(http.Handler) http.Handler)
+
+       // With adds inline middlewares for an endpoint handler.
+       With(middlewares ...func(http.Handler) http.Handler) Router
+
+       // Group adds a new inline-Router along the current routing
+       // path, with a fresh middleware stack for the inline-Router.
+       Group(fn func(r Router)) Router
+
+       // Route mounts a sub-Router along a `pattern`` string.
+       Route(pattern string, fn func(r Router)) Router
+
+       // Mount attaches another http.Handler along ./pattern/*
+       Mount(pattern string, h http.Handler)
+
+       // Handle and HandleFunc adds routes for `pattern` that matches
+       // all HTTP methods.
+       Handle(pattern string, h http.Handler)
+       HandleFunc(pattern string, h http.HandlerFunc)
+
+       // Method and MethodFunc adds routes for `pattern` that matches
+       // the `method` HTTP method.
+       Method(method, pattern string, h http.Handler)
+       MethodFunc(method, pattern string, h http.HandlerFunc)
+
+       // HTTP-method routing along `pattern`
+       Connect(pattern string, h http.HandlerFunc)
+       Delete(pattern string, h http.HandlerFunc)
+       Get(pattern string, h http.HandlerFunc)
+       Head(pattern string, h http.HandlerFunc)
+       Options(pattern string, h http.HandlerFunc)
+       Patch(pattern string, h http.HandlerFunc)
+       Post(pattern string, h http.HandlerFunc)
+       Put(pattern string, h http.HandlerFunc)
+       Trace(pattern string, h http.HandlerFunc)
+
+       // NotFound defines a handler to respond whenever a route could
+       // not be found.
+       NotFound(h http.HandlerFunc)
+
+       // MethodNotAllowed defines a handler to respond whenever a method is
+       // not allowed.
+       MethodNotAllowed(h http.HandlerFunc)
+}
+
+// Routes interface adds two methods for router traversal, which is also
+// used by the `docgen` subpackage to generation documentation for Routers.
+type Routes interface {
+       // Routes returns the routing tree in an easily traversable structure.
+       Routes() []Route
+
+       // Middlewares returns the list of middlewares in use by the router.
+       Middlewares() Middlewares
+
+       // Match searches the routing tree for a handler that matches
+       // the method/path - similar to routing a http request, but without
+       // executing the handler thereafter.
+       Match(rctx *Context, method, path string) bool
+}
+
+// Middlewares type is a slice of standard middleware handlers with methods
+// to compose middleware chains and http.Handler's.
+type Middlewares []func(http.Handler) http.Handler
diff --git a/vendor/github.com/go-chi/chi/v5/context.go b/vendor/github.com/go-chi/chi/v5/context.go
new file mode 100644 (file)
index 0000000..814c263
--- /dev/null
@@ -0,0 +1,157 @@
+package chi
+
+import (
+       "context"
+       "net/http"
+       "strings"
+)
+
+// URLParam returns the url parameter from a http.Request object.
+func URLParam(r *http.Request, key string) string {
+       if rctx := RouteContext(r.Context()); rctx != nil {
+               return rctx.URLParam(key)
+       }
+       return ""
+}
+
+// URLParamFromCtx returns the url parameter from a http.Request Context.
+func URLParamFromCtx(ctx context.Context, key string) string {
+       if rctx := RouteContext(ctx); rctx != nil {
+               return rctx.URLParam(key)
+       }
+       return ""
+}
+
+// RouteContext returns chi's routing Context object from a
+// http.Request Context.
+func RouteContext(ctx context.Context) *Context {
+       val, _ := ctx.Value(RouteCtxKey).(*Context)
+       return val
+}
+
+// NewRouteContext returns a new routing Context object.
+func NewRouteContext() *Context {
+       return &Context{}
+}
+
+var (
+       // RouteCtxKey is the context.Context key to store the request context.
+       RouteCtxKey = &contextKey{"RouteContext"}
+)
+
+// Context is the default routing context set on the root node of a
+// request context to track route patterns, URL parameters and
+// an optional routing path.
+type Context struct {
+       Routes Routes
+
+       // parentCtx is the parent of this one, for using Context as a
+       // context.Context directly. This is an optimization that saves
+       // 1 allocation.
+       parentCtx context.Context
+
+       // Routing path/method override used during the route search.
+       // See Mux#routeHTTP method.
+       RoutePath   string
+       RouteMethod string
+
+       // URLParams are the stack of routeParams captured during the
+       // routing lifecycle across a stack of sub-routers.
+       URLParams RouteParams
+
+       // Route parameters matched for the current sub-router. It is
+       // intentionally unexported so it cant be tampered.
+       routeParams RouteParams
+
+       // The endpoint routing pattern that matched the request URI path
+       // or `RoutePath` of the current sub-router. This value will update
+       // during the lifecycle of a request passing through a stack of
+       // sub-routers.
+       routePattern string
+
+       // Routing pattern stack throughout the lifecycle of the request,
+       // across all connected routers. It is a record of all matching
+       // patterns across a stack of sub-routers.
+       RoutePatterns []string
+
+       // methodNotAllowed hint
+       methodNotAllowed bool
+}
+
+// Reset a routing context to its initial state.
+func (x *Context) Reset() {
+       x.Routes = nil
+       x.RoutePath = ""
+       x.RouteMethod = ""
+       x.RoutePatterns = x.RoutePatterns[:0]
+       x.URLParams.Keys = x.URLParams.Keys[:0]
+       x.URLParams.Values = x.URLParams.Values[:0]
+
+       x.routePattern = ""
+       x.routeParams.Keys = x.routeParams.Keys[:0]
+       x.routeParams.Values = x.routeParams.Values[:0]
+       x.methodNotAllowed = false
+       x.parentCtx = nil
+}
+
+// URLParam returns the corresponding URL parameter value from the request
+// routing context.
+func (x *Context) URLParam(key string) string {
+       for k := len(x.URLParams.Keys) - 1; k >= 0; k-- {
+               if x.URLParams.Keys[k] == key {
+                       return x.URLParams.Values[k]
+               }
+       }
+       return ""
+}
+
+// RoutePattern builds the routing pattern string for the particular
+// request, at the particular point during routing. This means, the value
+// will change throughout the execution of a request in a router. That is
+// why its advised to only use this value after calling the next handler.
+//
+// For example,
+//
+//   func Instrument(next http.Handler) http.Handler {
+//     return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+//       next.ServeHTTP(w, r)
+//       routePattern := chi.RouteContext(r.Context()).RoutePattern()
+//       measure(w, r, routePattern)
+//      })
+//   }
+func (x *Context) RoutePattern() string {
+       routePattern := strings.Join(x.RoutePatterns, "")
+       return replaceWildcards(routePattern)
+}
+
+// replaceWildcards takes a route pattern and recursively replaces all
+// occurrences of "/*/" to "/".
+func replaceWildcards(p string) string {
+       if strings.Contains(p, "/*/") {
+               return replaceWildcards(strings.Replace(p, "/*/", "/", -1))
+       }
+
+       return p
+}
+
+// RouteParams is a structure to track URL routing parameters efficiently.
+type RouteParams struct {
+       Keys, Values []string
+}
+
+// Add will append a URL parameter to the end of the route param
+func (s *RouteParams) Add(key, value string) {
+       s.Keys = append(s.Keys, key)
+       s.Values = append(s.Values, value)
+}
+
+// contextKey is a value for use with context.WithValue. It's used as
+// a pointer so it fits in an interface{} without allocation. This technique
+// for defining context keys was copied from Go 1.7's new use of context in net/http.
+type contextKey struct {
+       name string
+}
+
+func (k *contextKey) String() string {
+       return "chi context value " + k.name
+}
diff --git a/vendor/github.com/go-chi/chi/v5/go.mod b/vendor/github.com/go-chi/chi/v5/go.mod
new file mode 100644 (file)
index 0000000..c084c1d
--- /dev/null
@@ -0,0 +1,3 @@
+module github.com/go-chi/chi/v5
+
+go 1.14
diff --git a/vendor/github.com/go-chi/chi/v5/mux.go b/vendor/github.com/go-chi/chi/v5/mux.go
new file mode 100644 (file)
index 0000000..fff6a3c
--- /dev/null
@@ -0,0 +1,485 @@
+package chi
+
+import (
+       "context"
+       "fmt"
+       "net/http"
+       "strings"
+       "sync"
+)
+
+var _ Router = &Mux{}
+
+// Mux is a simple HTTP route multiplexer that parses a request path,
+// records any URL params, and executes an end handler. It implements
+// the http.Handler interface and is friendly with the standard library.
+//
+// Mux is designed to be fast, minimal and offer a powerful API for building
+// modular and composable HTTP services with a large set of handlers. It's
+// particularly useful for writing large REST API services that break a handler
+// into many smaller parts composed of middlewares and end handlers.
+type Mux struct {
+       // The computed mux handler made of the chained middleware stack and
+       // the tree router
+       handler http.Handler
+
+       // The radix trie router
+       tree *node
+
+       // Custom method not allowed handler
+       methodNotAllowedHandler http.HandlerFunc
+
+       // Controls the behaviour of middleware chain generation when a mux
+       // is registered as an inline group inside another mux.
+       parent *Mux
+
+       // Routing context pool
+       pool *sync.Pool
+
+       // Custom route not found handler
+       notFoundHandler http.HandlerFunc
+
+       // The middleware stack
+       middlewares []func(http.Handler) http.Handler
+
+       inline bool
+}
+
+// NewMux returns a newly initialized Mux object that implements the Router
+// interface.
+func NewMux() *Mux {
+       mux := &Mux{tree: &node{}, pool: &sync.Pool{}}
+       mux.pool.New = func() interface{} {
+               return NewRouteContext()
+       }
+       return mux
+}
+
+// ServeHTTP is the single method of the http.Handler interface that makes
+// Mux interoperable with the standard library. It uses a sync.Pool to get and
+// reuse routing contexts for each request.
+func (mx *Mux) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+       // Ensure the mux has some routes defined on the mux
+       if mx.handler == nil {
+               mx.NotFoundHandler().ServeHTTP(w, r)
+               return
+       }
+
+       // Check if a routing context already exists from a parent router.
+       rctx, _ := r.Context().Value(RouteCtxKey).(*Context)
+       if rctx != nil {
+               mx.handler.ServeHTTP(w, r)
+               return
+       }
+
+       // Fetch a RouteContext object from the sync pool, and call the computed
+       // mx.handler that is comprised of mx.middlewares + mx.routeHTTP.
+       // Once the request is finished, reset the routing context and put it back
+       // into the pool for reuse from another request.
+       rctx = mx.pool.Get().(*Context)
+       rctx.Reset()
+       rctx.Routes = mx
+       rctx.parentCtx = r.Context()
+
+       // NOTE: r.WithContext() causes 2 allocations and context.WithValue() causes 1 allocation
+       r = r.WithContext(context.WithValue(r.Context(), RouteCtxKey, rctx))
+
+       // Serve the request and once its done, put the request context back in the sync pool
+       mx.handler.ServeHTTP(w, r)
+       mx.pool.Put(rctx)
+}
+
+// Use appends a middleware handler to the Mux middleware stack.
+//
+// The middleware stack for any Mux will execute before searching for a matching
+// route to a specific handler, which provides opportunity to respond early,
+// change the course of the request execution, or set request-scoped values for
+// the next http.Handler.
+func (mx *Mux) Use(middlewares ...func(http.Handler) http.Handler) {
+       if mx.handler != nil {
+               panic("chi: all middlewares must be defined before routes on a mux")
+       }
+       mx.middlewares = append(mx.middlewares, middlewares...)
+}
+
+// Handle adds the route `pattern` that matches any http method to
+// execute the `handler` http.Handler.
+func (mx *Mux) Handle(pattern string, handler http.Handler) {
+       mx.handle(mALL, pattern, handler)
+}
+
+// HandleFunc adds the route `pattern` that matches any http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) HandleFunc(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mALL, pattern, handlerFn)
+}
+
+// Method adds the route `pattern` that matches `method` http method to
+// execute the `handler` http.Handler.
+func (mx *Mux) Method(method, pattern string, handler http.Handler) {
+       m, ok := methodMap[strings.ToUpper(method)]
+       if !ok {
+               panic(fmt.Sprintf("chi: '%s' http method is not supported.", method))
+       }
+       mx.handle(m, pattern, handler)
+}
+
+// MethodFunc adds the route `pattern` that matches `method` http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) MethodFunc(method, pattern string, handlerFn http.HandlerFunc) {
+       mx.Method(method, pattern, handlerFn)
+}
+
+// Connect adds the route `pattern` that matches a CONNECT http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Connect(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mCONNECT, pattern, handlerFn)
+}
+
+// Delete adds the route `pattern` that matches a DELETE http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Delete(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mDELETE, pattern, handlerFn)
+}
+
+// Get adds the route `pattern` that matches a GET http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Get(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mGET, pattern, handlerFn)
+}
+
+// Head adds the route `pattern` that matches a HEAD http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Head(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mHEAD, pattern, handlerFn)
+}
+
+// Options adds the route `pattern` that matches a OPTIONS http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Options(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mOPTIONS, pattern, handlerFn)
+}
+
+// Patch adds the route `pattern` that matches a PATCH http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Patch(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mPATCH, pattern, handlerFn)
+}
+
+// Post adds the route `pattern` that matches a POST http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Post(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mPOST, pattern, handlerFn)
+}
+
+// Put adds the route `pattern` that matches a PUT http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Put(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mPUT, pattern, handlerFn)
+}
+
+// Trace adds the route `pattern` that matches a TRACE http method to
+// execute the `handlerFn` http.HandlerFunc.
+func (mx *Mux) Trace(pattern string, handlerFn http.HandlerFunc) {
+       mx.handle(mTRACE, pattern, handlerFn)
+}
+
+// NotFound sets a custom http.HandlerFunc for routing paths that could
+// not be found. The default 404 handler is `http.NotFound`.
+func (mx *Mux) NotFound(handlerFn http.HandlerFunc) {
+       // Build NotFound handler chain
+       m := mx
+       hFn := handlerFn
+       if mx.inline && mx.parent != nil {
+               m = mx.parent
+               hFn = Chain(mx.middlewares...).HandlerFunc(hFn).ServeHTTP
+       }
+
+       // Update the notFoundHandler from this point forward
+       m.notFoundHandler = hFn
+       m.updateSubRoutes(func(subMux *Mux) {
+               if subMux.notFoundHandler == nil {
+                       subMux.NotFound(hFn)
+               }
+       })
+}
+
+// MethodNotAllowed sets a custom http.HandlerFunc for routing paths where the
+// method is unresolved. The default handler returns a 405 with an empty body.
+func (mx *Mux) MethodNotAllowed(handlerFn http.HandlerFunc) {
+       // Build MethodNotAllowed handler chain
+       m := mx
+       hFn := handlerFn
+       if mx.inline && mx.parent != nil {
+               m = mx.parent
+               hFn = Chain(mx.middlewares...).HandlerFunc(hFn).ServeHTTP
+       }
+
+       // Update the methodNotAllowedHandler from this point forward
+       m.methodNotAllowedHandler = hFn
+       m.updateSubRoutes(func(subMux *Mux) {
+               if subMux.methodNotAllowedHandler == nil {
+                       subMux.MethodNotAllowed(hFn)
+               }
+       })
+}
+
+// With adds inline middlewares for an endpoint handler.
+func (mx *Mux) With(middlewares ...func(http.Handler) http.Handler) Router {
+       // Similarly as in handle(), we must build the mux handler once additional
+       // middleware registration isn't allowed for this stack, like now.
+       if !mx.inline && mx.handler == nil {
+               mx.updateRouteHandler()
+       }
+
+       // Copy middlewares from parent inline muxs
+       var mws Middlewares
+       if mx.inline {
+               mws = make(Middlewares, len(mx.middlewares))
+               copy(mws, mx.middlewares)
+       }
+       mws = append(mws, middlewares...)
+
+       im := &Mux{
+               pool: mx.pool, inline: true, parent: mx, tree: mx.tree, middlewares: mws,
+               notFoundHandler: mx.notFoundHandler, methodNotAllowedHandler: mx.methodNotAllowedHandler,
+       }
+
+       return im
+}
+
+// Group creates a new inline-Mux with a fresh middleware stack. It's useful
+// for a group of handlers along the same routing path that use an additional
+// set of middlewares. See _examples/.
+func (mx *Mux) Group(fn func(r Router)) Router {
+       im := mx.With().(*Mux)
+       if fn != nil {
+               fn(im)
+       }
+       return im
+}
+
+// Route creates a new Mux with a fresh middleware stack and mounts it
+// along the `pattern` as a subrouter. Effectively, this is a short-hand
+// call to Mount. See _examples/.
+func (mx *Mux) Route(pattern string, fn func(r Router)) Router {
+       if fn == nil {
+               panic(fmt.Sprintf("chi: attempting to Route() a nil subrouter on '%s'", pattern))
+       }
+       subRouter := NewRouter()
+       fn(subRouter)
+       mx.Mount(pattern, subRouter)
+       return subRouter
+}
+
+// Mount attaches another http.Handler or chi Router as a subrouter along a routing
+// path. It's very useful to split up a large API as many independent routers and
+// compose them as a single service using Mount. See _examples/.
+//
+// Note that Mount() simply sets a wildcard along the `pattern` that will continue
+// routing at the `handler`, which in most cases is another chi.Router. As a result,
+// if you define two Mount() routes on the exact same pattern the mount will panic.
+func (mx *Mux) Mount(pattern string, handler http.Handler) {
+       if handler == nil {
+               panic(fmt.Sprintf("chi: attempting to Mount() a nil handler on '%s'", pattern))
+       }
+
+       // Provide runtime safety for ensuring a pattern isn't mounted on an existing
+       // routing pattern.
+       if mx.tree.findPattern(pattern+"*") || mx.tree.findPattern(pattern+"/*") {
+               panic(fmt.Sprintf("chi: attempting to Mount() a handler on an existing path, '%s'", pattern))
+       }
+
+       // Assign sub-Router's with the parent not found & method not allowed handler if not specified.
+       subr, ok := handler.(*Mux)
+       if ok && subr.notFoundHandler == nil && mx.notFoundHandler != nil {
+               subr.NotFound(mx.notFoundHandler)
+       }
+       if ok && subr.methodNotAllowedHandler == nil && mx.methodNotAllowedHandler != nil {
+               subr.MethodNotAllowed(mx.methodNotAllowedHandler)
+       }
+
+       mountHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+               rctx := RouteContext(r.Context())
+
+               // shift the url path past the previous subrouter
+               rctx.RoutePath = mx.nextRoutePath(rctx)
+
+               // reset the wildcard URLParam which connects the subrouter
+               n := len(rctx.URLParams.Keys) - 1
+               if n >= 0 && rctx.URLParams.Keys[n] == "*" && len(rctx.URLParams.Values) > n {
+                       rctx.URLParams.Values[n] = ""
+               }
+
+               handler.ServeHTTP(w, r)
+       })
+
+       if pattern == "" || pattern[len(pattern)-1] != '/' {
+               mx.handle(mALL|mSTUB, pattern, mountHandler)
+               mx.handle(mALL|mSTUB, pattern+"/", mountHandler)
+               pattern += "/"
+       }
+
+       method := mALL
+       subroutes, _ := handler.(Routes)
+       if subroutes != nil {
+               method |= mSTUB
+       }
+       n := mx.handle(method, pattern+"*", mountHandler)
+
+       if subroutes != nil {
+               n.subroutes = subroutes
+       }
+}
+
+// Routes returns a slice of routing information from the tree,
+// useful for traversing available routes of a router.
+func (mx *Mux) Routes() []Route {
+       return mx.tree.routes()
+}
+
+// Middlewares returns a slice of middleware handler functions.
+func (mx *Mux) Middlewares() Middlewares {
+       return mx.middlewares
+}
+
+// Match searches the routing tree for a handler that matches the method/path.
+// It's similar to routing a http request, but without executing the handler
+// thereafter.
+//
+// Note: the *Context state is updated during execution, so manage
+// the state carefully or make a NewRouteContext().
+func (mx *Mux) Match(rctx *Context, method, path string) bool {
+       m, ok := methodMap[method]
+       if !ok {
+               return false
+       }
+
+       node, _, h := mx.tree.FindRoute(rctx, m, path)
+
+       if node != nil && node.subroutes != nil {
+               rctx.RoutePath = mx.nextRoutePath(rctx)
+               return node.subroutes.Match(rctx, method, rctx.RoutePath)
+       }
+
+       return h != nil
+}
+
+// NotFoundHandler returns the default Mux 404 responder whenever a route
+// cannot be found.
+func (mx *Mux) NotFoundHandler() http.HandlerFunc {
+       if mx.notFoundHandler != nil {
+               return mx.notFoundHandler
+       }
+       return http.NotFound
+}
+
+// MethodNotAllowedHandler returns the default Mux 405 responder whenever
+// a method cannot be resolved for a route.
+func (mx *Mux) MethodNotAllowedHandler() http.HandlerFunc {
+       if mx.methodNotAllowedHandler != nil {
+               return mx.methodNotAllowedHandler
+       }
+       return methodNotAllowedHandler
+}
+
+// handle registers a http.Handler in the routing tree for a particular http method
+// and routing pattern.
+func (mx *Mux) handle(method methodTyp, pattern string, handler http.Handler) *node {
+       if len(pattern) == 0 || pattern[0] != '/' {
+               panic(fmt.Sprintf("chi: routing pattern must begin with '/' in '%s'", pattern))
+       }
+
+       // Build the computed routing handler for this routing pattern.
+       if !mx.inline && mx.handler == nil {
+               mx.updateRouteHandler()
+       }
+
+       // Build endpoint handler with inline middlewares for the route
+       var h http.Handler
+       if mx.inline {
+               mx.handler = http.HandlerFunc(mx.routeHTTP)
+               h = Chain(mx.middlewares...).Handler(handler)
+       } else {
+               h = handler
+       }
+
+       // Add the endpoint to the tree and return the node
+       return mx.tree.InsertRoute(method, pattern, h)
+}
+
+// routeHTTP routes a http.Request through the Mux routing tree to serve
+// the matching handler for a particular http method.
+func (mx *Mux) routeHTTP(w http.ResponseWriter, r *http.Request) {
+       // Grab the route context object
+       rctx := r.Context().Value(RouteCtxKey).(*Context)
+
+       // The request routing path
+       routePath := rctx.RoutePath
+       if routePath == "" {
+               if r.URL.RawPath != "" {
+                       routePath = r.URL.RawPath
+               } else {
+                       routePath = r.URL.Path
+               }
+               if routePath == "" {
+                       routePath = "/"
+               }
+       }
+
+       // Check if method is supported by chi
+       if rctx.RouteMethod == "" {
+               rctx.RouteMethod = r.Method
+       }
+       method, ok := methodMap[rctx.RouteMethod]
+       if !ok {
+               mx.MethodNotAllowedHandler().ServeHTTP(w, r)
+               return
+       }
+
+       // Find the route
+       if _, _, h := mx.tree.FindRoute(rctx, method, routePath); h != nil {
+               h.ServeHTTP(w, r)
+               return
+       }
+       if rctx.methodNotAllowed {
+               mx.MethodNotAllowedHandler().ServeHTTP(w, r)
+       } else {
+               mx.NotFoundHandler().ServeHTTP(w, r)
+       }
+}
+
+func (mx *Mux) nextRoutePath(rctx *Context) string {
+       routePath := "/"
+       nx := len(rctx.routeParams.Keys) - 1 // index of last param in list
+       if nx >= 0 && rctx.routeParams.Keys[nx] == "*" && len(rctx.routeParams.Values) > nx {
+               routePath = "/" + rctx.routeParams.Values[nx]
+       }
+       return routePath
+}
+
+// Recursively update data on child routers.
+func (mx *Mux) updateSubRoutes(fn func(subMux *Mux)) {
+       for _, r := range mx.tree.routes() {
+               subMux, ok := r.SubRoutes.(*Mux)
+               if !ok {
+                       continue
+               }
+               fn(subMux)
+       }
+}
+
+// updateRouteHandler builds the single mux handler that is a chain of the middleware
+// stack, as defined by calls to Use(), and the tree router (Mux) itself. After this
+// point, no other middlewares can be registered on this Mux's stack. But you can still
+// compose additional middlewares via Group()'s or using a chained middleware handler.
+func (mx *Mux) updateRouteHandler() {
+       mx.handler = chain(mx.middlewares, http.HandlerFunc(mx.routeHTTP))
+}
+
+// methodNotAllowedHandler is a helper function to respond with a 405,
+// method not allowed.
+func methodNotAllowedHandler(w http.ResponseWriter, r *http.Request) {
+       w.WriteHeader(405)
+       w.Write(nil)
+}
diff --git a/vendor/github.com/go-chi/chi/v5/tree.go b/vendor/github.com/go-chi/chi/v5/tree.go
new file mode 100644 (file)
index 0000000..4189b52
--- /dev/null
@@ -0,0 +1,866 @@
+package chi
+
+// Radix tree implementation below is a based on the original work by
+// Armon Dadgar in https://github.com/armon/go-radix/blob/master/radix.go
+// (MIT licensed). It's been heavily modified for use as a HTTP routing tree.
+
+import (
+       "fmt"
+       "net/http"
+       "regexp"
+       "sort"
+       "strconv"
+       "strings"
+)
+
+type methodTyp uint
+
+const (
+       mSTUB methodTyp = 1 << iota
+       mCONNECT
+       mDELETE
+       mGET
+       mHEAD
+       mOPTIONS
+       mPATCH
+       mPOST
+       mPUT
+       mTRACE
+)
+
+var mALL = mCONNECT | mDELETE | mGET | mHEAD |
+       mOPTIONS | mPATCH | mPOST | mPUT | mTRACE
+
+var methodMap = map[string]methodTyp{
+       http.MethodConnect: mCONNECT,
+       http.MethodDelete:  mDELETE,
+       http.MethodGet:     mGET,
+       http.MethodHead:    mHEAD,
+       http.MethodOptions: mOPTIONS,
+       http.MethodPatch:   mPATCH,
+       http.MethodPost:    mPOST,
+       http.MethodPut:     mPUT,
+       http.MethodTrace:   mTRACE,
+}
+
+// RegisterMethod adds support for custom HTTP method handlers, available
+// via Router#Method and Router#MethodFunc
+func RegisterMethod(method string) {
+       if method == "" {
+               return
+       }
+       method = strings.ToUpper(method)
+       if _, ok := methodMap[method]; ok {
+               return
+       }
+       n := len(methodMap)
+       if n > strconv.IntSize-2 {
+               panic(fmt.Sprintf("chi: max number of methods reached (%d)", strconv.IntSize))
+       }
+       mt := methodTyp(2 << n)
+       methodMap[method] = mt
+       mALL |= mt
+}
+
+type nodeTyp uint8
+
+const (
+       ntStatic   nodeTyp = iota // /home
+       ntRegexp                  // /{id:[0-9]+}
+       ntParam                   // /{user}
+       ntCatchAll                // /api/v1/*
+)
+
+type node struct {
+       // subroutes on the leaf node
+       subroutes Routes
+
+       // regexp matcher for regexp nodes
+       rex *regexp.Regexp
+
+       // HTTP handler endpoints on the leaf node
+       endpoints endpoints
+
+       // prefix is the common prefix we ignore
+       prefix string
+
+       // child nodes should be stored in-order for iteration,
+       // in groups of the node type.
+       children [ntCatchAll + 1]nodes
+
+       // first byte of the child prefix
+       tail byte
+
+       // node type: static, regexp, param, catchAll
+       typ nodeTyp
+
+       // first byte of the prefix
+       label byte
+}
+
+// endpoints is a mapping of http method constants to handlers
+// for a given route.
+type endpoints map[methodTyp]*endpoint
+
+type endpoint struct {
+       // endpoint handler
+       handler http.Handler
+
+       // pattern is the routing pattern for handler nodes
+       pattern string
+
+       // parameter keys recorded on handler nodes
+       paramKeys []string
+}
+
+func (s endpoints) Value(method methodTyp) *endpoint {
+       mh, ok := s[method]
+       if !ok {
+               mh = &endpoint{}
+               s[method] = mh
+       }
+       return mh
+}
+
+func (n *node) InsertRoute(method methodTyp, pattern string, handler http.Handler) *node {
+       var parent *node
+       search := pattern
+
+       for {
+               // Handle key exhaustion
+               if len(search) == 0 {
+                       // Insert or update the node's leaf handler
+                       n.setEndpoint(method, handler, pattern)
+                       return n
+               }
+
+               // We're going to be searching for a wild node next,
+               // in this case, we need to get the tail
+               var label = search[0]
+               var segTail byte
+               var segEndIdx int
+               var segTyp nodeTyp
+               var segRexpat string
+               if label == '{' || label == '*' {
+                       segTyp, _, segRexpat, segTail, _, segEndIdx = patNextSegment(search)
+               }
+
+               var prefix string
+               if segTyp == ntRegexp {
+                       prefix = segRexpat
+               }
+
+               // Look for the edge to attach to
+               parent = n
+               n = n.getEdge(segTyp, label, segTail, prefix)
+
+               // No edge, create one
+               if n == nil {
+                       child := &node{label: label, tail: segTail, prefix: search}
+                       hn := parent.addChild(child, search)
+                       hn.setEndpoint(method, handler, pattern)
+
+                       return hn
+               }
+
+               // Found an edge to match the pattern
+
+               if n.typ > ntStatic {
+                       // We found a param node, trim the param from the search path and continue.
+                       // This param/wild pattern segment would already be on the tree from a previous
+                       // call to addChild when creating a new node.
+                       search = search[segEndIdx:]
+                       continue
+               }
+
+               // Static nodes fall below here.
+               // Determine longest prefix of the search key on match.
+               commonPrefix := longestPrefix(search, n.prefix)
+               if commonPrefix == len(n.prefix) {
+                       // the common prefix is as long as the current node's prefix we're attempting to insert.
+                       // keep the search going.
+                       search = search[commonPrefix:]
+                       continue
+               }
+
+               // Split the node
+               child := &node{
+                       typ:    ntStatic,
+                       prefix: search[:commonPrefix],
+               }
+               parent.replaceChild(search[0], segTail, child)
+
+               // Restore the existing node
+               n.label = n.prefix[commonPrefix]
+               n.prefix = n.prefix[commonPrefix:]
+               child.addChild(n, n.prefix)
+
+               // If the new key is a subset, set the method/handler on this node and finish.
+               search = search[commonPrefix:]
+               if len(search) == 0 {
+                       child.setEndpoint(method, handler, pattern)
+                       return child
+               }
+
+               // Create a new edge for the node
+               subchild := &node{
+                       typ:    ntStatic,
+                       label:  search[0],
+                       prefix: search,
+               }
+               hn := child.addChild(subchild, search)
+               hn.setEndpoint(method, handler, pattern)
+               return hn
+       }
+}
+
+// addChild appends the new `child` node to the tree using the `pattern` as the trie key.
+// For a URL router like chi's, we split the static, param, regexp and wildcard segments
+// into different nodes. In addition, addChild will recursively call itself until every
+// pattern segment is added to the url pattern tree as individual nodes, depending on type.
+func (n *node) addChild(child *node, prefix string) *node {
+       search := prefix
+
+       // handler leaf node added to the tree is the child.
+       // this may be overridden later down the flow
+       hn := child
+
+       // Parse next segment
+       segTyp, _, segRexpat, segTail, segStartIdx, segEndIdx := patNextSegment(search)
+
+       // Add child depending on next up segment
+       switch segTyp {
+
+       case ntStatic:
+               // Search prefix is all static (that is, has no params in path)
+               // noop
+
+       default:
+               // Search prefix contains a param, regexp or wildcard
+
+               if segTyp == ntRegexp {
+                       rex, err := regexp.Compile(segRexpat)
+                       if err != nil {
+                               panic(fmt.Sprintf("chi: invalid regexp pattern '%s' in route param", segRexpat))
+                       }
+                       child.prefix = segRexpat
+                       child.rex = rex
+               }
+
+               if segStartIdx == 0 {
+                       // Route starts with a param
+                       child.typ = segTyp
+
+                       if segTyp == ntCatchAll {
+                               segStartIdx = -1
+                       } else {
+                               segStartIdx = segEndIdx
+                       }
+                       if segStartIdx < 0 {
+                               segStartIdx = len(search)
+                       }
+                       child.tail = segTail // for params, we set the tail
+
+                       if segStartIdx != len(search) {
+                               // add static edge for the remaining part, split the end.
+                               // its not possible to have adjacent param nodes, so its certainly
+                               // going to be a static node next.
+
+                               search = search[segStartIdx:] // advance search position
+
+                               nn := &node{
+                                       typ:    ntStatic,
+                                       label:  search[0],
+                                       prefix: search,
+                               }
+                               hn = child.addChild(nn, search)
+                       }
+
+               } else if segStartIdx > 0 {
+                       // Route has some param
+
+                       // starts with a static segment
+                       child.typ = ntStatic
+                       child.prefix = search[:segStartIdx]
+                       child.rex = nil
+
+                       // add the param edge node
+                       search = search[segStartIdx:]
+
+                       nn := &node{
+                               typ:   segTyp,
+                               label: search[0],
+                               tail:  segTail,
+                       }
+                       hn = child.addChild(nn, search)
+
+               }
+       }
+
+       n.children[child.typ] = append(n.children[child.typ], child)
+       n.children[child.typ].Sort()
+       return hn
+}
+
+func (n *node) replaceChild(label, tail byte, child *node) {
+       for i := 0; i < len(n.children[child.typ]); i++ {
+               if n.children[child.typ][i].label == label && n.children[child.typ][i].tail == tail {
+                       n.children[child.typ][i] = child
+                       n.children[child.typ][i].label = label
+                       n.children[child.typ][i].tail = tail
+                       return
+               }
+       }
+       panic("chi: replacing missing child")
+}
+
+func (n *node) getEdge(ntyp nodeTyp, label, tail byte, prefix string) *node {
+       nds := n.children[ntyp]
+       for i := 0; i < len(nds); i++ {
+               if nds[i].label == label && nds[i].tail == tail {
+                       if ntyp == ntRegexp && nds[i].prefix != prefix {
+                               continue
+                       }
+                       return nds[i]
+               }
+       }
+       return nil
+}
+
+func (n *node) setEndpoint(method methodTyp, handler http.Handler, pattern string) {
+       // Set the handler for the method type on the node
+       if n.endpoints == nil {
+               n.endpoints = make(endpoints)
+       }
+
+       paramKeys := patParamKeys(pattern)
+
+       if method&mSTUB == mSTUB {
+               n.endpoints.Value(mSTUB).handler = handler
+       }
+       if method&mALL == mALL {
+               h := n.endpoints.Value(mALL)
+               h.handler = handler
+               h.pattern = pattern
+               h.paramKeys = paramKeys
+               for _, m := range methodMap {
+                       h := n.endpoints.Value(m)
+                       h.handler = handler
+                       h.pattern = pattern
+                       h.paramKeys = paramKeys
+               }
+       } else {
+               h := n.endpoints.Value(method)
+               h.handler = handler
+               h.pattern = pattern
+               h.paramKeys = paramKeys
+       }
+}
+
+func (n *node) FindRoute(rctx *Context, method methodTyp, path string) (*node, endpoints, http.Handler) {
+       // Reset the context routing pattern and params
+       rctx.routePattern = ""
+       rctx.routeParams.Keys = rctx.routeParams.Keys[:0]
+       rctx.routeParams.Values = rctx.routeParams.Values[:0]
+
+       // Find the routing handlers for the path
+       rn := n.findRoute(rctx, method, path)
+       if rn == nil {
+               return nil, nil, nil
+       }
+
+       // Record the routing params in the request lifecycle
+       rctx.URLParams.Keys = append(rctx.URLParams.Keys, rctx.routeParams.Keys...)
+       rctx.URLParams.Values = append(rctx.URLParams.Values, rctx.routeParams.Values...)
+
+       // Record the routing pattern in the request lifecycle
+       if rn.endpoints[method].pattern != "" {
+               rctx.routePattern = rn.endpoints[method].pattern
+               rctx.RoutePatterns = append(rctx.RoutePatterns, rctx.routePattern)
+       }
+
+       return rn, rn.endpoints, rn.endpoints[method].handler
+}
+
+// Recursive edge traversal by checking all nodeTyp groups along the way.
+// It's like searching through a multi-dimensional radix trie.
+func (n *node) findRoute(rctx *Context, method methodTyp, path string) *node {
+       nn := n
+       search := path
+
+       for t, nds := range nn.children {
+               ntyp := nodeTyp(t)
+               if len(nds) == 0 {
+                       continue
+               }
+
+               var xn *node
+               xsearch := search
+
+               var label byte
+               if search != "" {
+                       label = search[0]
+               }
+
+               switch ntyp {
+               case ntStatic:
+                       xn = nds.findEdge(label)
+                       if xn == nil || !strings.HasPrefix(xsearch, xn.prefix) {
+                               continue
+                       }
+                       xsearch = xsearch[len(xn.prefix):]
+
+               case ntParam, ntRegexp:
+                       // short-circuit and return no matching route for empty param values
+                       if xsearch == "" {
+                               continue
+                       }
+
+                       // serially loop through each node grouped by the tail delimiter
+                       for idx := 0; idx < len(nds); idx++ {
+                               xn = nds[idx]
+
+                               // label for param nodes is the delimiter byte
+                               p := strings.IndexByte(xsearch, xn.tail)
+
+                               if p < 0 {
+                                       if xn.tail == '/' {
+                                               p = len(xsearch)
+                                       } else {
+                                               continue
+                                       }
+                               } else if ntyp == ntRegexp && p == 0 {
+                                       continue
+                               }
+
+                               if ntyp == ntRegexp && xn.rex != nil {
+                                       if !xn.rex.MatchString(xsearch[:p]) {
+                                               continue
+                                       }
+                               } else if strings.IndexByte(xsearch[:p], '/') != -1 {
+                                       // avoid a match across path segments
+                                       continue
+                               }
+
+                               prevlen := len(rctx.routeParams.Values)
+                               rctx.routeParams.Values = append(rctx.routeParams.Values, xsearch[:p])
+                               xsearch = xsearch[p:]
+
+                               if len(xsearch) == 0 {
+                                       if xn.isLeaf() {
+                                               h := xn.endpoints[method]
+                                               if h != nil && h.handler != nil {
+                                                       rctx.routeParams.Keys = append(rctx.routeParams.Keys, h.paramKeys...)
+                                                       return xn
+                                               }
+
+                                               // flag that the routing context found a route, but not a corresponding
+                                               // supported method
+                                               rctx.methodNotAllowed = true
+                                       }
+                               }
+
+                               // recursively find the next node on this branch
+                               fin := xn.findRoute(rctx, method, xsearch)
+                               if fin != nil {
+                                       return fin
+                               }
+
+                               // not found on this branch, reset vars
+                               rctx.routeParams.Values = rctx.routeParams.Values[:prevlen]
+                               xsearch = search
+                       }
+
+                       rctx.routeParams.Values = append(rctx.routeParams.Values, "")
+
+               default:
+                       // catch-all nodes
+                       rctx.routeParams.Values = append(rctx.routeParams.Values, search)
+                       xn = nds[0]
+                       xsearch = ""
+               }
+
+               if xn == nil {
+                       continue
+               }
+
+               // did we find it yet?
+               if len(xsearch) == 0 {
+                       if xn.isLeaf() {
+                               h := xn.endpoints[method]
+                               if h != nil && h.handler != nil {
+                                       rctx.routeParams.Keys = append(rctx.routeParams.Keys, h.paramKeys...)
+                                       return xn
+                               }
+
+                               // flag that the routing context found a route, but not a corresponding
+                               // supported method
+                               rctx.methodNotAllowed = true
+                       }
+               }
+
+               // recursively find the next node..
+               fin := xn.findRoute(rctx, method, xsearch)
+               if fin != nil {
+                       return fin
+               }
+
+               // Did not find final handler, let's remove the param here if it was set
+               if xn.typ > ntStatic {
+                       if len(rctx.routeParams.Values) > 0 {
+                               rctx.routeParams.Values = rctx.routeParams.Values[:len(rctx.routeParams.Values)-1]
+                       }
+               }
+
+       }
+
+       return nil
+}
+
+func (n *node) findEdge(ntyp nodeTyp, label byte) *node {
+       nds := n.children[ntyp]
+       num := len(nds)
+       idx := 0
+
+       switch ntyp {
+       case ntStatic, ntParam, ntRegexp:
+               i, j := 0, num-1
+               for i <= j {
+                       idx = i + (j-i)/2
+                       if label > nds[idx].label {
+                               i = idx + 1
+                       } else if label < nds[idx].label {
+                               j = idx - 1
+                       } else {
+                               i = num // breaks cond
+                       }
+               }
+               if nds[idx].label != label {
+                       return nil
+               }
+               return nds[idx]
+
+       default: // catch all
+               return nds[idx]
+       }
+}
+
+func (n *node) isLeaf() bool {
+       return n.endpoints != nil
+}
+
+func (n *node) findPattern(pattern string) bool {
+       nn := n
+       for _, nds := range nn.children {
+               if len(nds) == 0 {
+                       continue
+               }
+
+               n = nn.findEdge(nds[0].typ, pattern[0])
+               if n == nil {
+                       continue
+               }
+
+               var idx int
+               var xpattern string
+
+               switch n.typ {
+               case ntStatic:
+                       idx = longestPrefix(pattern, n.prefix)
+                       if idx < len(n.prefix) {
+                               continue
+                       }
+
+               case ntParam, ntRegexp:
+                       idx = strings.IndexByte(pattern, '}') + 1
+
+               case ntCatchAll:
+                       idx = longestPrefix(pattern, "*")
+
+               default:
+                       panic("chi: unknown node type")
+               }
+
+               xpattern = pattern[idx:]
+               if len(xpattern) == 0 {
+                       return true
+               }
+
+               return n.findPattern(xpattern)
+       }
+       return false
+}
+
+func (n *node) routes() []Route {
+       rts := []Route{}
+
+       n.walk(func(eps endpoints, subroutes Routes) bool {
+               if eps[mSTUB] != nil && eps[mSTUB].handler != nil && subroutes == nil {
+                       return false
+               }
+
+               // Group methodHandlers by unique patterns
+               pats := make(map[string]endpoints)
+
+               for mt, h := range eps {
+                       if h.pattern == "" {
+                               continue
+                       }
+                       p, ok := pats[h.pattern]
+                       if !ok {
+                               p = endpoints{}
+                               pats[h.pattern] = p
+                       }
+                       p[mt] = h
+               }
+
+               for p, mh := range pats {
+                       hs := make(map[string]http.Handler)
+                       if mh[mALL] != nil && mh[mALL].handler != nil {
+                               hs["*"] = mh[mALL].handler
+                       }
+
+                       for mt, h := range mh {
+                               if h.handler == nil {
+                                       continue
+                               }
+                               m := methodTypString(mt)
+                               if m == "" {
+                                       continue
+                               }
+                               hs[m] = h.handler
+                       }
+
+                       rt := Route{subroutes, hs, p}
+                       rts = append(rts, rt)
+               }
+
+               return false
+       })
+
+       return rts
+}
+
+func (n *node) walk(fn func(eps endpoints, subroutes Routes) bool) bool {
+       // Visit the leaf values if any
+       if (n.endpoints != nil || n.subroutes != nil) && fn(n.endpoints, n.subroutes) {
+               return true
+       }
+
+       // Recurse on the children
+       for _, ns := range n.children {
+               for _, cn := range ns {
+                       if cn.walk(fn) {
+                               return true
+                       }
+               }
+       }
+       return false
+}
+
+// patNextSegment returns the next segment details from a pattern:
+// node type, param key, regexp string, param tail byte, param starting index, param ending index
+func patNextSegment(pattern string) (nodeTyp, string, string, byte, int, int) {
+       ps := strings.Index(pattern, "{")
+       ws := strings.Index(pattern, "*")
+
+       if ps < 0 && ws < 0 {
+               return ntStatic, "", "", 0, 0, len(pattern) // we return the entire thing
+       }
+
+       // Sanity check
+       if ps >= 0 && ws >= 0 && ws < ps {
+               panic("chi: wildcard '*' must be the last pattern in a route, otherwise use a '{param}'")
+       }
+
+       var tail byte = '/' // Default endpoint tail to / byte
+
+       if ps >= 0 {
+               // Param/Regexp pattern is next
+               nt := ntParam
+
+               // Read to closing } taking into account opens and closes in curl count (cc)
+               cc := 0
+               pe := ps
+               for i, c := range pattern[ps:] {
+                       if c == '{' {
+                               cc++
+                       } else if c == '}' {
+                               cc--
+                               if cc == 0 {
+                                       pe = ps + i
+                                       break
+                               }
+                       }
+               }
+               if pe == ps {
+                       panic("chi: route param closing delimiter '}' is missing")
+               }
+
+               key := pattern[ps+1 : pe]
+               pe++ // set end to next position
+
+               if pe < len(pattern) {
+                       tail = pattern[pe]
+               }
+
+               var rexpat string
+               if idx := strings.Index(key, ":"); idx >= 0 {
+                       nt = ntRegexp
+                       rexpat = key[idx+1:]
+                       key = key[:idx]
+               }
+
+               if len(rexpat) > 0 {
+                       if rexpat[0] != '^' {
+                               rexpat = "^" + rexpat
+                       }
+                       if rexpat[len(rexpat)-1] != '$' {
+                               rexpat += "$"
+                       }
+               }
+
+               return nt, key, rexpat, tail, ps, pe
+       }
+
+       // Wildcard pattern as finale
+       if ws < len(pattern)-1 {
+               panic("chi: wildcard '*' must be the last value in a route. trim trailing text or use a '{param}' instead")
+       }
+       return ntCatchAll, "*", "", 0, ws, len(pattern)
+}
+
+func patParamKeys(pattern string) []string {
+       pat := pattern
+       paramKeys := []string{}
+       for {
+               ptyp, paramKey, _, _, _, e := patNextSegment(pat)
+               if ptyp == ntStatic {
+                       return paramKeys
+               }
+               for i := 0; i < len(paramKeys); i++ {
+                       if paramKeys[i] == paramKey {
+                               panic(fmt.Sprintf("chi: routing pattern '%s' contains duplicate param key, '%s'", pattern, paramKey))
+                       }
+               }
+               paramKeys = append(paramKeys, paramKey)
+               pat = pat[e:]
+       }
+}
+
+// longestPrefix finds the length of the shared prefix
+// of two strings
+func longestPrefix(k1, k2 string) int {
+       max := len(k1)
+       if l := len(k2); l < max {
+               max = l
+       }
+       var i int
+       for i = 0; i < max; i++ {
+               if k1[i] != k2[i] {
+                       break
+               }
+       }
+       return i
+}
+
+func methodTypString(method methodTyp) string {
+       for s, t := range methodMap {
+               if method == t {
+                       return s
+               }
+       }
+       return ""
+}
+
+type nodes []*node
+
+// Sort the list of nodes by label
+func (ns nodes) Sort()              { sort.Sort(ns); ns.tailSort() }
+func (ns nodes) Len() int           { return len(ns) }
+func (ns nodes) Swap(i, j int)      { ns[i], ns[j] = ns[j], ns[i] }
+func (ns nodes) Less(i, j int) bool { return ns[i].label < ns[j].label }
+
+// tailSort pushes nodes with '/' as the tail to the end of the list for param nodes.
+// The list order determines the traversal order.
+func (ns nodes) tailSort() {
+       for i := len(ns) - 1; i >= 0; i-- {
+               if ns[i].typ > ntStatic && ns[i].tail == '/' {
+                       ns.Swap(i, len(ns)-1)
+                       return
+               }
+       }
+}
+
+func (ns nodes) findEdge(label byte) *node {
+       num := len(ns)
+       idx := 0
+       i, j := 0, num-1
+       for i <= j {
+               idx = i + (j-i)/2
+               if label > ns[idx].label {
+                       i = idx + 1
+               } else if label < ns[idx].label {
+                       j = idx - 1
+               } else {
+                       i = num // breaks cond
+               }
+       }
+       if ns[idx].label != label {
+               return nil
+       }
+       return ns[idx]
+}
+
+// Route describes the details of a routing handler.
+// Handlers map key is an HTTP method
+type Route struct {
+       SubRoutes Routes
+       Handlers  map[string]http.Handler
+       Pattern   string
+}
+
+// WalkFunc is the type of the function called for each method and route visited by Walk.
+type WalkFunc func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error
+
+// Walk walks any router tree that implements Routes interface.
+func Walk(r Routes, walkFn WalkFunc) error {
+       return walk(r, walkFn, "")
+}
+
+func walk(r Routes, walkFn WalkFunc, parentRoute string, parentMw ...func(http.Handler) http.Handler) error {
+       for _, route := range r.Routes() {
+               mws := make([]func(http.Handler) http.Handler, len(parentMw))
+               copy(mws, parentMw)
+               mws = append(mws, r.Middlewares()...)
+
+               if route.SubRoutes != nil {
+                       if err := walk(route.SubRoutes, walkFn, parentRoute+route.Pattern, mws...); err != nil {
+                               return err
+                       }
+                       continue
+               }
+
+               for method, handler := range route.Handlers {
+                       if method == "*" {
+                               // Ignore a "catchAll" method, since we pass down all the specific methods for each route.
+                               continue
+                       }
+
+                       fullRoute := parentRoute + route.Pattern
+                       fullRoute = strings.Replace(fullRoute, "/*/", "/", -1)
+
+                       if chain, ok := handler.(*ChainHandler); ok {
+                               if err := walkFn(method, fullRoute, chain.Endpoint, append(mws, chain.Middlewares...)...); err != nil {
+                                       return err
+                               }
+                       } else {
+                               if err := walkFn(method, fullRoute, handler, mws...); err != nil {
+                                       return err
+                               }
+                       }
+               }
+       }
+
+       return nil
+}
index a09a43be541c99f3a2dc9183fff20c1373219dc5..72704a7f4f23dd6ff48ec93c58c7ce940f4b5312 100644 (file)
@@ -8,17 +8,17 @@ code.gitea.io/gitea-vet/checks
 # code.gitea.io/sdk/gitea v0.14.0
 ## explicit
 code.gitea.io/sdk/gitea
-# gitea.com/go-chi/binding v0.0.0-20210301195521-1fe1c9a555e7
+# gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be
 ## explicit
 gitea.com/go-chi/binding
-# gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e
+# gitea.com/go-chi/cache v0.0.0-20211013020926-78790b11abf1
 ## explicit
 gitea.com/go-chi/cache
 gitea.com/go-chi/cache/memcache
-# gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e
+# gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5
 ## explicit
 gitea.com/go-chi/captcha
-# gitea.com/go-chi/session v0.0.0-20210913064732-2ac132b0fa07
+# gitea.com/go-chi/session v0.0.0-20211013065435-7d334f340c09
 ## explicit
 gitea.com/go-chi/session
 gitea.com/go-chi/session/couchbase
@@ -276,6 +276,9 @@ github.com/go-asn1-ber/asn1-ber
 ## explicit
 github.com/go-chi/chi
 github.com/go-chi/chi/middleware
+# github.com/go-chi/chi/v5 v5.0.4
+## explicit
+github.com/go-chi/chi/v5
 # github.com/go-chi/cors v1.2.0
 ## explicit
 github.com/go-chi/cors