upgrade: bump up beego to 1.12.11 (#17277)

Signed-off-by: chlins <chenyuzh@vmware.com>
This commit is contained in:
Chenyu Zhang 2022-07-31 16:23:28 +08:00 committed by GitHub
parent 0559ce7e28
commit bbc7282c46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 40 deletions

View File

@ -78,7 +78,7 @@ require (
)
require (
github.com/beego/beego v1.12.9
github.com/beego/beego v1.12.11
golang.org/x/text v0.3.7
)

View File

@ -199,8 +199,8 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21
github.com/aws/smithy-go v1.7.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
github.com/beego/beego v1.12.9 h1:knN+7lL7BSVFm6McUVu58QVrh2UUPn0C9ioq83W5seo=
github.com/beego/beego v1.12.9/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6WkLAs=
github.com/beego/beego v1.12.11 h1:MWKcnpavb7iAIS0m6uuEq6pHKkYvGNw/5umIUKqL7jM=
github.com/beego/beego v1.12.11/go.mod h1:QURFL1HldOcCZAxnc1cZ7wrplsYR5dKPHFjmk6WkLAs=
github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
github.com/beego/i18n v0.0.0-20140604031826-e87155e8f0c0 h1:fQaDnUQvBXHHQdGBu9hz8nPznB4BeiPQokvmQVjmNEw=
github.com/beego/i18n v0.0.0-20140604031826-e87155e8f0c0/go.mod h1:KLeFCpAMq2+50NkXC8iiJxLLiiTfTqrGtKEVm+2fk7s=
@ -637,10 +637,9 @@ github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/V
github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg=
github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
github.com/gocarina/gocsv v0.0.0-20210516172204-ca9e8a8ddea8 h1:hp1oqdzmv37vPLYFGjuM/RmUgUMfD9vQfMszc54l55Y=
github.com/gocarina/gocsv v0.0.0-20210516172204-ca9e8a8ddea8/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=
github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
github.com/gocql/gocql v0.0.0-20210515062232-b7ef815b4556/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY=
github.com/gocraft/work v0.5.1 h1:3bRjMiOo6N4zcRgZWV3Y7uX7R22SF+A9bPTk4xRXr34=
github.com/gocraft/work v0.5.1/go.mod h1:pc3n9Pb5FAESPPGfM0nL+7Q1xtgtRnF8rr/azzhQVlM=
github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=

View File

@ -328,6 +328,9 @@ func (manager *Manager) SessionRegenerateID(w http.ResponseWriter, r *http.Reque
cookie.Value = url.QueryEscape(sid)
cookie.HttpOnly = true
cookie.Path = "/"
cookie.Secure = manager.isSecure(r)
cookie.Domain = manager.config.Domain
cookie.SameSite = manager.config.CookieSameSite
}
if manager.config.CookieLifeTime > 0 {
cookie.MaxAge = manager.config.CookieLifeTime

View File

@ -284,6 +284,8 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string,
// Match router to runObject & params
func (t *Tree) Match(pattern string, ctx *context.Context) (runObject interface{}) {
// fix issue 4961, deal with "./ ../ //"
pattern = path.Clean(pattern)
if len(pattern) == 0 || pattern[0] != '/' {
return nil
}

View File

@ -1,3 +0,0 @@
module github.com/gocarina/gocsv
go 1.13

View File

@ -45,10 +45,6 @@ github.com/Masterminds/semver
# github.com/Masterminds/semver/v3 v3.1.1
## explicit; go 1.12
github.com/Masterminds/semver/v3
# github.com/Microsoft/go-winio v0.5.0
## explicit; go 1.12
# github.com/Microsoft/hcsshim v0.8.24
## explicit; go 1.13
# github.com/PuerkitoBio/purell v1.1.1
## explicit
github.com/PuerkitoBio/purell
@ -129,7 +125,7 @@ github.com/aws/aws-sdk-go/service/s3
github.com/aws/aws-sdk-go/service/s3/internal/arn
github.com/aws/aws-sdk-go/service/sts
github.com/aws/aws-sdk-go/service/sts/stsiface
# github.com/beego/beego v1.12.9
# github.com/beego/beego v1.12.11
## explicit; go 1.13
github.com/beego/beego
github.com/beego/beego/cache
@ -150,8 +146,6 @@ github.com/beego/i18n
# github.com/beorn7/perks v1.0.1
## explicit; go 1.11
github.com/beorn7/perks/quantile
# github.com/bits-and-blooms/bitset v1.2.0
## explicit; go 1.14
# github.com/bmatcuk/doublestar v1.1.1
## explicit
github.com/bmatcuk/doublestar
@ -179,8 +173,6 @@ github.com/cenkalti/backoff/v4
github.com/cespare/xxhash/v2
# github.com/cloudflare/cfssl v0.0.0-20190510060611-9c027c93ba9e
## explicit
# github.com/containerd/cgroups v1.0.3
## explicit; go 1.16
# github.com/containerd/containerd v1.5.13
## explicit; go 1.17
github.com/containerd/containerd/archive/compression
@ -199,14 +191,6 @@ github.com/containerd/containerd/remotes/docker/auth
github.com/containerd/containerd/remotes/docker/schema1
github.com/containerd/containerd/remotes/errors
github.com/containerd/containerd/version
# github.com/containerd/continuity v0.1.0
## explicit; go 1.13
# github.com/containerd/fifo v1.0.0
## explicit; go 1.13
# github.com/containerd/ttrpc v1.1.0
## explicit; go 1.13
# github.com/containerd/typeurl v1.0.2
## explicit; go 1.13
# github.com/coreos/go-oidc/v3 v3.0.0
## explicit; go 1.14
github.com/coreos/go-oidc/v3/oidc
@ -306,8 +290,6 @@ github.com/docker/go/canonical/json
## explicit
github.com/docker/go-connections/nat
github.com/docker/go-connections/tlsconfig
# github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
## explicit
# github.com/docker/go-metrics v0.0.1
## explicit; go 1.11
github.com/docker/go-metrics
@ -400,13 +382,11 @@ github.com/go-sql-driver/mysql
## explicit
github.com/go-stack/stack
# github.com/gocarina/gocsv v0.0.0-20210516172204-ca9e8a8ddea8
## explicit
## explicit; go 1.13
github.com/gocarina/gocsv
# github.com/gocraft/work v0.5.1
## explicit
github.com/gocraft/work
# github.com/gogo/googleapis v1.4.0
## explicit; go 1.12
# github.com/gogo/protobuf v1.3.2
## explicit; go 1.15
github.com/gogo/protobuf/proto
@ -424,8 +404,6 @@ github.com/golang-migrate/migrate/v4/internal/url
github.com/golang-migrate/migrate/v4/source
github.com/golang-migrate/migrate/v4/source/file
github.com/golang-migrate/migrate/v4/source/iofs
# github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
## explicit
# github.com/golang/protobuf v1.5.2
## explicit; go 1.9
github.com/golang/protobuf/descriptor
@ -645,12 +623,6 @@ github.com/opencontainers/go-digest
## explicit
github.com/opencontainers/image-spec/specs-go
github.com/opencontainers/image-spec/specs-go/v1
# github.com/opencontainers/runc v1.0.2
## explicit; go 1.13
# github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
## explicit
# github.com/opencontainers/selinux v1.8.2
## explicit; go 1.13
# github.com/opentracing/opentracing-go v1.2.0
## explicit; go 1.14
github.com/opentracing/opentracing-go
@ -784,8 +756,6 @@ go.mongodb.org/mongo-driver/bson/bsonrw
go.mongodb.org/mongo-driver/bson/bsontype
go.mongodb.org/mongo-driver/bson/primitive
go.mongodb.org/mongo-driver/x/bsonx/bsoncore
# go.opencensus.io v0.23.0
## explicit; go 1.13
# go.opentelemetry.io/contrib v0.22.0
## explicit; go 1.15
go.opentelemetry.io/contrib