From 2fda7cdaa2b406f9f8829650510f1a69961654dc Mon Sep 17 00:00:00 2001 From: Lars-Erik Svensson <lars-erik.svensson@modularfinance.se> Date: Fri, 3 May 2024 16:55:33 +0200 Subject: [PATCH] Bump dependency versions --- doc_test.go | 6 ----- error.go | 50 ++--------------------------------------- errorstacktrace_test.go | 8 +++---- go.mod | 20 ++++++++--------- go.sum | 48 ++++++++++++++++++--------------------- 5 files changed, 38 insertions(+), 94 deletions(-) diff --git a/doc_test.go b/doc_test.go index d30956f..ea20a25 100644 --- a/doc_test.go +++ b/doc_test.go @@ -4,7 +4,6 @@ import ( "database/sql" "net" - "github.com/golang-jwt/jwt/v4" "github.com/labstack/echo/v4" ) @@ -35,11 +34,6 @@ func ExampleInhibitStacktraceForError_errorReference() { InhibitStacktraceForError(sql.ErrNoRows) } -func ExampleInhibitStacktraceForError_errorType() { - // Don't generate a stacktrace when Trace is called with a jwt.ValidationError error type. - InhibitStacktraceForError((*jwt.ValidationError)(nil)) -} - func ExampleRegisterErrorLogFunc_single() { RegisterErrorLogFunc(func(err error, fields Fields) { oe, ok := err.(*net.OpError) diff --git a/error.go b/error.go index 5acbe6a..38d9c91 100644 --- a/error.go +++ b/error.go @@ -4,9 +4,7 @@ import ( "errors" "fmt" "reflect" - "strings" - "github.com/golang-jwt/jwt/v4" "github.com/labstack/echo/v4" ) @@ -24,18 +22,15 @@ type ( const ( httpMessage = "http_message" httpStatusCode = "http_status" - jwtError = "jwt_error" - jwtText = "jwt_text" ) var ( registeredErrorLogFunctions = make(map[interface{}]ErrLogFunc) ) -// InitDefaultErrorLogging register a error logger that append more information to the log for echo.HTTPError and -// jwt.ValidationError errors. +// InitDefaultErrorLogging register a error logger that append more information to the log for echo.HTTPError. func InitDefaultErrorLogging() { - RegisterErrorLogFunc(errorLogger, (*echo.HTTPError)(nil), (*jwt.ValidationError)(nil)) + RegisterErrorLogFunc(errorLogger, (*echo.HTTPError)(nil)) } func errorLogger(err error, fields Fields) { @@ -44,47 +39,6 @@ func errorLogger(err error, fields Fields) { case *echo.HTTPError: fields[httpMessage] = e.Message fields[httpStatusCode] = e.Code - - case *jwt.ValidationError: - var vErr string - errBits := e.Errors - - if errBits&jwt.ValidationErrorMalformed != 0 { - vErr += "ValidationErrorMalformed " - } - if errBits&jwt.ValidationErrorUnverifiable != 0 { - vErr += "ValidationErrorUnverifiable " - } - if errBits&jwt.ValidationErrorSignatureInvalid != 0 { - vErr += "ValidationErrorSignatureInvalid " - } - if errBits&jwt.ValidationErrorAudience != 0 { - vErr += "ValidationErrorAudience " - } - if errBits&jwt.ValidationErrorExpired != 0 { - vErr += "ValidationErrorExpired " - } - if errBits&jwt.ValidationErrorIssuedAt != 0 { - vErr += "ValidationErrorIssuedAt " - } - if errBits&jwt.ValidationErrorIssuer != 0 { - vErr += "ValidationErrorIssuer " - } - if errBits&jwt.ValidationErrorNotValidYet != 0 { - vErr += "ValidationErrorNotValidYet " - } - if errBits&jwt.ValidationErrorId != 0 { - vErr += "ValidationErrorId " - } - if errBits&jwt.ValidationErrorClaimsInvalid != 0 { - vErr += "ValidationErrorClaimsInvalid " - } - if vErr != "" { - fields[jwtError] = strings.TrimSpace(vErr) - } - if e.Inner == nil { - fields[jwtText] = e.Error() - } default: fields["error_logger"] = fmt.Sprintf("eal.errorlogger: Don't know how to handle %T error type ", err) } diff --git a/errorstacktrace_test.go b/errorstacktrace_test.go index 3e13cea..1d3d98f 100644 --- a/errorstacktrace_test.go +++ b/errorstacktrace_test.go @@ -8,7 +8,7 @@ import ( "reflect" "testing" - "github.com/golang-jwt/jwt/v4" + "github.com/golang-jwt/jwt/v5" ) type ( @@ -29,8 +29,8 @@ func (e *testError) Error() string { } func TestTrace(t *testing.T) { - // Don't generate stack-traces for sql.ErrNoRows, or for jwt.ValidationError error types - InhibitStacktraceForError(sql.ErrNoRows, (*jwt.ValidationError)(nil)) + // Don't generate stack-traces for sql.ErrNoRows, or for jwt error types + InhibitStacktraceForError(sql.ErrNoRows, jwt.ErrInvalidType) for _, tt := range []struct { name string @@ -43,7 +43,7 @@ func TestTrace(t *testing.T) { {name: "test1", err: errTest1, wantErrorType: "*eal.ErrorStackTrace", wantStackTrace: true}, {name: "wrapped", err: fmt.Errorf("wrapped test error: %w", Trace(errTest2)), wantErrorType: "*fmt.wrapError", wantStackTrace: true}, {name: "sql_ErrNoRows", err: sql.ErrNoRows, wantErrorType: "*errors.errorString"}, - {name: "jwt_ValidationError", err: &jwt.ValidationError{}, wantErrorType: "*jwt.ValidationError"}, + {name: "jwt_Error", err: jwt.ErrInvalidType, wantErrorType: "*errors.errorString"}, } { t.Run(tt.name, func(t *testing.T) { err := Trace(tt.err) diff --git a/go.mod b/go.mod index 9987c9a..4da58d9 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,22 @@ module github.com/modfin/eal -go 1.18 +go 1.21 require ( - github.com/golang-jwt/jwt/v4 v4.4.3 - github.com/google/uuid v1.3.0 - github.com/labstack/echo/v4 v4.10.0 - github.com/sirupsen/logrus v1.9.0 + github.com/golang-jwt/jwt/v5 v5.2.1 + github.com/google/uuid v1.6.0 + github.com/labstack/echo/v4 v4.12.0 + github.com/sirupsen/logrus v1.9.3 ) require ( - github.com/labstack/gommon v0.4.0 // indirect + github.com/labstack/gommon v0.4.2 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sys v0.18.0 // indirect + golang.org/x/crypto v0.22.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index 08897ed..89bfa96 100644 --- a/go.sum +++ b/go.sum @@ -1,47 +1,43 @@ 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/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU= -github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/labstack/echo/v4 v4.10.0 h1:5CiyngihEO4HXsz3vVsJn7f8xAlWwRr3aY6Ih280ZKA= -github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ= -github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= -github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk= +github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= +github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= 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/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=