Browse Source

Merge pull request #160 from strukturag/migrate-jwt

deps: Migrate to "github.com/golang-jwt/jwt".
dependabot/go_modules/github.com/golang-jwt/jwt-3.2.2incompatible
Joachim Bauch 2 weeks ago
committed by GitHub
parent
commit
fdf43a7787
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      api_proxy.go
  2. 2
      go.mod
  3. 4
      go.sum
  4. 3
      mcu_proxy.go
  5. 3
      proxy/proxy_server.go
  6. 3
      proxy/proxy_tokens_etcd.go
  7. 3
      proxy/proxy_tokens_static.go

2
api_proxy.go

@ -24,7 +24,7 @@ package signaling
import (
"fmt"
"gopkg.in/dgrijalva/jwt-go.v3"
"github.com/golang-jwt/jwt"
)
type ProxyClientMessage struct {

2
go.mod

@ -4,6 +4,7 @@ go 1.13
require (
github.com/dlintw/goconf v0.0.0-20120228082610-dcc070983490
github.com/golang-jwt/jwt v3.2.1+incompatible
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
@ -19,5 +20,4 @@ require (
go.uber.org/zap v1.13.0 // indirect
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/dgrijalva/jwt-go.v3 v3.2.0
)

4
go.sum

@ -48,6 +48,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@ -320,8 +322,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
gopkg.in/dgrijalva/jwt-go.v3 v3.2.0 h1:N46iQqOtHry7Hxzb9PGrP68oovQmj7EhudNoKHvbOvI=
gopkg.in/dgrijalva/jwt-go.v3 v3.2.0/go.mod h1:hdNXC2Z9yC029rvsQ/on2ZNQ44Z2XToVhpXXbR+J05A=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=

3
mcu_proxy.go

@ -39,13 +39,12 @@ import (
"time"
"github.com/dlintw/goconf"
"github.com/golang-jwt/jwt"
"github.com/gorilla/websocket"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/pkg/srv"
"go.etcd.io/etcd/pkg/transport"
"gopkg.in/dgrijalva/jwt-go.v3"
)
const (

3
proxy/proxy_server.go

@ -39,14 +39,13 @@ import (
"time"
"github.com/dlintw/goconf"
"github.com/golang-jwt/jwt"
"github.com/google/uuid"
"github.com/gorilla/mux"
"github.com/gorilla/securecookie"
"github.com/gorilla/websocket"
"github.com/prometheus/client_golang/prometheus/promhttp"
"gopkg.in/dgrijalva/jwt-go.v3"
signaling "github.com/strukturag/nextcloud-spreed-signaling"
)

3
proxy/proxy_tokens_etcd.go

@ -31,13 +31,12 @@ import (
"time"
"github.com/dlintw/goconf"
"github.com/golang-jwt/jwt"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/pkg/srv"
"go.etcd.io/etcd/pkg/transport"
"gopkg.in/dgrijalva/jwt-go.v3"
signaling "github.com/strukturag/nextcloud-spreed-signaling"
)

3
proxy/proxy_tokens_static.go

@ -29,8 +29,7 @@ import (
"sync/atomic"
"github.com/dlintw/goconf"
"gopkg.in/dgrijalva/jwt-go.v3"
"github.com/golang-jwt/jwt"
)
type tokensStatic struct {

Loading…
Cancel
Save