Skip to content

Commit

Permalink
Update http2 and grpc vendored packages (#2456)
Browse files Browse the repository at this point in the history
To ensure we incorporate fixes for [CVE-2019-9512](https://nvd.nist.gov/vuln/detail/CVE-2019-9512) (Ping Flood), [CVE-2019-9514](https://nvd.nist.gov/vuln/detail/CVE-2019-9514) (Reset Flood), and [CVE-2019-9515](https://nvd.nist.gov/vuln/detail/CVE-2019-9515) (Settings Flood), described [here](https://github.com/Netflix/security-bulletins/blob/master/advisories/third-party/2019-002.md).

1) `golang.org/x/net/http2` changes are [here](golang/net@74dc4d7).

2) `google.golang.org/grpc` was updated to the latest tag that incorporates the fixes: [v1.23.0](https://github.com/grpc/grpc-go/releases/tag/v1.23.0).
  • Loading branch information
matiasinsaurralde authored and buger committed Aug 15, 2019
1 parent d80ee5b commit 69a6be5
Show file tree
Hide file tree
Showing 133 changed files with 10,121 additions and 6,157 deletions.
2 changes: 1 addition & 1 deletion certs/manager.go
Expand Up @@ -18,8 +18,8 @@ import (
"strings"
"time"

"github.com/sirupsen/logrus"
cache "github.com/pmylund/go-cache"
"github.com/sirupsen/logrus"
)

// StorageHandler is a standard interface to a storage backend,
Expand Down
2 changes: 1 addition & 1 deletion dnscache/storage.go
Expand Up @@ -6,8 +6,8 @@ import (

"fmt"

"github.com/sirupsen/logrus"
cache "github.com/pmylund/go-cache"
"github.com/sirupsen/logrus"
)

// DnsCacheItem represents single record in cache
Expand Down
2 changes: 1 addition & 1 deletion gateway/api.go
Expand Up @@ -41,9 +41,9 @@ import (
"sync"
"time"

"github.com/sirupsen/logrus"
"github.com/gorilla/mux"
uuid "github.com/satori/go.uuid"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt"

"github.com/TykTechnologies/tyk/apidef"
Expand Down
2 changes: 1 addition & 1 deletion gateway/api_definition.go
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/TykTechnologies/tyk/headers"
"github.com/TykTechnologies/tyk/rpc"

"github.com/sirupsen/logrus"
circuit "github.com/rubyist/circuitbreaker"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/gojsonschema"
"github.com/TykTechnologies/tyk/apidef"
Expand Down
2 changes: 1 addition & 1 deletion gateway/api_loader.go
Expand Up @@ -11,9 +11,9 @@ import (
"strconv"
"strings"

"github.com/sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/justinas/alice"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/tyk/apidef"
"github.com/TykTechnologies/tyk/config"
Expand Down
2 changes: 1 addition & 1 deletion gateway/coprocess_id_extractor.go
Expand Up @@ -9,8 +9,8 @@ import (
"strings"
"time"

"github.com/sirupsen/logrus"
"github.com/mitchellh/mapstructure"
"github.com/sirupsen/logrus"
xmlpath "gopkg.in/xmlpath.v2"

"github.com/TykTechnologies/tyk/apidef"
Expand Down
2 changes: 1 addition & 1 deletion gateway/event_system.go
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"time"

"github.com/sirupsen/logrus"
circuit "github.com/rubyist/circuitbreaker"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/tyk/apidef"
"github.com/TykTechnologies/tyk/config"
Expand Down
2 changes: 1 addition & 1 deletion gateway/host_checker_manager.go
Expand Up @@ -9,8 +9,8 @@ import (
"sync"
"time"

"github.com/sirupsen/logrus"
uuid "github.com/satori/go.uuid"
"github.com/sirupsen/logrus"
msgpack "gopkg.in/vmihailenco/msgpack.v2"

"github.com/TykTechnologies/tyk/apidef"
Expand Down
2 changes: 1 addition & 1 deletion gateway/middleware.go
Expand Up @@ -9,12 +9,12 @@ import (
"strconv"
"time"

"github.com/sirupsen/logrus"
"github.com/gocraft/health"
"github.com/justinas/alice"
newrelic "github.com/newrelic/go-agent"
"github.com/paulbellamy/ratecounter"
cache "github.com/pmylund/go-cache"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/tyk/apidef"
"github.com/TykTechnologies/tyk/config"
Expand Down
2 changes: 1 addition & 1 deletion gateway/mw_basic_auth.go
Expand Up @@ -9,8 +9,8 @@ import (
"strings"
"time"

"github.com/sirupsen/logrus"
cache "github.com/pmylund/go-cache"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt"
"golang.org/x/sync/singleflight"

Expand Down
2 changes: 1 addition & 1 deletion gateway/mw_openid.go
Expand Up @@ -8,8 +8,8 @@ import (
"net/http"
"sync"

"github.com/sirupsen/logrus"
jwt "github.com/dgrijalva/jwt-go"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/openid2go/openid"
"github.com/TykTechnologies/tyk/apidef"
Expand Down
2 changes: 1 addition & 1 deletion gateway/newrelic.go
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"
"strconv"

"github.com/sirupsen/logrus"
"github.com/gocraft/health"
"github.com/gorilla/mux"
newrelic "github.com/newrelic/go-agent"
"github.com/newrelic/go-agent/_integrations/nrgorilla/v1"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/tyk/config"
)
Expand Down
2 changes: 1 addition & 1 deletion gateway/res_handler_transform.go
Expand Up @@ -10,8 +10,8 @@ import (
"net/http"
"strconv"

"github.com/sirupsen/logrus"
"github.com/clbanning/mxj"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/tyk/apidef"
"github.com/TykTechnologies/tyk/headers"
Expand Down
2 changes: 1 addition & 1 deletion gateway/tracing.go
Expand Up @@ -8,8 +8,8 @@ import (
"net/http/httputil"
"strings"

"github.com/sirupsen/logrus"
"github.com/gorilla/mux"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/tyk/apidef"
)
Expand Down
2 changes: 1 addition & 1 deletion storage/redis_cluster.go
Expand Up @@ -7,9 +7,9 @@ import (
"sync"
"time"

"github.com/sirupsen/logrus"
"github.com/garyburd/redigo/redis"
uuid "github.com/satori/go.uuid"
"github.com/sirupsen/logrus"

"github.com/TykTechnologies/redigocluster/rediscluster"
"github.com/TykTechnologies/tyk/config"
Expand Down
28 changes: 27 additions & 1 deletion vendor/golang.org/x/net/http2/client_conn_pool.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 0 additions & 80 deletions vendor/golang.org/x/net/http2/configure_transport.go

This file was deleted.

10 changes: 5 additions & 5 deletions vendor/golang.org/x/net/http2/flow.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 69a6be5

Please sign in to comment.