{{ .Error }}
-- In {{ .FilePath }}:{{ .Line }}
- - -
- {{ range $lineNumber, $line := .Lines }}{{ $lineNumber }}{{ end }}
- |
-
- {{ range $lineNumber, $line := .Lines }}{{ $line }}
- |
-
{{ .Stack }}
- Method: {{ .Method }}
-
-
-goa is a framework for building micro-services and REST APIs in Go using a
-unique design-first approach.
-
-[](https://travis-ci.org/goadesign/goa)
-[](https://ci.appveyor.com/project/RaphaelSimon/goa-oqtis/branch/master)
-[](https://github.com/goadesign/goa/blob/master/LICENSE)
-[](http://godoc.org/github.com/goadesign/goa)
-[](https://gophers.slack.com/messages/goa/)
-
-## Why goa?
-
-goa takes a different approach to building micro-services. Instead of focusing
-solely on helping with implementation, goa makes it possible to describe the
-*design* of an API using a simple DSL. goa then uses that description to provide
-specialized helper code to the implementation and to generate documentation, API
-clients, tests, even custom artifacts.
-
-If DSLs are not your thing then consider this: you need to document your APIs so
-that clients (be it internal e.g. other services or external e.g. UIs) may
-consume them. Typically this requires maintaining a completely separate document
-(for example an OpenAPI specification). Making sure that the document stays
-up-to-date takes a lot of effort and at the end of the day you have to write
-that document - why not use a simple and clear Go DSL to do that instead?
-
-Another aspect to consider is the need for properly designing APIs and making
-sure that the design choices remain consistent across the endpoints or even
-across multiple APIs. If the source code is the only place where design
-decisions are kept then not only is it impossible to maintain consistency it's
-also difficult to think about the design in the first place. The goa DSL makes
-it possible to think about the design explicitly and - since it's code - to
-re-use design elements for consistency.
-
-The goa DSL allows writing self-explanatory code that describes the resources
-exposed by the API and for each resource the properties and actions. goa comes
-with the `goagen` tool which runs the DSL and generates various types of
-artifacts from the resulting data structures.
-
-One of the `goagen` output is glue code that binds your code with the underlying
-HTTP server. This code is specific to your API so that for example there is no
-need to cast or "bind" any handler argument prior to using them. Each generated
-handler has a signature that is specific to the corresponding resource action.
-It's not just the parameters though, each handler also has access to specific
-helper methods that generate the possible responses for that action. The DSL can
-also define validations in which case the generated code takes care of
-validating the incoming request parameters and payload prior to invoking the
-handler.
-
-The end result is controller code that is terse and clean, the boilerplate is
-all gone. Another big benefit is the clean separation of concern between design
-and implementation: on bigger projects it's often the case that API design
-changes require careful review, being able to generate a new version of the
-documentation without having to write a single line of implementation is a big
-boon.
-
-This idea of separating design and implementation is not new, the
-excellent [Praxis](http://praxis-framework.io) framework from RightScale follows
-the same pattern and was an inspiration to goa.
-
-## Installation
-
-Assuming you have a working [Go](https://golang.org) setup:
-```
-go get github.com/goadesign/goa/...
-```
-
-### Stable Versions
-
-goa follows [Semantic Versioning](http://semver.org/) which is a fancy way of saying it publishes
-releases with version numbers of the form `vX.Y.Z` and makes sure that your code can upgrade to new
-versions with the same `X` component without having to make changes.
-
-Releases are tagged with the corresponding version number. There is also a branch for each major
-version (only `v1` at the moment). The recommended practice is to vendor the stable branch.
-
-Current Release: `v1.3.1`
-Stable Branch: `v1`
-
-## Teaser
-
-### 1. Design
-
-Create the file `$GOPATH/src/goa-adder/design/design.go` with the following content:
-```go
-package design
-
-import (
- . "github.com/goadesign/goa/design"
- . "github.com/goadesign/goa/design/apidsl"
-)
-
-var _ = API("adder", func() {
- Title("The adder API")
- Description("A teaser for goa")
- Host("localhost:8080")
- Scheme("http")
-})
-
-var _ = Resource("operands", func() {
- Action("add", func() {
- Routing(GET("add/:left/:right"))
- Description("add returns the sum of the left and right parameters in the response body")
- Params(func() {
- Param("left", Integer, "Left operand")
- Param("right", Integer, "Right operand")
- })
- Response(OK, "text/plain")
- })
-
-})
-```
-This file contains the design for an `adder` API which accepts HTTP GET requests to `/add/:x/:y`
-where `:x` and `:y` are placeholders for integer values. The API returns the sum of `x` and `y` in
-its body.
-
-### 2. Implement
-
-Now that the design is done, let's run `goagen` on the design package:
-```
-cd $GOPATH/src/goa-adder
-goagen bootstrap -d goa-adder/design
-```
-This produces the following outputs:
-
-* `main.go` and `operands.go` contain scaffolding code to help bootstrap the implementation.
- running `goagen` again does not recreate them so that it's safe to edit their content.
-* an `app` package which contains glue code that binds the low level HTTP server to your
- implementation.
-* a `client` package with a `Client` struct that implements a `AddOperands` function which calls
- the API with the given arguments and returns the `http.Response`.
-* a `tool` directory that contains the complete source for a client CLI tool.
-* a `swagger` package with implements the `GET /swagger.json` API endpoint. The response contains
- the full Swagger specificiation of the API.
-
-### 3. Run
-
-First let's implement the API - edit the file `operands.go` and replace the content of the `Add`
-function with:
-```
-// Add import for strconv
-import "strconv"
-
-// Add runs the add action.
-func (c *OperandsController) Add(ctx *app.AddOperandsContext) error {
- sum := ctx.Left + ctx.Right
- return ctx.OK([]byte(strconv.Itoa(sum)))
-}
-```
-Now let's compile and run the service:
-```
-cd $GOPATH/src/goa-adder
-go build
-./goa-adder
-2016/04/05 20:39:10 [INFO] mount ctrl=Operands action=Add route=GET /add/:left/:right
-2016/04/05 20:39:10 [INFO] listen transport=http addr=:8080
-```
-Open a new console and compile the generated CLI tool:
-```
-cd $GOPATH/src/goa-adder/tool/adder-cli
-go build
-```
-The tool includes contextual help:
-```
-./adder-cli --help
-CLI client for the adder service
-
-Usage:
- adder-cli [command]
-
-Available Commands:
- add add returns the sum of the left and right parameters in the response body
-
-Flags:
- --dump Dump HTTP request and response.
- -H, --host string API hostname (default "localhost:8080")
- -s, --scheme string Set the requests scheme
- -t, --timeout duration Set the request timeout (default 20s)
-
-Use "adder-cli [command] --help" for more information about a command.
-```
-To get information on how to call a specific API use:
-```
-./adder-cli add operands --help
-Usage:
- adder-cli add operands [/add/LEFT/RIGHT] [flags]
-
-Flags:
- --left int Left operand
- --pp Pretty print response body
- --right int Right operand
-
-Global Flags:
- --dump Dump HTTP request and response.
- -H, --host string API hostname (default "localhost:8080")
- -s, --scheme string Set the requests scheme
- -t, --timeout duration Set the request timeout (default 20s)
-```
-Now let's run it:
-```
-./adder-cli add operands /add/1/2
-2016/04/05 20:43:18 [INFO] started id=HffVaGiH GET=http://localhost:8080/add/1/2
-2016/04/05 20:43:18 [INFO] completed id=HffVaGiH status=200 time=1.028827ms
-3⏎
-```
-This also works:
-```
-$ ./adder-cli add operands --left=1 --right=2
-2016/04/25 00:08:59 [INFO] started id=ouKmwdWp GET=http://localhost:8080/add/1/2
-2016/04/25 00:08:59 [INFO] completed id=ouKmwdWp status=200 time=1.097749ms
-3⏎
-```
-The console running the service shows the request that was just handled:
-```
-2016/06/06 10:23:03 [INFO] started req_id=rLAtsSThLD-1 GET=/add/1/2 from=::1 ctrl=OperandsController action=Add
-2016/06/06 10:23:03 [INFO] params req_id=rLAtsSThLD-1 right=2 left=1
-2016/06/06 10:23:03 [INFO] completed req_id=rLAtsSThLD-1 status=200 bytes=1 time=66.25µs
-```
-Now let's see how robust our service is and try to use non integer values:
-```
-./adder-cli add operands add/1/d
-2016/06/06 10:24:22 [INFO] started id=Q2u/lPUc GET=http://localhost:8080/add/1/d
-2016/06/06 10:24:22 [INFO] completed id=Q2u/lPUc status=400 time=1.301083ms
-error: 400: {"code":"invalid_request","status":400,"detail":"invalid value \"d\" for parameter \"right\", must be a integer"}
-```
-As you can see the generated code validated the incoming request against the types defined in the
-design.
-
-### 4. Document
-
-The `swagger` directory contains the API Swagger (OpenAPI) specification in both
-YAML and JSON format.
-
-For open source projects hosted on
-github [swagger.goa.design](http://swagger.goa.design) provides a free service
-that renders the Swagger representation dynamically from goa design packages.
-Simply set the `url` query string with the import path to the design package.
-For example displaying the docs for `github.com/goadesign/goa-cellar/design` is
-done by browsing to:
-
-http://swagger.goa.design/?url=goadesign%2Fgoa-cellar%2Fdesign
-
-Note that the above generates the swagger spec dynamically and does not require it to be present in
-the Github repo.
-
-The Swagger JSON can also easily be served from the documented service itself using a simple
-[Files](http://goa.design/reference/goa/design/apidsl/#func-files-a-name-apidsl-files-a)
-definition in the design. Edit the file `design/design.go` and add:
-
-```go
-var _ = Resource("swagger", func() {
- Origin("*", func() {
- Methods("GET") // Allow all origins to retrieve the Swagger JSON (CORS)
- })
- Files("/swagger.json", "swagger/swagger.json")
-})
-```
-
-Re-run `goagen bootstrap -d goa-adder/design` and note the new file
-`swagger.go` containing the implementation for a controller that serves the
-`swagger.json` file.
-
-Mount the newly generated controller by adding the following two lines to the `main` function in
-`main.go`:
-
-```go
-cs := NewSwaggerController(service)
-app.MountSwaggerController(service, cs)
-```
-
-Recompile and restart the service:
-
-```
-^C
-go build
-./goa-adder
-2016/06/06 10:31:14 [INFO] mount ctrl=Operands action=Add route=GET /add/:left/:right
-2016/06/06 10:31:14 [INFO] mount ctrl=Swagger files=swagger/swagger.json route=GET /swagger.json
-2016/06/06 10:31:14 [INFO] listen transport=http addr=:8080
-```
-
-Note the new route `/swagger.json`. Requests made to it return the Swagger specification. The
-generated controller also takes care of adding the proper CORS headers so that the JSON may be
-retrieved from browsers using JavaScript served from a different origin (e.g. via Swagger UI). The
-client also has a new `download` action:
-
-```
-cd tool/adder-cli
-go build
-./adder-cli download --help
-Download file with given path
-
-Usage:
- adder-cli download [PATH] [flags]
-
-Flags:
- --out string Output file
-
-Global Flags:
- --dump Dump HTTP request and response.
- -H, --host string API hostname (default "localhost:8080")
- -s, --scheme string Set the requests scheme
- -t, --timeout duration Set the request timeout (default 20s)
-```
-
-Which can be used like this to download the file `swagger.json` in the current directory:
-
-```
-./adder-cli download swagger.json
-2016/06/06 10:36:24 [INFO] started file=swagger.json id=ciHL2VLt GET=http://localhost:8080/swagger.json
-2016/06/06 10:36:24 [INFO] completed file=swagger.json id=ciHL2VLt status=200 time=1.013307ms
-```
-
-We now have a self-documenting API and best of all the documentation is automatically updated as the
-API design changes.
-
-## Resources
-
-Consult the following resources to learn more about goa.
-
-### goa.design
-
-[goa.design](https://goa.design) contains further information on goa including a getting
-started guide, detailed DSL documentation as well as information on how to implement a goa service.
-
-### Examples
-
-The [examples](https://github.com/goadesign/examples) repo contains simple examples illustrating
-basic concepts.
-
-The [goa-cellar](https://github.com/goadesign/goa-cellar) repo contains the implementation for a
-goa service which demonstrates many aspects of the design language. It is kept up-to-date and
-provides a reference for testing functionality.
-
-## Contributing
-
-Did you fix a bug? write docs or additional tests? or implement some new awesome functionality?
-You're a rock star!! Just make sure that `make` succeeds (or that TravisCI is green) and send a PR
-over.
diff --git a/vendor/github.com/goadesign/goa/appveyor.yml b/vendor/github.com/goadesign/goa/appveyor.yml
deleted file mode 100644
index 478f1f95cb4..00000000000
--- a/vendor/github.com/goadesign/goa/appveyor.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "{build}"
-
-os: Windows Server 2012 R2
-
-environment:
- GOPATH: C:\gopath
-
-clone_folder: c:\gopath\src\github.com\goadesign\goa
-
-install:
- - go version
- - go env
- - copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe
- - set PATH=%PATH%;c:\MinGW\bin;%GOPATH%\bin
-
-build_script:
- - make depend
- - go get -v .\...
- - make goagen
- - make test
-
-test: off
-
-deploy: off
diff --git a/vendor/github.com/goadesign/goa/client/cli.go b/vendor/github.com/goadesign/goa/client/cli.go
deleted file mode 100644
index 22633e56b04..00000000000
--- a/vendor/github.com/goadesign/goa/client/cli.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package client
-
-import (
- "bufio"
- "encoding/json"
- "fmt"
- "io/ioutil"
- "log"
- "net/http"
- "os"
-
- "golang.org/x/net/websocket"
-)
-
-// HandleResponse logs the response details and exits the process with a status computed from
-// the response status code. The mapping of response status code to exit status is as follows:
-//
-// 401: 1
-// 402 to 500 (other than 403 and 404): 2
-// 403: 3
-// 404: 4
-// 500+: 5
-func HandleResponse(c *Client, resp *http.Response, pretty bool) {
- defer resp.Body.Close()
- body, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- fmt.Fprintf(os.Stderr, "failed to read body: %s", err)
- os.Exit(-1)
- }
- if resp.StatusCode < 200 || resp.StatusCode > 299 {
- // Let user know if something went wrong
- var sbody string
- if len(body) > 0 {
- sbody = ": " + string(body)
- }
- fmt.Printf("error: %d%s", resp.StatusCode, sbody)
- } else if !c.Dump && len(body) > 0 {
- var out string
- if pretty {
- var jbody interface{}
- err = json.Unmarshal(body, &jbody)
- if err != nil {
- out = string(body)
- } else {
- var b []byte
- b, err = json.MarshalIndent(jbody, "", " ")
- if err == nil {
- out = string(b)
- } else {
- out = string(body)
- }
- }
- } else {
- out = string(body)
- }
- fmt.Print(out)
- }
-
- // Figure out exit code
- exitStatus := 0
- switch {
- case resp.StatusCode == 401:
- exitStatus = 1
- case resp.StatusCode == 403:
- exitStatus = 3
- case resp.StatusCode == 404:
- exitStatus = 4
- case resp.StatusCode > 399 && resp.StatusCode < 500:
- exitStatus = 2
- case resp.StatusCode > 499:
- exitStatus = 5
- }
- os.Exit(exitStatus)
-}
-
-// WSWrite sends STDIN lines to a websocket server.
-func WSWrite(ws *websocket.Conn) {
- scanner := bufio.NewScanner(os.Stdin)
- for scanner.Scan() {
- t := scanner.Text()
- ws.Write([]byte(t))
- fmt.Printf(">> %s\n", t)
- }
-}
-
-// WSRead reads from a websocket and print the read messages to STDOUT.
-func WSRead(ws *websocket.Conn) {
- msg := make([]byte, 512)
- for {
- n, err := ws.Read(msg)
- if err != nil {
- log.Fatal(err)
- }
- fmt.Printf("<< %s\n", msg[:n])
- }
-}
diff --git a/vendor/github.com/goadesign/goa/client/client.go b/vendor/github.com/goadesign/goa/client/client.go
deleted file mode 100644
index 5483cb7d04d..00000000000
--- a/vendor/github.com/goadesign/goa/client/client.go
+++ /dev/null
@@ -1,251 +0,0 @@
-package client
-
-import (
- "bytes"
- "crypto/rand"
- "encoding/base64"
- "io"
- "io/ioutil"
- "net/http"
- "net/http/httputil"
- "time"
-
- "context"
-
- "github.com/goadesign/goa"
-)
-
-type (
- // Doer defines the Do method of the http client.
- Doer interface {
- Do(context.Context, *http.Request) (*http.Response, error)
- }
-
- // Client is the common client data structure for all goa service clients.
- Client struct {
- // Doer is the underlying http client.
- Doer
- // Scheme overrides the default action scheme.
- Scheme string
- // Host is the service hostname.
- Host string
- // UserAgent is the user agent set in requests made by the client.
- UserAgent string
- // Dump indicates whether to dump request response.
- Dump bool
- }
-)
-
-// New creates a new API client that wraps c.
-// If c is nil, the returned client wraps http.DefaultClient.
-func New(c Doer) *Client {
- if c == nil {
- c = HTTPClientDoer(http.DefaultClient)
- }
- return &Client{Doer: c}
-}
-
-// HTTPClientDoer turns a stdlib http.Client into a Doer. Use it to enable to call New() with an http.Client.
-func HTTPClientDoer(hc *http.Client) Doer {
- return doFunc(func(_ context.Context, req *http.Request) (*http.Response, error) {
- return hc.Do(req)
- })
-}
-
-// doFunc is the type definition of the Doer.Do method. It implements Doer.
-type doFunc func(context.Context, *http.Request) (*http.Response, error)
-
-// Do implements Doer.Do
-func (f doFunc) Do(ctx context.Context, req *http.Request) (*http.Response, error) {
- return f(ctx, req)
-}
-
-// Do wraps the underlying http client Do method and adds logging.
-// The logger should be in the context.
-func (c *Client) Do(ctx context.Context, req *http.Request) (*http.Response, error) {
- // TODO: setting the request ID should be done via client middleware. For now only set it if the
- // caller provided one in the ctx.
- if ctxreqid := ContextRequestID(ctx); ctxreqid != "" {
- req.Header.Set("X-Request-Id", ctxreqid)
- }
- if c.UserAgent != "" {
- req.Header.Set("User-Agent", c.UserAgent)
- }
- startedAt := time.Now()
- ctx, id := ContextWithRequestID(ctx)
- goa.LogInfo(ctx, "started", "id", id, req.Method, req.URL.String())
- if c.Dump {
- c.dumpRequest(ctx, req)
- }
- resp, err := c.Doer.Do(ctx, req)
- if err != nil {
- goa.LogError(ctx, "failed", "err", err)
- return nil, err
- }
- goa.LogInfo(ctx, "completed", "id", id, "status", resp.StatusCode, "time", time.Since(startedAt).String())
- if c.Dump {
- c.dumpResponse(ctx, resp)
- }
- return resp, err
-}
-
-// Dump request if needed.
-func (c *Client) dumpRequest(ctx context.Context, req *http.Request) {
- reqBody, err := dumpReqBody(req)
- if err != nil {
- goa.LogError(ctx, "Failed to load request body for dump", "err", err.Error())
- }
- goa.LogInfo(ctx, "request headers", headersToSlice(req.Header)...)
- if reqBody != nil {
- goa.LogInfo(ctx, "request", "body", string(reqBody))
- }
-}
-
-// dumpResponse dumps the response and the request.
-func (c *Client) dumpResponse(ctx context.Context, resp *http.Response) {
- respBody, _ := dumpRespBody(resp)
- goa.LogInfo(ctx, "response headers", headersToSlice(resp.Header)...)
- if respBody != nil {
- goa.LogInfo(ctx, "response", "body", string(respBody))
- }
-}
-
-// headersToSlice produces a loggable slice from a HTTP header.
-func headersToSlice(header http.Header) []interface{} {
- res := make([]interface{}, 2*len(header))
- i := 0
- for k, v := range header {
- res[i] = k
- if len(v) == 1 {
- res[i+1] = v[0]
- } else {
- res[i+1] = v
- }
- i += 2
- }
- return res
-}
-
-// Dump request body, strongly inspired from httputil.DumpRequest
-func dumpReqBody(req *http.Request) ([]byte, error) {
- if req.Body == nil {
- return nil, nil
- }
- var save io.ReadCloser
- var err error
- save, req.Body, err = drainBody(req.Body)
- if err != nil {
- return nil, err
- }
- var b bytes.Buffer
- var dest io.Writer = &b
- chunked := len(req.TransferEncoding) > 0 && req.TransferEncoding[0] == "chunked"
- if chunked {
- dest = httputil.NewChunkedWriter(dest)
- }
- _, err = io.Copy(dest, req.Body)
- if chunked {
- dest.(io.Closer).Close()
- io.WriteString(&b, "\r\n")
- }
- req.Body = save
- return b.Bytes(), err
-}
-
-// Dump response body, strongly inspired from httputil.DumpResponse
-func dumpRespBody(resp *http.Response) ([]byte, error) {
- if resp.Body == nil {
- return nil, nil
- }
- var b bytes.Buffer
- savecl := resp.ContentLength
- var save io.ReadCloser
- var err error
- save, resp.Body, err = drainBody(resp.Body)
- if err != nil {
- return nil, err
- }
- _, err = io.Copy(&b, resp.Body)
- if err != nil {
- return nil, err
- }
- resp.Body = save
- resp.ContentLength = savecl
- if err != nil {
- return nil, err
- }
- return b.Bytes(), nil
-}
-
-// One of the copies, say from b to r2, could be avoided by using a more
-// elaborate trick where the other copy is made during Request/Response.Write.
-// This would complicate things too much, given that these functions are for
-// debugging only.
-func drainBody(b io.ReadCloser) (r1, r2 io.ReadCloser, err error) {
- var buf bytes.Buffer
- if _, err = buf.ReadFrom(b); err != nil {
- return nil, nil, err
- }
- if err = b.Close(); err != nil {
- return nil, nil, err
- }
- return ioutil.NopCloser(&buf), ioutil.NopCloser(bytes.NewReader(buf.Bytes())), nil
-}
-
-// headerIterator is a HTTP header iterator.
-type headerIterator func(name string, value []string)
-
-// filterHeaders iterates through the headers skipping hidden headers.
-// It calls the given iterator for each header name/value pair. The values are serialized as
-// strings.
-func filterHeaders(headers http.Header, iterator headerIterator) {
- for k, v := range headers {
- // Skip sensitive headers
- if k == "Authorization" || k == "Cookie" {
- iterator(k, []string{"*****"})
- continue
- }
- iterator(k, v)
- }
-}
-
-// shortID produces a "unique" 6 bytes long string.
-// Do not use as a reliable way to get unique IDs, instead use for things like logging.
-func shortID() string {
- b := make([]byte, 6)
- io.ReadFull(rand.Reader, b)
- return base64.StdEncoding.EncodeToString(b)
-}
-
-// clientKey is the private type used to store values in the context.
-// It is private to avoid possible collisions with keys used by other packages.
-type clientKey int
-
-// ReqIDKey is the context key used to store the request ID value.
-const reqIDKey clientKey = 1
-
-// ContextRequestID extracts the Request ID from the context.
-func ContextRequestID(ctx context.Context) string {
- var reqID string
- id := ctx.Value(reqIDKey)
- if id != nil {
- reqID = id.(string)
- }
- return reqID
-}
-
-// ContextWithRequestID returns ctx and the request ID if it already has one or creates and returns a new context with
-// a new request ID.
-func ContextWithRequestID(ctx context.Context) (context.Context, string) {
- reqID := ContextRequestID(ctx)
- if reqID == "" {
- reqID = shortID()
- ctx = context.WithValue(ctx, reqIDKey, reqID)
- }
- return ctx, reqID
-}
-
-// SetContextRequestID sets a request ID in the given context and returns a new context.
-func SetContextRequestID(ctx context.Context, reqID string) context.Context {
- return context.WithValue(ctx, reqIDKey, reqID)
-}
diff --git a/vendor/github.com/goadesign/goa/client/signers.go b/vendor/github.com/goadesign/goa/client/signers.go
deleted file mode 100644
index 4b3dd3de307..00000000000
--- a/vendor/github.com/goadesign/goa/client/signers.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package client
-
-import (
- "fmt"
- "net/http"
-)
-
-type (
- // Signer is the common interface implemented by all signers.
- Signer interface {
- // Sign adds required headers, cookies etc.
- Sign(*http.Request) error
- }
-
- // BasicSigner implements basic auth.
- BasicSigner struct {
- // Username is the basic auth user.
- Username string
- // Password is err guess what? the basic auth password.
- Password string
- }
-
- // APIKeySigner implements API Key auth.
- APIKeySigner struct {
- // SignQuery indicates whether to set the API key in the URL query with key KeyName
- // or whether to use a header with name KeyName.
- SignQuery bool
- // KeyName is the name of the HTTP header or query string that contains the API key.
- KeyName string
- // KeyValue stores the actual key.
- KeyValue string
- // Format is the format used to render the key, e.g. "Bearer %s"
- Format string
- }
-
- // JWTSigner implements JSON Web Token auth.
- JWTSigner struct {
- // TokenSource is a JWT token source.
- // See https://godoc.org/golang.org/x/oauth2/jwt#Config.TokenSource for an example
- // of an implementation.
- TokenSource TokenSource
- }
-
- // OAuth2Signer adds a authorization header to the request using the given OAuth2 token
- // source to produce the header value.
- OAuth2Signer struct {
- // TokenSource is an OAuth2 access token source.
- // See package golang/oauth2 and its subpackage for implementations of token
- // sources.
- TokenSource TokenSource
- }
-
- // Token is the interface to an OAuth2 token implementation.
- // It can be implemented with https://godoc.org/golang.org/x/oauth2#Token.
- Token interface {
- // SetAuthHeader sets the Authorization header to r.
- SetAuthHeader(r *http.Request)
- // Valid reports whether Token can be used to properly sign requests.
- Valid() bool
- }
-
- // A TokenSource is anything that can return a token.
- TokenSource interface {
- // Token returns a token or an error.
- // Token must be safe for concurrent use by multiple goroutines.
- // The returned Token must not be modified.
- Token() (Token, error)
- }
-
- // StaticTokenSource implements a token source that always returns the same token.
- StaticTokenSource struct {
- StaticToken *StaticToken
- }
-
- // StaticToken implements a token that sets the auth header with a given static value.
- StaticToken struct {
- // Value used to set the auth header.
- Value string
- // OAuth type, defaults to "Bearer".
- Type string
- }
-)
-
-// Sign adds the basic auth header to the request.
-func (s *BasicSigner) Sign(req *http.Request) error {
- if s.Username != "" && s.Password != "" {
- req.SetBasicAuth(s.Username, s.Password)
- }
- return nil
-}
-
-// Sign adds the API key header to the request.
-func (s *APIKeySigner) Sign(req *http.Request) error {
- if s.KeyName == "" {
- s.KeyName = "Authorization"
- }
- if s.Format == "" {
- s.Format = "Bearer %s"
- }
- name := s.KeyName
- format := s.Format
- val := fmt.Sprintf(format, s.KeyValue)
- if s.SignQuery && val != "" {
- query := req.URL.Query()
- query.Set(name, val)
- req.URL.RawQuery = query.Encode()
- } else {
- req.Header.Set(name, val)
- }
- return nil
-}
-
-// Sign adds the JWT auth header.
-func (s *JWTSigner) Sign(req *http.Request) error {
- return signFromSource(s.TokenSource, req)
-}
-
-// Sign refreshes the access token if needed and adds the OAuth header.
-func (s *OAuth2Signer) Sign(req *http.Request) error {
- return signFromSource(s.TokenSource, req)
-}
-
-// signFromSource generates a token using the given source and uses it to sign the request.
-func signFromSource(source TokenSource, req *http.Request) error {
- token, err := source.Token()
- if err != nil {
- return err
- }
- if !token.Valid() {
- return fmt.Errorf("token expired or invalid")
- }
- token.SetAuthHeader(req)
- return nil
-}
-
-// Token returns the static token.
-func (s *StaticTokenSource) Token() (Token, error) {
- return s.StaticToken, nil
-}
-
-// SetAuthHeader sets the Authorization header to r.
-func (t *StaticToken) SetAuthHeader(r *http.Request) {
- typ := t.Type
- if typ == "" {
- typ = "Bearer"
- }
- r.Header.Set("Authorization", typ+" "+t.Value)
-}
-
-// Valid reports whether Token can be used to properly sign requests.
-func (t *StaticToken) Valid() bool { return true }
diff --git a/vendor/github.com/goadesign/goa/context.go b/vendor/github.com/goadesign/goa/context.go
deleted file mode 100644
index 5434ff0ebc5..00000000000
--- a/vendor/github.com/goadesign/goa/context.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package goa
-
-import (
- "net/http"
- "net/url"
- "strconv"
-
- "context"
-)
-
-// Keys used to store data in context.
-const (
- reqKey key = iota + 1
- respKey
- ctrlKey
- actionKey
- paramsKey
- logKey
- logContextKey
- errKey
- securityScopesKey
-)
-
-type (
- // RequestData provides access to the underlying HTTP request.
- RequestData struct {
- *http.Request
-
- // Payload returns the decoded request body.
- Payload interface{}
- // Params contains the raw values for the parameters defined in the design including
- // path parameters, query string parameters and header parameters.
- Params url.Values
- }
-
- // ResponseData provides access to the underlying HTTP response.
- ResponseData struct {
- http.ResponseWriter
-
- // The service used to encode the response.
- Service *Service
- // ErrorCode is the code of the error returned by the action if any.
- ErrorCode string
- // Status is the response HTTP status code.
- Status int
- // Length is the response body length.
- Length int
- }
-
- // key is the type used to store internal values in the context.
- // Context provides typed accessor methods to these values.
- key int
-)
-
-// NewContext builds a new goa request context.
-// If ctx is nil then context.Background() is used.
-func NewContext(ctx context.Context, rw http.ResponseWriter, req *http.Request, params url.Values) context.Context {
- if ctx == nil {
- ctx = context.Background()
- }
- request := &RequestData{Request: req, Params: params}
- response := &ResponseData{ResponseWriter: rw}
- ctx = context.WithValue(ctx, respKey, response)
- ctx = context.WithValue(ctx, reqKey, request)
-
- return ctx
-}
-
-// WithAction creates a context with the given action name.
-func WithAction(ctx context.Context, action string) context.Context {
- return context.WithValue(ctx, actionKey, action)
-}
-
-// WithLogger sets the request context logger and returns the resulting new context.
-func WithLogger(ctx context.Context, logger LogAdapter) context.Context {
- return context.WithValue(ctx, logKey, logger)
-}
-
-// WithLogContext instantiates a new logger by appending the given key/value pairs to the context
-// logger and setting the resulting logger in the context.
-func WithLogContext(ctx context.Context, keyvals ...interface{}) context.Context {
- logger := ContextLogger(ctx)
- if logger == nil {
- return ctx
- }
- nl := logger.New(keyvals...)
- return WithLogger(ctx, nl)
-}
-
-// WithError creates a context with the given error.
-func WithError(ctx context.Context, err error) context.Context {
- return context.WithValue(ctx, errKey, err)
-}
-
-// ContextController extracts the controller name from the given context.
-func ContextController(ctx context.Context) string {
- if c := ctx.Value(ctrlKey); c != nil {
- return c.(string)
- }
- return "\n")
- for _, d := range dirs {
- name := d.Name()
- if d.IsDir() {
- name += "/"
- }
- // name may contain '?' or '#', which must be escaped to remain
- // part of the URL path, and not indicate the start of a query
- // string or fragment.
- url := url.URL{Path: name}
- fmt.Fprintf(w, "%s\n", url.String(), replacer.Replace(name))
- }
- fmt.Fprintf(w, "\n")
- return nil
-}
-
-type byName []os.FileInfo
-
-func (s byName) Len() int { return len(s) }
-func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() }
-func (s byName) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
diff --git a/vendor/github.com/goadesign/goa/uuid/common.go b/vendor/github.com/goadesign/goa/uuid/common.go
deleted file mode 100644
index a8967368b5b..00000000000
--- a/vendor/github.com/goadesign/goa/uuid/common.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package uuid
-
-// UUID This is needed to build with gopherjs
-type UUID [16]byte
diff --git a/vendor/github.com/goadesign/goa/uuid/uuid.go b/vendor/github.com/goadesign/goa/uuid/uuid.go
deleted file mode 100644
index 5117e4c7c35..00000000000
--- a/vendor/github.com/goadesign/goa/uuid/uuid.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// +build !js
-
-//This is just a declaration of the uuid.UUID which doesn't work with gopherjs
-//See uuid_js.go for the JS implementation
-
-package uuid
-
-import "github.com/satori/go.uuid"
-
-// FromString Wrapper around the real FromString
-func FromString(input string) (UUID, error) {
- u, err := uuid.FromString(input)
- return UUID(u), err
-}
-
-// NewV4 Wrapper over the real NewV4 method
-func NewV4() UUID {
- return UUID(uuid.Must(uuid.NewV4()))
-}
-
-// String Wrapper over the real String method
-func (u UUID) String() string {
- return uuid.UUID(u).String()
-}
-
-// MarshalText Wrapper over the real MarshalText method
-func (u UUID) MarshalText() (text []byte, err error) {
- return uuid.UUID(u).MarshalText()
-}
-
-// MarshalBinary Wrapper over the real MarshalBinary method
-func (u UUID) MarshalBinary() ([]byte, error) {
- return uuid.UUID(u).MarshalBinary()
-}
-
-// UnmarshalBinary Wrapper over the real UnmarshalBinary method
-func (u *UUID) UnmarshalBinary(data []byte) error {
- t := uuid.UUID{}
- err := t.UnmarshalBinary(data)
- for i, b := range t.Bytes() {
- u[i] = b
- }
- return err
-}
-
-// UnmarshalText Wrapper over the real UnmarshalText method
-func (u *UUID) UnmarshalText(text []byte) error {
- t := uuid.UUID{}
- err := t.UnmarshalText(text)
- for i, b := range t.Bytes() {
- u[i] = b
- }
- return err
-}
diff --git a/vendor/github.com/goadesign/goa/uuid/uuid_js.go b/vendor/github.com/goadesign/goa/uuid/uuid_js.go
deleted file mode 100644
index 12d0cc78c26..00000000000
--- a/vendor/github.com/goadesign/goa/uuid/uuid_js.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// +build js
-
-//This part is copied from github.com/satori/go.uuid but some feature uses non gopherjs compliants calls
-//Since goa only needs a subset of the features the js copies them in here
-
-package uuid
-
-import (
- "bytes"
- "encoding/hex"
- "fmt"
-)
-
-// String parse helpers.
-var (
- urnPrefix = []byte("urn:uuid:")
- byteGroups = []int{8, 4, 4, 4, 12}
-)
-
-// FromString returns UUID parsed from string input.
-// Input is expected in a form accepted by UnmarshalText.
-func FromString(input string) (u UUID, err error) {
- err = u.UnmarshalText([]byte(input))
- return
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface.
-// Following formats are supported:
-// "6ba7b810-9dad-11d1-80b4-00c04fd430c8",
-// "{6ba7b810-9dad-11d1-80b4-00c04fd430c8}",
-// "urn:uuid:6ba7b810-9dad-11d1-80b4-00c04fd430c8"
-func (u *UUID) UnmarshalText(text []byte) (err error) {
- if len(text) < 32 {
- err = fmt.Errorf("uuid: UUID string too short: %s", text)
- return
- }
-
- t := text[:]
-
- if bytes.Equal(t[:9], urnPrefix) {
- t = t[9:]
- } else if t[0] == '{' {
- t = t[1:]
- }
-
- b := u[:]
-
- for _, byteGroup := range byteGroups {
- if t[0] == '-' {
- t = t[1:]
- }
-
- if len(t) < byteGroup {
- err = fmt.Errorf("uuid: UUID string too short: %s", text)
- return
- }
-
- _, err = hex.Decode(b[:byteGroup/2], t[:byteGroup])
-
- if err != nil {
- return
- }
-
- t = t[byteGroup:]
- b = b[byteGroup/2:]
- }
-
- return
-}
-
-// Used in string method conversion
-const dash byte = '-'
-
-// Returns canonical string representation of UUID:
-// xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx.
-func (u UUID) String() string {
- buf := make([]byte, 36)
-
- hex.Encode(buf[0:8], u[0:4])
- buf[8] = dash
- hex.Encode(buf[9:13], u[4:6])
- buf[13] = dash
- hex.Encode(buf[14:18], u[6:8])
- buf[18] = dash
- hex.Encode(buf[19:23], u[8:10])
- buf[23] = dash
- hex.Encode(buf[24:], u[10:])
-
- return string(buf)
-}
diff --git a/vendor/github.com/goadesign/goa/validation.go b/vendor/github.com/goadesign/goa/validation.go
deleted file mode 100644
index ea08a061850..00000000000
--- a/vendor/github.com/goadesign/goa/validation.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package goa
-
-import (
- "fmt"
- "net"
- "net/mail"
- "net/url"
- "regexp"
- "sync"
- "time"
-
- "github.com/goadesign/goa/uuid"
-)
-
-// Format defines a validation format.
-type Format string
-
-const (
- // FormatDateTime defines RFC3339 date time values.
- FormatDateTime Format = "date-time"
-
- // FormatUUID defines RFC4122 uuid values.
- FormatUUID Format = "uuid"
-
- // FormatEmail defines RFC5322 email addresses.
- FormatEmail = "email"
-
- // FormatHostname defines RFC1035 Internet host names.
- FormatHostname = "hostname"
-
- // FormatIPv4 defines RFC2373 IPv4 address values.
- FormatIPv4 = "ipv4"
-
- // FormatIPv6 defines RFC2373 IPv6 address values.
- FormatIPv6 = "ipv6"
-
- // FormatIP defines RFC2373 IPv4 or IPv6 address values.
- FormatIP = "ip"
-
- // FormatURI defines RFC3986 URI values.
- FormatURI = "uri"
-
- // FormatMAC defines IEEE 802 MAC-48, EUI-48 or EUI-64 MAC address values.
- FormatMAC = "mac"
-
- // FormatCIDR defines RFC4632 and RFC4291 CIDR notation IP address values.
- FormatCIDR = "cidr"
-
- // FormatRegexp Regexp defines regular expression syntax accepted by RE2.
- FormatRegexp = "regexp"
-
- // FormatRFC1123 defines RFC1123 date time values.
- FormatRFC1123 = "rfc1123"
-)
-
-var (
- // Regular expression used to validate RFC1035 hostnames*/
- hostnameRegex = regexp.MustCompile(`^[[:alnum:]][[:alnum:]\-]{0,61}[[:alnum:]]|[[:alpha:]]$`)
-
- // Simple regular expression for IPv4 values, more rigorous checking is done via net.ParseIP
- ipv4Regex = regexp.MustCompile(`^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$`)
-)
-
-// ValidateFormat validates a string against a standard format.
-// It returns nil if the string conforms to the format, an error otherwise.
-// The format specification follows the json schema draft 4 validation extension.
-// see http://json-schema.org/latest/json-schema-validation.html#anchor105
-// Supported formats are:
-//
-// - "date-time": RFC3339 date time value
-// - "email": RFC5322 email address
-// - "hostname": RFC1035 Internet host name
-// - "ipv4", "ipv6", "ip": RFC2673 and RFC2373 IP address values
-// - "uri": RFC3986 URI value
-// - "mac": IEEE 802 MAC-48, EUI-48 or EUI-64 MAC address value
-// - "cidr": RFC4632 and RFC4291 CIDR notation IP address value
-// - "regexp": Regular expression syntax accepted by RE2
-// - "rfc1123": RFC1123 date time value
-func ValidateFormat(f Format, val string) error {
- var err error
- switch f {
- case FormatDateTime:
- _, err = time.Parse(time.RFC3339, val)
- case FormatUUID:
- _, err = uuid.FromString(val)
- case FormatEmail:
- _, err = mail.ParseAddress(val)
- case FormatHostname:
- if !hostnameRegex.MatchString(val) {
- err = fmt.Errorf("hostname value '%s' does not match %s",
- val, hostnameRegex.String())
- }
- case FormatIPv4, FormatIPv6, FormatIP:
- ip := net.ParseIP(val)
- if ip == nil {
- err = fmt.Errorf("\"%s\" is an invalid %s value", val, f)
- }
- if f == FormatIPv4 {
- if !ipv4Regex.MatchString(val) {
- err = fmt.Errorf("\"%s\" is an invalid ipv4 value", val)
- }
- }
- if f == FormatIPv6 {
- if ipv4Regex.MatchString(val) {
- err = fmt.Errorf("\"%s\" is an invalid ipv6 value", val)
- }
- }
- case FormatURI:
- _, err = url.ParseRequestURI(val)
- case FormatMAC:
- _, err = net.ParseMAC(val)
- case FormatCIDR:
- _, _, err = net.ParseCIDR(val)
- case FormatRegexp:
- _, err = regexp.Compile(val)
- case FormatRFC1123:
- _, err = time.Parse(time.RFC1123, val)
- default:
- return fmt.Errorf("unknown format %#v", f)
- }
- if err != nil {
- go IncrCounter([]string{"goa", "validation", "error", string(f)}, 1.0)
- return fmt.Errorf("invalid %s value, %s", f, err)
- }
- return nil
-}
-
-// knownPatterns records the compiled patterns.
-// TBD: refactor all this so that the generated code initializes the map on start to get rid of the
-// need for a RW mutex.
-var knownPatterns = make(map[string]*regexp.Regexp)
-
-// knownPatternsLock is the mutex used to access knownPatterns
-var knownPatternsLock = &sync.RWMutex{}
-
-// ValidatePattern returns an error if val does not match the regular expression p.
-// It makes an effort to minimize the number of times the regular expression needs to be compiled.
-func ValidatePattern(p string, val string) bool {
- knownPatternsLock.RLock()
- r, ok := knownPatterns[p]
- knownPatternsLock.RUnlock()
- if !ok {
- r = regexp.MustCompile(p) // DSL validation makes sure regexp is valid
- knownPatternsLock.Lock()
- knownPatterns[p] = r
- knownPatternsLock.Unlock()
- }
- return r.MatchString(val)
-}
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/.gitignore b/vendor/github.com/hashicorp/go-immutable-radix/.gitignore
deleted file mode 100644
index daf913b1b34..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/.travis.yml b/vendor/github.com/hashicorp/go-immutable-radix/.travis.yml
deleted file mode 100644
index 1a0bbea6c77..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: go
-go:
- - tip
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/LICENSE b/vendor/github.com/hashicorp/go-immutable-radix/LICENSE
deleted file mode 100644
index e87a115e462..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/LICENSE
+++ /dev/null
@@ -1,363 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
- means each individual or legal entity that creates, contributes to the
- creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
- means the combination of the Contributions of others (if any) used by a
- Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
- means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
- means Source Code Form to which the initial Contributor has attached the
- notice in Exhibit A, the Executable Form of such Source Code Form, and
- Modifications of such Source Code Form, in each case including portions
- thereof.
-
-1.5. "Incompatible With Secondary Licenses"
- means
-
- a. that the initial Contributor has attached the notice described in
- Exhibit B to the Covered Software; or
-
- b. that the Covered Software was made available under the terms of
- version 1.1 or earlier of the License, but not also under the terms of
- a Secondary License.
-
-1.6. "Executable Form"
-
- means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
- means a work that combines Covered Software with other material, in a
- separate file or files, that is not Covered Software.
-
-1.8. "License"
-
- means this document.
-
-1.9. "Licensable"
-
- means having the right to grant, to the maximum extent possible, whether
- at the time of the initial grant or subsequently, any and all of the
- rights conveyed by this License.
-
-1.10. "Modifications"
-
- means any of the following:
-
- a. any file in Source Code Form that results from an addition to,
- deletion from, or modification of the contents of Covered Software; or
-
- b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
- means any patent claim(s), including without limitation, method,
- process, and apparatus claims, in any patent Licensable by such
- Contributor that would be infringed, but for the grant of the License,
- by the making, using, selling, offering for sale, having made, import,
- or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
- means either the GNU General Public License, Version 2.0, the GNU Lesser
- General Public License, Version 2.1, the GNU Affero General Public
- License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
- means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
- means an individual or a legal entity exercising rights under this
- License. For legal entities, "You" includes any entity that controls, is
- controlled by, or is under common control with You. For purposes of this
- definition, "control" means (a) the power, direct or indirect, to cause
- the direction or management of such entity, whether by contract or
- otherwise, or (b) ownership of more than fifty percent (50%) of the
- outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
- Each Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license:
-
- a. under intellectual property rights (other than patent or trademark)
- Licensable by such Contributor to use, reproduce, make available,
- modify, display, perform, distribute, and otherwise exploit its
- Contributions, either on an unmodified basis, with Modifications, or
- as part of a Larger Work; and
-
- b. under Patent Claims of such Contributor to make, use, sell, offer for
- sale, have made, import, and otherwise transfer either its
- Contributions or its Contributor Version.
-
-2.2. Effective Date
-
- The licenses granted in Section 2.1 with respect to any Contribution
- become effective for each Contribution on the date the Contributor first
- distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
- The licenses granted in this Section 2 are the only rights granted under
- this License. No additional rights or licenses will be implied from the
- distribution or licensing of Covered Software under this License.
- Notwithstanding Section 2.1(b) above, no patent license is granted by a
- Contributor:
-
- a. for any code that a Contributor has removed from Covered Software; or
-
- b. for infringements caused by: (i) Your and any other third party's
- modifications of Covered Software, or (ii) the combination of its
- Contributions with other software (except as part of its Contributor
- Version); or
-
- c. under Patent Claims infringed by Covered Software in the absence of
- its Contributions.
-
- This License does not grant any rights in the trademarks, service marks,
- or logos of any Contributor (except as may be necessary to comply with
- the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
- No Contributor makes additional grants as a result of Your choice to
- distribute the Covered Software under a subsequent version of this
- License (see Section 10.2) or under the terms of a Secondary License (if
- permitted under the terms of Section 3.3).
-
-2.5. Representation
-
- Each Contributor represents that the Contributor believes its
- Contributions are its original creation(s) or it has sufficient rights to
- grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
- This License is not intended to limit any rights You have under
- applicable copyright doctrines of fair use, fair dealing, or other
- equivalents.
-
-2.7. Conditions
-
- Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
- Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
- All distribution of Covered Software in Source Code Form, including any
- Modifications that You create or to which You contribute, must be under
- the terms of this License. You must inform recipients that the Source
- Code Form of the Covered Software is governed by the terms of this
- License, and how they can obtain a copy of this License. You may not
- attempt to alter or restrict the recipients' rights in the Source Code
- Form.
-
-3.2. Distribution of Executable Form
-
- If You distribute Covered Software in Executable Form then:
-
- a. such Covered Software must also be made available in Source Code Form,
- as described in Section 3.1, and You must inform recipients of the
- Executable Form how they can obtain a copy of such Source Code Form by
- reasonable means in a timely manner, at a charge no more than the cost
- of distribution to the recipient; and
-
- b. You may distribute such Executable Form under the terms of this
- License, or sublicense it under different terms, provided that the
- license for the Executable Form does not attempt to limit or alter the
- recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
- You may create and distribute a Larger Work under terms of Your choice,
- provided that You also comply with the requirements of this License for
- the Covered Software. If the Larger Work is a combination of Covered
- Software with a work governed by one or more Secondary Licenses, and the
- Covered Software is not Incompatible With Secondary Licenses, this
- License permits You to additionally distribute such Covered Software
- under the terms of such Secondary License(s), so that the recipient of
- the Larger Work may, at their option, further distribute the Covered
- Software under the terms of either this License or such Secondary
- License(s).
-
-3.4. Notices
-
- You may not remove or alter the substance of any license notices
- (including copyright notices, patent notices, disclaimers of warranty, or
- limitations of liability) contained within the Source Code Form of the
- Covered Software, except that You may alter any license notices to the
- extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
- You may choose to offer, and to charge a fee for, warranty, support,
- indemnity or liability obligations to one or more recipients of Covered
- Software. However, You may do so only on Your own behalf, and not on
- behalf of any Contributor. You must make it absolutely clear that any
- such warranty, support, indemnity, or liability obligation is offered by
- You alone, and You hereby agree to indemnify every Contributor for any
- liability incurred by such Contributor as a result of warranty, support,
- indemnity or liability terms You offer. You may include additional
- disclaimers of warranty and limitations of liability specific to any
- jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
- If it is impossible for You to comply with any of the terms of this License
- with respect to some or all of the Covered Software due to statute,
- judicial order, or regulation then You must: (a) comply with the terms of
- this License to the maximum extent possible; and (b) describe the
- limitations and the code they affect. Such description must be placed in a
- text file included with all distributions of the Covered Software under
- this License. Except to the extent prohibited by statute or regulation,
- such description must be sufficiently detailed for a recipient of ordinary
- skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
- fail to comply with any of its terms. However, if You become compliant,
- then the rights granted under this License from a particular Contributor
- are reinstated (a) provisionally, unless and until such Contributor
- explicitly and finally terminates Your grants, and (b) on an ongoing
- basis, if such Contributor fails to notify You of the non-compliance by
- some reasonable means prior to 60 days after You have come back into
- compliance. Moreover, Your grants from a particular Contributor are
- reinstated on an ongoing basis if such Contributor notifies You of the
- non-compliance by some reasonable means, this is the first time You have
- received notice of non-compliance with this License from such
- Contributor, and You become compliant prior to 30 days after Your receipt
- of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
- infringement claim (excluding declaratory judgment actions,
- counter-claims, and cross-claims) alleging that a Contributor Version
- directly or indirectly infringes any patent, then the rights granted to
- You by any and all Contributors for the Covered Software under Section
- 2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
- license agreements (excluding distributors and resellers) which have been
- validly granted by You or Your distributors under this License prior to
- termination shall survive termination.
-
-6. Disclaimer of Warranty
-
- Covered Software is provided under this License on an "as is" basis,
- without warranty of any kind, either expressed, implied, or statutory,
- including, without limitation, warranties that the Covered Software is free
- of defects, merchantable, fit for a particular purpose or non-infringing.
- The entire risk as to the quality and performance of the Covered Software
- is with You. Should any Covered Software prove defective in any respect,
- You (not any Contributor) assume the cost of any necessary servicing,
- repair, or correction. This disclaimer of warranty constitutes an essential
- part of this License. No use of any Covered Software is authorized under
- this License except under this disclaimer.
-
-7. Limitation of Liability
-
- Under no circumstances and under no legal theory, whether tort (including
- negligence), contract, or otherwise, shall any Contributor, or anyone who
- distributes Covered Software as permitted above, be liable to You for any
- direct, indirect, special, incidental, or consequential damages of any
- character including, without limitation, damages for lost profits, loss of
- goodwill, work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses, even if such party shall have been
- informed of the possibility of such damages. This limitation of liability
- shall not apply to liability for death or personal injury resulting from
- such party's negligence to the extent applicable law prohibits such
- limitation. Some jurisdictions do not allow the exclusion or limitation of
- incidental or consequential damages, so this exclusion and limitation may
- not apply to You.
-
-8. Litigation
-
- Any litigation relating to this License may be brought only in the courts
- of a jurisdiction where the defendant maintains its principal place of
- business and such litigation shall be governed by laws of that
- jurisdiction, without reference to its conflict-of-law provisions. Nothing
- in this Section shall prevent a party's ability to bring cross-claims or
- counter-claims.
-
-9. Miscellaneous
-
- This License represents the complete agreement concerning the subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent
- necessary to make it enforceable. Any law or regulation which provides that
- the language of a contract shall be construed against the drafter shall not
- be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
- Mozilla Foundation is the license steward. Except as provided in Section
- 10.3, no one other than the license steward has the right to modify or
- publish new versions of this License. Each version will be given a
- distinguishing version number.
-
-10.2. Effect of New Versions
-
- You may distribute the Covered Software under the terms of the version
- of the License under which You originally received the Covered Software,
- or under the terms of any subsequent version published by the license
- steward.
-
-10.3. Modified Versions
-
- If you create software not governed by this License, and you want to
- create a new license for such software, you may create and use a
- modified version of this License if you rename the license and remove
- any references to the name of the license steward (except to note that
- such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
- Licenses If You choose to distribute Source Code Form that is
- Incompatible With Secondary Licenses under the terms of this version of
- the License, the notice described in Exhibit B of this License must be
- attached.
-
-Exhibit A - Source Code Form License Notice
-
- This Source Code Form is subject to the
- terms of the Mozilla Public License, v.
- 2.0. If a copy of the MPL was not
- distributed with this file, You can
- obtain one at
- http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
- This Source Code Form is "Incompatible
- With Secondary Licenses", as defined by
- the Mozilla Public License, v. 2.0.
-
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/README.md b/vendor/github.com/hashicorp/go-immutable-radix/README.md
deleted file mode 100644
index 8910fcc035a..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-go-immutable-radix [](https://travis-ci.org/hashicorp/go-immutable-radix)
-=========
-
-Provides the `iradix` package that implements an immutable [radix tree](http://en.wikipedia.org/wiki/Radix_tree).
-The package only provides a single `Tree` implementation, optimized for sparse nodes.
-
-As a radix tree, it provides the following:
- * O(k) operations. In many cases, this can be faster than a hash table since
- the hash function is an O(k) operation, and hash tables have very poor cache locality.
- * Minimum / Maximum value lookups
- * Ordered iteration
-
-A tree supports using a transaction to batch multiple updates (insert, delete)
-in a more efficient manner than performing each operation one at a time.
-
-For a mutable variant, see [go-radix](https://github.com/armon/go-radix).
-
-Documentation
-=============
-
-The full documentation is available on [Godoc](http://godoc.org/github.com/hashicorp/go-immutable-radix).
-
-Example
-=======
-
-Below is a simple example of usage
-
-```go
-// Create a tree
-r := iradix.New()
-r, _, _ = r.Insert([]byte("foo"), 1)
-r, _, _ = r.Insert([]byte("bar"), 2)
-r, _, _ = r.Insert([]byte("foobar"), 2)
-
-// Find the longest prefix match
-m, _, _ := r.Root().LongestPrefix([]byte("foozip"))
-if string(m) != "foo" {
- panic("should be foo")
-}
-```
-
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/edges.go b/vendor/github.com/hashicorp/go-immutable-radix/edges.go
deleted file mode 100644
index a63674775f2..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/edges.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package iradix
-
-import "sort"
-
-type edges []edge
-
-func (e edges) Len() int {
- return len(e)
-}
-
-func (e edges) Less(i, j int) bool {
- return e[i].label < e[j].label
-}
-
-func (e edges) Swap(i, j int) {
- e[i], e[j] = e[j], e[i]
-}
-
-func (e edges) Sort() {
- sort.Sort(e)
-}
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/iradix.go b/vendor/github.com/hashicorp/go-immutable-radix/iradix.go
deleted file mode 100644
index e5e6e57f262..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/iradix.go
+++ /dev/null
@@ -1,662 +0,0 @@
-package iradix
-
-import (
- "bytes"
- "strings"
-
- "github.com/hashicorp/golang-lru/simplelru"
-)
-
-const (
- // defaultModifiedCache is the default size of the modified node
- // cache used per transaction. This is used to cache the updates
- // to the nodes near the root, while the leaves do not need to be
- // cached. This is important for very large transactions to prevent
- // the modified cache from growing to be enormous. This is also used
- // to set the max size of the mutation notify maps since those should
- // also be bounded in a similar way.
- defaultModifiedCache = 8192
-)
-
-// Tree implements an immutable radix tree. This can be treated as a
-// Dictionary abstract data type. The main advantage over a standard
-// hash map is prefix-based lookups and ordered iteration. The immutability
-// means that it is safe to concurrently read from a Tree without any
-// coordination.
-type Tree struct {
- root *Node
- size int
-}
-
-// New returns an empty Tree
-func New() *Tree {
- t := &Tree{
- root: &Node{
- mutateCh: make(chan struct{}),
- },
- }
- return t
-}
-
-// Len is used to return the number of elements in the tree
-func (t *Tree) Len() int {
- return t.size
-}
-
-// Txn is a transaction on the tree. This transaction is applied
-// atomically and returns a new tree when committed. A transaction
-// is not thread safe, and should only be used by a single goroutine.
-type Txn struct {
- // root is the modified root for the transaction.
- root *Node
-
- // snap is a snapshot of the root node for use if we have to run the
- // slow notify algorithm.
- snap *Node
-
- // size tracks the size of the tree as it is modified during the
- // transaction.
- size int
-
- // writable is a cache of writable nodes that have been created during
- // the course of the transaction. This allows us to re-use the same
- // nodes for further writes and avoid unnecessary copies of nodes that
- // have never been exposed outside the transaction. This will only hold
- // up to defaultModifiedCache number of entries.
- writable *simplelru.LRU
-
- // trackChannels is used to hold channels that need to be notified to
- // signal mutation of the tree. This will only hold up to
- // defaultModifiedCache number of entries, after which we will set the
- // trackOverflow flag, which will cause us to use a more expensive
- // algorithm to perform the notifications. Mutation tracking is only
- // performed if trackMutate is true.
- trackChannels map[chan struct{}]struct{}
- trackOverflow bool
- trackMutate bool
-}
-
-// Txn starts a new transaction that can be used to mutate the tree
-func (t *Tree) Txn() *Txn {
- txn := &Txn{
- root: t.root,
- snap: t.root,
- size: t.size,
- }
- return txn
-}
-
-// TrackMutate can be used to toggle if mutations are tracked. If this is enabled
-// then notifications will be issued for affected internal nodes and leaves when
-// the transaction is committed.
-func (t *Txn) TrackMutate(track bool) {
- t.trackMutate = track
-}
-
-// trackChannel safely attempts to track the given mutation channel, setting the
-// overflow flag if we can no longer track any more. This limits the amount of
-// state that will accumulate during a transaction and we have a slower algorithm
-// to switch to if we overflow.
-func (t *Txn) trackChannel(ch chan struct{}) {
- // In overflow, make sure we don't store any more objects.
- if t.trackOverflow {
- return
- }
-
- // If this would overflow the state we reject it and set the flag (since
- // we aren't tracking everything that's required any longer).
- if len(t.trackChannels) >= defaultModifiedCache {
- // Mark that we are in the overflow state
- t.trackOverflow = true
-
- // Clear the map so that the channels can be garbage collected. It is
- // safe to do this since we have already overflowed and will be using
- // the slow notify algorithm.
- t.trackChannels = nil
- return
- }
-
- // Create the map on the fly when we need it.
- if t.trackChannels == nil {
- t.trackChannels = make(map[chan struct{}]struct{})
- }
-
- // Otherwise we are good to track it.
- t.trackChannels[ch] = struct{}{}
-}
-
-// writeNode returns a node to be modified, if the current node has already been
-// modified during the course of the transaction, it is used in-place. Set
-// forLeafUpdate to true if you are getting a write node to update the leaf,
-// which will set leaf mutation tracking appropriately as well.
-func (t *Txn) writeNode(n *Node, forLeafUpdate bool) *Node {
- // Ensure the writable set exists.
- if t.writable == nil {
- lru, err := simplelru.NewLRU(defaultModifiedCache, nil)
- if err != nil {
- panic(err)
- }
- t.writable = lru
- }
-
- // If this node has already been modified, we can continue to use it
- // during this transaction. We know that we don't need to track it for
- // a node update since the node is writable, but if this is for a leaf
- // update we track it, in case the initial write to this node didn't
- // update the leaf.
- if _, ok := t.writable.Get(n); ok {
- if t.trackMutate && forLeafUpdate && n.leaf != nil {
- t.trackChannel(n.leaf.mutateCh)
- }
- return n
- }
-
- // Mark this node as being mutated.
- if t.trackMutate {
- t.trackChannel(n.mutateCh)
- }
-
- // Mark its leaf as being mutated, if appropriate.
- if t.trackMutate && forLeafUpdate && n.leaf != nil {
- t.trackChannel(n.leaf.mutateCh)
- }
-
- // Copy the existing node. If you have set forLeafUpdate it will be
- // safe to replace this leaf with another after you get your node for
- // writing. You MUST replace it, because the channel associated with
- // this leaf will be closed when this transaction is committed.
- nc := &Node{
- mutateCh: make(chan struct{}),
- leaf: n.leaf,
- }
- if n.prefix != nil {
- nc.prefix = make([]byte, len(n.prefix))
- copy(nc.prefix, n.prefix)
- }
- if len(n.edges) != 0 {
- nc.edges = make([]edge, len(n.edges))
- copy(nc.edges, n.edges)
- }
-
- // Mark this node as writable.
- t.writable.Add(nc, nil)
- return nc
-}
-
-// Visit all the nodes in the tree under n, and add their mutateChannels to the transaction
-// Returns the size of the subtree visited
-func (t *Txn) trackChannelsAndCount(n *Node) int {
- // Count only leaf nodes
- leaves := 0
- if n.leaf != nil {
- leaves = 1
- }
- // Mark this node as being mutated.
- if t.trackMutate {
- t.trackChannel(n.mutateCh)
- }
-
- // Mark its leaf as being mutated, if appropriate.
- if t.trackMutate && n.leaf != nil {
- t.trackChannel(n.leaf.mutateCh)
- }
-
- // Recurse on the children
- for _, e := range n.edges {
- leaves += t.trackChannelsAndCount(e.node)
- }
- return leaves
-}
-
-// mergeChild is called to collapse the given node with its child. This is only
-// called when the given node is not a leaf and has a single edge.
-func (t *Txn) mergeChild(n *Node) {
- // Mark the child node as being mutated since we are about to abandon
- // it. We don't need to mark the leaf since we are retaining it if it
- // is there.
- e := n.edges[0]
- child := e.node
- if t.trackMutate {
- t.trackChannel(child.mutateCh)
- }
-
- // Merge the nodes.
- n.prefix = concat(n.prefix, child.prefix)
- n.leaf = child.leaf
- if len(child.edges) != 0 {
- n.edges = make([]edge, len(child.edges))
- copy(n.edges, child.edges)
- } else {
- n.edges = nil
- }
-}
-
-// insert does a recursive insertion
-func (t *Txn) insert(n *Node, k, search []byte, v interface{}) (*Node, interface{}, bool) {
- // Handle key exhaustion
- if len(search) == 0 {
- var oldVal interface{}
- didUpdate := false
- if n.isLeaf() {
- oldVal = n.leaf.val
- didUpdate = true
- }
-
- nc := t.writeNode(n, true)
- nc.leaf = &leafNode{
- mutateCh: make(chan struct{}),
- key: k,
- val: v,
- }
- return nc, oldVal, didUpdate
- }
-
- // Look for the edge
- idx, child := n.getEdge(search[0])
-
- // No edge, create one
- if child == nil {
- e := edge{
- label: search[0],
- node: &Node{
- mutateCh: make(chan struct{}),
- leaf: &leafNode{
- mutateCh: make(chan struct{}),
- key: k,
- val: v,
- },
- prefix: search,
- },
- }
- nc := t.writeNode(n, false)
- nc.addEdge(e)
- return nc, nil, false
- }
-
- // Determine longest prefix of the search key on match
- commonPrefix := longestPrefix(search, child.prefix)
- if commonPrefix == len(child.prefix) {
- search = search[commonPrefix:]
- newChild, oldVal, didUpdate := t.insert(child, k, search, v)
- if newChild != nil {
- nc := t.writeNode(n, false)
- nc.edges[idx].node = newChild
- return nc, oldVal, didUpdate
- }
- return nil, oldVal, didUpdate
- }
-
- // Split the node
- nc := t.writeNode(n, false)
- splitNode := &Node{
- mutateCh: make(chan struct{}),
- prefix: search[:commonPrefix],
- }
- nc.replaceEdge(edge{
- label: search[0],
- node: splitNode,
- })
-
- // Restore the existing child node
- modChild := t.writeNode(child, false)
- splitNode.addEdge(edge{
- label: modChild.prefix[commonPrefix],
- node: modChild,
- })
- modChild.prefix = modChild.prefix[commonPrefix:]
-
- // Create a new leaf node
- leaf := &leafNode{
- mutateCh: make(chan struct{}),
- key: k,
- val: v,
- }
-
- // If the new key is a subset, add to to this node
- search = search[commonPrefix:]
- if len(search) == 0 {
- splitNode.leaf = leaf
- return nc, nil, false
- }
-
- // Create a new edge for the node
- splitNode.addEdge(edge{
- label: search[0],
- node: &Node{
- mutateCh: make(chan struct{}),
- leaf: leaf,
- prefix: search,
- },
- })
- return nc, nil, false
-}
-
-// delete does a recursive deletion
-func (t *Txn) delete(parent, n *Node, search []byte) (*Node, *leafNode) {
- // Check for key exhaustion
- if len(search) == 0 {
- if !n.isLeaf() {
- return nil, nil
- }
- // Copy the pointer in case we are in a transaction that already
- // modified this node since the node will be reused. Any changes
- // made to the node will not affect returning the original leaf
- // value.
- oldLeaf := n.leaf
-
- // Remove the leaf node
- nc := t.writeNode(n, true)
- nc.leaf = nil
-
- // Check if this node should be merged
- if n != t.root && len(nc.edges) == 1 {
- t.mergeChild(nc)
- }
- return nc, oldLeaf
- }
-
- // Look for an edge
- label := search[0]
- idx, child := n.getEdge(label)
- if child == nil || !bytes.HasPrefix(search, child.prefix) {
- return nil, nil
- }
-
- // Consume the search prefix
- search = search[len(child.prefix):]
- newChild, leaf := t.delete(n, child, search)
- if newChild == nil {
- return nil, nil
- }
-
- // Copy this node. WATCH OUT - it's safe to pass "false" here because we
- // will only ADD a leaf via nc.mergeChild() if there isn't one due to
- // the !nc.isLeaf() check in the logic just below. This is pretty subtle,
- // so be careful if you change any of the logic here.
- nc := t.writeNode(n, false)
-
- // Delete the edge if the node has no edges
- if newChild.leaf == nil && len(newChild.edges) == 0 {
- nc.delEdge(label)
- if n != t.root && len(nc.edges) == 1 && !nc.isLeaf() {
- t.mergeChild(nc)
- }
- } else {
- nc.edges[idx].node = newChild
- }
- return nc, leaf
-}
-
-// delete does a recursive deletion
-func (t *Txn) deletePrefix(parent, n *Node, search []byte) (*Node, int) {
- // Check for key exhaustion
- if len(search) == 0 {
- nc := t.writeNode(n, true)
- if n.isLeaf() {
- nc.leaf = nil
- }
- nc.edges = nil
- return nc, t.trackChannelsAndCount(n)
- }
-
- // Look for an edge
- label := search[0]
- idx, child := n.getEdge(label)
- // We make sure that either the child node's prefix starts with the search term, or the search term starts with the child node's prefix
- // Need to do both so that we can delete prefixes that don't correspond to any node in the tree
- if child == nil || (!bytes.HasPrefix(child.prefix, search) && !bytes.HasPrefix(search, child.prefix)) {
- return nil, 0
- }
-
- // Consume the search prefix
- if len(child.prefix) > len(search) {
- search = []byte("")
- } else {
- search = search[len(child.prefix):]
- }
- newChild, numDeletions := t.deletePrefix(n, child, search)
- if newChild == nil {
- return nil, 0
- }
- // Copy this node. WATCH OUT - it's safe to pass "false" here because we
- // will only ADD a leaf via nc.mergeChild() if there isn't one due to
- // the !nc.isLeaf() check in the logic just below. This is pretty subtle,
- // so be careful if you change any of the logic here.
-
- nc := t.writeNode(n, false)
-
- // Delete the edge if the node has no edges
- if newChild.leaf == nil && len(newChild.edges) == 0 {
- nc.delEdge(label)
- if n != t.root && len(nc.edges) == 1 && !nc.isLeaf() {
- t.mergeChild(nc)
- }
- } else {
- nc.edges[idx].node = newChild
- }
- return nc, numDeletions
-}
-
-// Insert is used to add or update a given key. The return provides
-// the previous value and a bool indicating if any was set.
-func (t *Txn) Insert(k []byte, v interface{}) (interface{}, bool) {
- newRoot, oldVal, didUpdate := t.insert(t.root, k, k, v)
- if newRoot != nil {
- t.root = newRoot
- }
- if !didUpdate {
- t.size++
- }
- return oldVal, didUpdate
-}
-
-// Delete is used to delete a given key. Returns the old value if any,
-// and a bool indicating if the key was set.
-func (t *Txn) Delete(k []byte) (interface{}, bool) {
- newRoot, leaf := t.delete(nil, t.root, k)
- if newRoot != nil {
- t.root = newRoot
- }
- if leaf != nil {
- t.size--
- return leaf.val, true
- }
- return nil, false
-}
-
-// DeletePrefix is used to delete an entire subtree that matches the prefix
-// This will delete all nodes under that prefix
-func (t *Txn) DeletePrefix(prefix []byte) bool {
- newRoot, numDeletions := t.deletePrefix(nil, t.root, prefix)
- if newRoot != nil {
- t.root = newRoot
- t.size = t.size - numDeletions
- return true
- }
- return false
-
-}
-
-// Root returns the current root of the radix tree within this
-// transaction. The root is not safe across insert and delete operations,
-// but can be used to read the current state during a transaction.
-func (t *Txn) Root() *Node {
- return t.root
-}
-
-// Get is used to lookup a specific key, returning
-// the value and if it was found
-func (t *Txn) Get(k []byte) (interface{}, bool) {
- return t.root.Get(k)
-}
-
-// GetWatch is used to lookup a specific key, returning
-// the watch channel, value and if it was found
-func (t *Txn) GetWatch(k []byte) (<-chan struct{}, interface{}, bool) {
- return t.root.GetWatch(k)
-}
-
-// Commit is used to finalize the transaction and return a new tree. If mutation
-// tracking is turned on then notifications will also be issued.
-func (t *Txn) Commit() *Tree {
- nt := t.CommitOnly()
- if t.trackMutate {
- t.Notify()
- }
- return nt
-}
-
-// CommitOnly is used to finalize the transaction and return a new tree, but
-// does not issue any notifications until Notify is called.
-func (t *Txn) CommitOnly() *Tree {
- nt := &Tree{t.root, t.size}
- t.writable = nil
- return nt
-}
-
-// slowNotify does a complete comparison of the before and after trees in order
-// to trigger notifications. This doesn't require any additional state but it
-// is very expensive to compute.
-func (t *Txn) slowNotify() {
- snapIter := t.snap.rawIterator()
- rootIter := t.root.rawIterator()
- for snapIter.Front() != nil || rootIter.Front() != nil {
- // If we've exhausted the nodes in the old snapshot, we know
- // there's nothing remaining to notify.
- if snapIter.Front() == nil {
- return
- }
- snapElem := snapIter.Front()
-
- // If we've exhausted the nodes in the new root, we know we need
- // to invalidate everything that remains in the old snapshot. We
- // know from the loop condition there's something in the old
- // snapshot.
- if rootIter.Front() == nil {
- close(snapElem.mutateCh)
- if snapElem.isLeaf() {
- close(snapElem.leaf.mutateCh)
- }
- snapIter.Next()
- continue
- }
-
- // Do one string compare so we can check the various conditions
- // below without repeating the compare.
- cmp := strings.Compare(snapIter.Path(), rootIter.Path())
-
- // If the snapshot is behind the root, then we must have deleted
- // this node during the transaction.
- if cmp < 0 {
- close(snapElem.mutateCh)
- if snapElem.isLeaf() {
- close(snapElem.leaf.mutateCh)
- }
- snapIter.Next()
- continue
- }
-
- // If the snapshot is ahead of the root, then we must have added
- // this node during the transaction.
- if cmp > 0 {
- rootIter.Next()
- continue
- }
-
- // If we have the same path, then we need to see if we mutated a
- // node and possibly the leaf.
- rootElem := rootIter.Front()
- if snapElem != rootElem {
- close(snapElem.mutateCh)
- if snapElem.leaf != nil && (snapElem.leaf != rootElem.leaf) {
- close(snapElem.leaf.mutateCh)
- }
- }
- snapIter.Next()
- rootIter.Next()
- }
-}
-
-// Notify is used along with TrackMutate to trigger notifications. This must
-// only be done once a transaction is committed via CommitOnly, and it is called
-// automatically by Commit.
-func (t *Txn) Notify() {
- if !t.trackMutate {
- return
- }
-
- // If we've overflowed the tracking state we can't use it in any way and
- // need to do a full tree compare.
- if t.trackOverflow {
- t.slowNotify()
- } else {
- for ch := range t.trackChannels {
- close(ch)
- }
- }
-
- // Clean up the tracking state so that a re-notify is safe (will trigger
- // the else clause above which will be a no-op).
- t.trackChannels = nil
- t.trackOverflow = false
-}
-
-// Insert is used to add or update a given key. The return provides
-// the new tree, previous value and a bool indicating if any was set.
-func (t *Tree) Insert(k []byte, v interface{}) (*Tree, interface{}, bool) {
- txn := t.Txn()
- old, ok := txn.Insert(k, v)
- return txn.Commit(), old, ok
-}
-
-// Delete is used to delete a given key. Returns the new tree,
-// old value if any, and a bool indicating if the key was set.
-func (t *Tree) Delete(k []byte) (*Tree, interface{}, bool) {
- txn := t.Txn()
- old, ok := txn.Delete(k)
- return txn.Commit(), old, ok
-}
-
-// DeletePrefix is used to delete all nodes starting with a given prefix. Returns the new tree,
-// and a bool indicating if the prefix matched any nodes
-func (t *Tree) DeletePrefix(k []byte) (*Tree, bool) {
- txn := t.Txn()
- ok := txn.DeletePrefix(k)
- return txn.Commit(), ok
-}
-
-// Root returns the root node of the tree which can be used for richer
-// query operations.
-func (t *Tree) Root() *Node {
- return t.root
-}
-
-// Get is used to lookup a specific key, returning
-// the value and if it was found
-func (t *Tree) Get(k []byte) (interface{}, bool) {
- return t.root.Get(k)
-}
-
-// longestPrefix finds the length of the shared prefix
-// of two strings
-func longestPrefix(k1, k2 []byte) 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
-}
-
-// concat two byte slices, returning a third new copy
-func concat(a, b []byte) []byte {
- c := make([]byte, len(a)+len(b))
- copy(c, a)
- copy(c[len(a):], b)
- return c
-}
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/iter.go b/vendor/github.com/hashicorp/go-immutable-radix/iter.go
deleted file mode 100644
index 9815e02538e..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/iter.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package iradix
-
-import "bytes"
-
-// Iterator is used to iterate over a set of nodes
-// in pre-order
-type Iterator struct {
- node *Node
- stack []edges
-}
-
-// SeekPrefixWatch is used to seek the iterator to a given prefix
-// and returns the watch channel of the finest granularity
-func (i *Iterator) SeekPrefixWatch(prefix []byte) (watch <-chan struct{}) {
- // Wipe the stack
- i.stack = nil
- n := i.node
- watch = n.mutateCh
- search := prefix
- for {
- // Check for key exhaution
- if len(search) == 0 {
- i.node = n
- return
- }
-
- // Look for an edge
- _, n = n.getEdge(search[0])
- if n == nil {
- i.node = nil
- return
- }
-
- // Update to the finest granularity as the search makes progress
- watch = n.mutateCh
-
- // Consume the search prefix
- if bytes.HasPrefix(search, n.prefix) {
- search = search[len(n.prefix):]
-
- } else if bytes.HasPrefix(n.prefix, search) {
- i.node = n
- return
- } else {
- i.node = nil
- return
- }
- }
-}
-
-// SeekPrefix is used to seek the iterator to a given prefix
-func (i *Iterator) SeekPrefix(prefix []byte) {
- i.SeekPrefixWatch(prefix)
-}
-
-// Next returns the next node in order
-func (i *Iterator) Next() ([]byte, interface{}, bool) {
- // Initialize our stack if needed
- if i.stack == nil && i.node != nil {
- i.stack = []edges{
- edges{
- edge{node: i.node},
- },
- }
- }
-
- for len(i.stack) > 0 {
- // Inspect the last element of the stack
- n := len(i.stack)
- last := i.stack[n-1]
- elem := last[0].node
-
- // Update the stack
- if len(last) > 1 {
- i.stack[n-1] = last[1:]
- } else {
- i.stack = i.stack[:n-1]
- }
-
- // Push the edges onto the frontier
- if len(elem.edges) > 0 {
- i.stack = append(i.stack, elem.edges)
- }
-
- // Return the leaf values if any
- if elem.leaf != nil {
- return elem.leaf.key, elem.leaf.val, true
- }
- }
- return nil, nil, false
-}
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/node.go b/vendor/github.com/hashicorp/go-immutable-radix/node.go
deleted file mode 100644
index 7a065e7a09e..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/node.go
+++ /dev/null
@@ -1,292 +0,0 @@
-package iradix
-
-import (
- "bytes"
- "sort"
-)
-
-// WalkFn is used when walking the tree. Takes a
-// key and value, returning if iteration should
-// be terminated.
-type WalkFn func(k []byte, v interface{}) bool
-
-// leafNode is used to represent a value
-type leafNode struct {
- mutateCh chan struct{}
- key []byte
- val interface{}
-}
-
-// edge is used to represent an edge node
-type edge struct {
- label byte
- node *Node
-}
-
-// Node is an immutable node in the radix tree
-type Node struct {
- // mutateCh is closed if this node is modified
- mutateCh chan struct{}
-
- // leaf is used to store possible leaf
- leaf *leafNode
-
- // prefix is the common prefix we ignore
- prefix []byte
-
- // Edges should be stored in-order for iteration.
- // We avoid a fully materialized slice to save memory,
- // since in most cases we expect to be sparse
- edges edges
-}
-
-func (n *Node) isLeaf() bool {
- return n.leaf != nil
-}
-
-func (n *Node) addEdge(e edge) {
- num := len(n.edges)
- idx := sort.Search(num, func(i int) bool {
- return n.edges[i].label >= e.label
- })
- n.edges = append(n.edges, e)
- if idx != num {
- copy(n.edges[idx+1:], n.edges[idx:num])
- n.edges[idx] = e
- }
-}
-
-func (n *Node) replaceEdge(e edge) {
- num := len(n.edges)
- idx := sort.Search(num, func(i int) bool {
- return n.edges[i].label >= e.label
- })
- if idx < num && n.edges[idx].label == e.label {
- n.edges[idx].node = e.node
- return
- }
- panic("replacing missing edge")
-}
-
-func (n *Node) getEdge(label byte) (int, *Node) {
- num := len(n.edges)
- idx := sort.Search(num, func(i int) bool {
- return n.edges[i].label >= label
- })
- if idx < num && n.edges[idx].label == label {
- return idx, n.edges[idx].node
- }
- return -1, nil
-}
-
-func (n *Node) delEdge(label byte) {
- num := len(n.edges)
- idx := sort.Search(num, func(i int) bool {
- return n.edges[i].label >= label
- })
- if idx < num && n.edges[idx].label == label {
- copy(n.edges[idx:], n.edges[idx+1:])
- n.edges[len(n.edges)-1] = edge{}
- n.edges = n.edges[:len(n.edges)-1]
- }
-}
-
-func (n *Node) GetWatch(k []byte) (<-chan struct{}, interface{}, bool) {
- search := k
- watch := n.mutateCh
- for {
- // Check for key exhaustion
- if len(search) == 0 {
- if n.isLeaf() {
- return n.leaf.mutateCh, n.leaf.val, true
- }
- break
- }
-
- // Look for an edge
- _, n = n.getEdge(search[0])
- if n == nil {
- break
- }
-
- // Update to the finest granularity as the search makes progress
- watch = n.mutateCh
-
- // Consume the search prefix
- if bytes.HasPrefix(search, n.prefix) {
- search = search[len(n.prefix):]
- } else {
- break
- }
- }
- return watch, nil, false
-}
-
-func (n *Node) Get(k []byte) (interface{}, bool) {
- _, val, ok := n.GetWatch(k)
- return val, ok
-}
-
-// LongestPrefix is like Get, but instead of an
-// exact match, it will return the longest prefix match.
-func (n *Node) LongestPrefix(k []byte) ([]byte, interface{}, bool) {
- var last *leafNode
- search := k
- for {
- // Look for a leaf node
- if n.isLeaf() {
- last = n.leaf
- }
-
- // Check for key exhaution
- if len(search) == 0 {
- break
- }
-
- // Look for an edge
- _, n = n.getEdge(search[0])
- if n == nil {
- break
- }
-
- // Consume the search prefix
- if bytes.HasPrefix(search, n.prefix) {
- search = search[len(n.prefix):]
- } else {
- break
- }
- }
- if last != nil {
- return last.key, last.val, true
- }
- return nil, nil, false
-}
-
-// Minimum is used to return the minimum value in the tree
-func (n *Node) Minimum() ([]byte, interface{}, bool) {
- for {
- if n.isLeaf() {
- return n.leaf.key, n.leaf.val, true
- }
- if len(n.edges) > 0 {
- n = n.edges[0].node
- } else {
- break
- }
- }
- return nil, nil, false
-}
-
-// Maximum is used to return the maximum value in the tree
-func (n *Node) Maximum() ([]byte, interface{}, bool) {
- for {
- if num := len(n.edges); num > 0 {
- n = n.edges[num-1].node
- continue
- }
- if n.isLeaf() {
- return n.leaf.key, n.leaf.val, true
- } else {
- break
- }
- }
- return nil, nil, false
-}
-
-// Iterator is used to return an iterator at
-// the given node to walk the tree
-func (n *Node) Iterator() *Iterator {
- return &Iterator{node: n}
-}
-
-// rawIterator is used to return a raw iterator at the given node to walk the
-// tree.
-func (n *Node) rawIterator() *rawIterator {
- iter := &rawIterator{node: n}
- iter.Next()
- return iter
-}
-
-// Walk is used to walk the tree
-func (n *Node) Walk(fn WalkFn) {
- recursiveWalk(n, fn)
-}
-
-// WalkPrefix is used to walk the tree under a prefix
-func (n *Node) WalkPrefix(prefix []byte, fn WalkFn) {
- search := prefix
- for {
- // Check for key exhaution
- if len(search) == 0 {
- recursiveWalk(n, fn)
- return
- }
-
- // Look for an edge
- _, n = n.getEdge(search[0])
- if n == nil {
- break
- }
-
- // Consume the search prefix
- if bytes.HasPrefix(search, n.prefix) {
- search = search[len(n.prefix):]
-
- } else if bytes.HasPrefix(n.prefix, search) {
- // Child may be under our search prefix
- recursiveWalk(n, fn)
- return
- } else {
- break
- }
- }
-}
-
-// WalkPath is used to walk the tree, but only visiting nodes
-// from the root down to a given leaf. Where WalkPrefix walks
-// all the entries *under* the given prefix, this walks the
-// entries *above* the given prefix.
-func (n *Node) WalkPath(path []byte, fn WalkFn) {
- search := path
- for {
- // Visit the leaf values if any
- if n.leaf != nil && fn(n.leaf.key, n.leaf.val) {
- return
- }
-
- // Check for key exhaution
- if len(search) == 0 {
- return
- }
-
- // Look for an edge
- _, n = n.getEdge(search[0])
- if n == nil {
- return
- }
-
- // Consume the search prefix
- if bytes.HasPrefix(search, n.prefix) {
- search = search[len(n.prefix):]
- } else {
- break
- }
- }
-}
-
-// recursiveWalk is used to do a pre-order walk of a node
-// recursively. Returns true if the walk should be aborted
-func recursiveWalk(n *Node, fn WalkFn) bool {
- // Visit the leaf values if any
- if n.leaf != nil && fn(n.leaf.key, n.leaf.val) {
- return true
- }
-
- // Recurse on the children
- for _, e := range n.edges {
- if recursiveWalk(e.node, fn) {
- return true
- }
- }
- return false
-}
diff --git a/vendor/github.com/hashicorp/go-immutable-radix/raw_iter.go b/vendor/github.com/hashicorp/go-immutable-radix/raw_iter.go
deleted file mode 100644
index 04814c1323f..00000000000
--- a/vendor/github.com/hashicorp/go-immutable-radix/raw_iter.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package iradix
-
-// rawIterator visits each of the nodes in the tree, even the ones that are not
-// leaves. It keeps track of the effective path (what a leaf at a given node
-// would be called), which is useful for comparing trees.
-type rawIterator struct {
- // node is the starting node in the tree for the iterator.
- node *Node
-
- // stack keeps track of edges in the frontier.
- stack []rawStackEntry
-
- // pos is the current position of the iterator.
- pos *Node
-
- // path is the effective path of the current iterator position,
- // regardless of whether the current node is a leaf.
- path string
-}
-
-// rawStackEntry is used to keep track of the cumulative common path as well as
-// its associated edges in the frontier.
-type rawStackEntry struct {
- path string
- edges edges
-}
-
-// Front returns the current node that has been iterated to.
-func (i *rawIterator) Front() *Node {
- return i.pos
-}
-
-// Path returns the effective path of the current node, even if it's not actually
-// a leaf.
-func (i *rawIterator) Path() string {
- return i.path
-}
-
-// Next advances the iterator to the next node.
-func (i *rawIterator) Next() {
- // Initialize our stack if needed.
- if i.stack == nil && i.node != nil {
- i.stack = []rawStackEntry{
- rawStackEntry{
- edges: edges{
- edge{node: i.node},
- },
- },
- }
- }
-
- for len(i.stack) > 0 {
- // Inspect the last element of the stack.
- n := len(i.stack)
- last := i.stack[n-1]
- elem := last.edges[0].node
-
- // Update the stack.
- if len(last.edges) > 1 {
- i.stack[n-1].edges = last.edges[1:]
- } else {
- i.stack = i.stack[:n-1]
- }
-
- // Push the edges onto the frontier.
- if len(elem.edges) > 0 {
- path := last.path + string(elem.prefix)
- i.stack = append(i.stack, rawStackEntry{path, elem.edges})
- }
-
- i.pos = elem
- i.path = last.path + string(elem.prefix)
- return
- }
-
- i.pos = nil
- i.path = ""
-}
diff --git a/vendor/github.com/hashicorp/golang-lru/LICENSE b/vendor/github.com/hashicorp/golang-lru/LICENSE
deleted file mode 100644
index be2cc4dfb60..00000000000
--- a/vendor/github.com/hashicorp/golang-lru/LICENSE
+++ /dev/null
@@ -1,362 +0,0 @@
-Mozilla Public License, version 2.0
-
-1. Definitions
-
-1.1. "Contributor"
-
- means each individual or legal entity that creates, contributes to the
- creation of, or owns Covered Software.
-
-1.2. "Contributor Version"
-
- means the combination of the Contributions of others (if any) used by a
- Contributor and that particular Contributor's Contribution.
-
-1.3. "Contribution"
-
- means Covered Software of a particular Contributor.
-
-1.4. "Covered Software"
-
- means Source Code Form to which the initial Contributor has attached the
- notice in Exhibit A, the Executable Form of such Source Code Form, and
- Modifications of such Source Code Form, in each case including portions
- thereof.
-
-1.5. "Incompatible With Secondary Licenses"
- means
-
- a. that the initial Contributor has attached the notice described in
- Exhibit B to the Covered Software; or
-
- b. that the Covered Software was made available under the terms of
- version 1.1 or earlier of the License, but not also under the terms of
- a Secondary License.
-
-1.6. "Executable Form"
-
- means any form of the work other than Source Code Form.
-
-1.7. "Larger Work"
-
- means a work that combines Covered Software with other material, in a
- separate file or files, that is not Covered Software.
-
-1.8. "License"
-
- means this document.
-
-1.9. "Licensable"
-
- means having the right to grant, to the maximum extent possible, whether
- at the time of the initial grant or subsequently, any and all of the
- rights conveyed by this License.
-
-1.10. "Modifications"
-
- means any of the following:
-
- a. any file in Source Code Form that results from an addition to,
- deletion from, or modification of the contents of Covered Software; or
-
- b. any new file in Source Code Form that contains any Covered Software.
-
-1.11. "Patent Claims" of a Contributor
-
- means any patent claim(s), including without limitation, method,
- process, and apparatus claims, in any patent Licensable by such
- Contributor that would be infringed, but for the grant of the License,
- by the making, using, selling, offering for sale, having made, import,
- or transfer of either its Contributions or its Contributor Version.
-
-1.12. "Secondary License"
-
- means either the GNU General Public License, Version 2.0, the GNU Lesser
- General Public License, Version 2.1, the GNU Affero General Public
- License, Version 3.0, or any later versions of those licenses.
-
-1.13. "Source Code Form"
-
- means the form of the work preferred for making modifications.
-
-1.14. "You" (or "Your")
-
- means an individual or a legal entity exercising rights under this
- License. For legal entities, "You" includes any entity that controls, is
- controlled by, or is under common control with You. For purposes of this
- definition, "control" means (a) the power, direct or indirect, to cause
- the direction or management of such entity, whether by contract or
- otherwise, or (b) ownership of more than fifty percent (50%) of the
- outstanding shares or beneficial ownership of such entity.
-
-
-2. License Grants and Conditions
-
-2.1. Grants
-
- Each Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license:
-
- a. under intellectual property rights (other than patent or trademark)
- Licensable by such Contributor to use, reproduce, make available,
- modify, display, perform, distribute, and otherwise exploit its
- Contributions, either on an unmodified basis, with Modifications, or
- as part of a Larger Work; and
-
- b. under Patent Claims of such Contributor to make, use, sell, offer for
- sale, have made, import, and otherwise transfer either its
- Contributions or its Contributor Version.
-
-2.2. Effective Date
-
- The licenses granted in Section 2.1 with respect to any Contribution
- become effective for each Contribution on the date the Contributor first
- distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
- The licenses granted in this Section 2 are the only rights granted under
- this License. No additional rights or licenses will be implied from the
- distribution or licensing of Covered Software under this License.
- Notwithstanding Section 2.1(b) above, no patent license is granted by a
- Contributor:
-
- a. for any code that a Contributor has removed from Covered Software; or
-
- b. for infringements caused by: (i) Your and any other third party's
- modifications of Covered Software, or (ii) the combination of its
- Contributions with other software (except as part of its Contributor
- Version); or
-
- c. under Patent Claims infringed by Covered Software in the absence of
- its Contributions.
-
- This License does not grant any rights in the trademarks, service marks,
- or logos of any Contributor (except as may be necessary to comply with
- the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
- No Contributor makes additional grants as a result of Your choice to
- distribute the Covered Software under a subsequent version of this
- License (see Section 10.2) or under the terms of a Secondary License (if
- permitted under the terms of Section 3.3).
-
-2.5. Representation
-
- Each Contributor represents that the Contributor believes its
- Contributions are its original creation(s) or it has sufficient rights to
- grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
- This License is not intended to limit any rights You have under
- applicable copyright doctrines of fair use, fair dealing, or other
- equivalents.
-
-2.7. Conditions
-
- Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
- Section 2.1.
-
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
- All distribution of Covered Software in Source Code Form, including any
- Modifications that You create or to which You contribute, must be under
- the terms of this License. You must inform recipients that the Source
- Code Form of the Covered Software is governed by the terms of this
- License, and how they can obtain a copy of this License. You may not
- attempt to alter or restrict the recipients' rights in the Source Code
- Form.
-
-3.2. Distribution of Executable Form
-
- If You distribute Covered Software in Executable Form then:
-
- a. such Covered Software must also be made available in Source Code Form,
- as described in Section 3.1, and You must inform recipients of the
- Executable Form how they can obtain a copy of such Source Code Form by
- reasonable means in a timely manner, at a charge no more than the cost
- of distribution to the recipient; and
-
- b. You may distribute such Executable Form under the terms of this
- License, or sublicense it under different terms, provided that the
- license for the Executable Form does not attempt to limit or alter the
- recipients' rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
- You may create and distribute a Larger Work under terms of Your choice,
- provided that You also comply with the requirements of this License for
- the Covered Software. If the Larger Work is a combination of Covered
- Software with a work governed by one or more Secondary Licenses, and the
- Covered Software is not Incompatible With Secondary Licenses, this
- License permits You to additionally distribute such Covered Software
- under the terms of such Secondary License(s), so that the recipient of
- the Larger Work may, at their option, further distribute the Covered
- Software under the terms of either this License or such Secondary
- License(s).
-
-3.4. Notices
-
- You may not remove or alter the substance of any license notices
- (including copyright notices, patent notices, disclaimers of warranty, or
- limitations of liability) contained within the Source Code Form of the
- Covered Software, except that You may alter any license notices to the
- extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
- You may choose to offer, and to charge a fee for, warranty, support,
- indemnity or liability obligations to one or more recipients of Covered
- Software. However, You may do so only on Your own behalf, and not on
- behalf of any Contributor. You must make it absolutely clear that any
- such warranty, support, indemnity, or liability obligation is offered by
- You alone, and You hereby agree to indemnify every Contributor for any
- liability incurred by such Contributor as a result of warranty, support,
- indemnity or liability terms You offer. You may include additional
- disclaimers of warranty and limitations of liability specific to any
- jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
- If it is impossible for You to comply with any of the terms of this License
- with respect to some or all of the Covered Software due to statute,
- judicial order, or regulation then You must: (a) comply with the terms of
- this License to the maximum extent possible; and (b) describe the
- limitations and the code they affect. Such description must be placed in a
- text file included with all distributions of the Covered Software under
- this License. Except to the extent prohibited by statute or regulation,
- such description must be sufficiently detailed for a recipient of ordinary
- skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You
- fail to comply with any of its terms. However, if You become compliant,
- then the rights granted under this License from a particular Contributor
- are reinstated (a) provisionally, unless and until such Contributor
- explicitly and finally terminates Your grants, and (b) on an ongoing
- basis, if such Contributor fails to notify You of the non-compliance by
- some reasonable means prior to 60 days after You have come back into
- compliance. Moreover, Your grants from a particular Contributor are
- reinstated on an ongoing basis if such Contributor notifies You of the
- non-compliance by some reasonable means, this is the first time You have
- received notice of non-compliance with this License from such
- Contributor, and You become compliant prior to 30 days after Your receipt
- of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent
- infringement claim (excluding declaratory judgment actions,
- counter-claims, and cross-claims) alleging that a Contributor Version
- directly or indirectly infringes any patent, then the rights granted to
- You by any and all Contributors for the Covered Software under Section
- 2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
- license agreements (excluding distributors and resellers) which have been
- validly granted by You or Your distributors under this License prior to
- termination shall survive termination.
-
-6. Disclaimer of Warranty
-
- Covered Software is provided under this License on an "as is" basis,
- without warranty of any kind, either expressed, implied, or statutory,
- including, without limitation, warranties that the Covered Software is free
- of defects, merchantable, fit for a particular purpose or non-infringing.
- The entire risk as to the quality and performance of the Covered Software
- is with You. Should any Covered Software prove defective in any respect,
- You (not any Contributor) assume the cost of any necessary servicing,
- repair, or correction. This disclaimer of warranty constitutes an essential
- part of this License. No use of any Covered Software is authorized under
- this License except under this disclaimer.
-
-7. Limitation of Liability
-
- Under no circumstances and under no legal theory, whether tort (including
- negligence), contract, or otherwise, shall any Contributor, or anyone who
- distributes Covered Software as permitted above, be liable to You for any
- direct, indirect, special, incidental, or consequential damages of any
- character including, without limitation, damages for lost profits, loss of
- goodwill, work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses, even if such party shall have been
- informed of the possibility of such damages. This limitation of liability
- shall not apply to liability for death or personal injury resulting from
- such party's negligence to the extent applicable law prohibits such
- limitation. Some jurisdictions do not allow the exclusion or limitation of
- incidental or consequential damages, so this exclusion and limitation may
- not apply to You.
-
-8. Litigation
-
- Any litigation relating to this License may be brought only in the courts
- of a jurisdiction where the defendant maintains its principal place of
- business and such litigation shall be governed by laws of that
- jurisdiction, without reference to its conflict-of-law provisions. Nothing
- in this Section shall prevent a party's ability to bring cross-claims or
- counter-claims.
-
-9. Miscellaneous
-
- This License represents the complete agreement concerning the subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the extent
- necessary to make it enforceable. Any law or regulation which provides that
- the language of a contract shall be construed against the drafter shall not
- be used to construe this License against a Contributor.
-
-
-10. Versions of the License
-
-10.1. New Versions
-
- Mozilla Foundation is the license steward. Except as provided in Section
- 10.3, no one other than the license steward has the right to modify or
- publish new versions of this License. Each version will be given a
- distinguishing version number.
-
-10.2. Effect of New Versions
-
- You may distribute the Covered Software under the terms of the version
- of the License under which You originally received the Covered Software,
- or under the terms of any subsequent version published by the license
- steward.
-
-10.3. Modified Versions
-
- If you create software not governed by this License, and you want to
- create a new license for such software, you may create and use a
- modified version of this License if you rename the license and remove
- any references to the name of the license steward (except to note that
- such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary
- Licenses If You choose to distribute Source Code Form that is
- Incompatible With Secondary Licenses under the terms of this version of
- the License, the notice described in Exhibit B of this License must be
- attached.
-
-Exhibit A - Source Code Form License Notice
-
- This Source Code Form is subject to the
- terms of the Mozilla Public License, v.
- 2.0. If a copy of the MPL was not
- distributed with this file, You can
- obtain one at
- http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file,
-then You may include the notice in a location (such as a LICENSE file in a
-relevant directory) where a recipient would be likely to look for such a
-notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - "Incompatible With Secondary Licenses" Notice
-
- This Source Code Form is "Incompatible
- With Secondary Licenses", as defined by
- the Mozilla Public License, v. 2.0.
diff --git a/vendor/github.com/hashicorp/golang-lru/simplelru/lru.go b/vendor/github.com/hashicorp/golang-lru/simplelru/lru.go
deleted file mode 100644
index 5673773b22b..00000000000
--- a/vendor/github.com/hashicorp/golang-lru/simplelru/lru.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package simplelru
-
-import (
- "container/list"
- "errors"
-)
-
-// EvictCallback is used to get a callback when a cache entry is evicted
-type EvictCallback func(key interface{}, value interface{})
-
-// LRU implements a non-thread safe fixed size LRU cache
-type LRU struct {
- size int
- evictList *list.List
- items map[interface{}]*list.Element
- onEvict EvictCallback
-}
-
-// entry is used to hold a value in the evictList
-type entry struct {
- key interface{}
- value interface{}
-}
-
-// NewLRU constructs an LRU of the given size
-func NewLRU(size int, onEvict EvictCallback) (*LRU, error) {
- if size <= 0 {
- return nil, errors.New("Must provide a positive size")
- }
- c := &LRU{
- size: size,
- evictList: list.New(),
- items: make(map[interface{}]*list.Element),
- onEvict: onEvict,
- }
- return c, nil
-}
-
-// Purge is used to completely clear the cache.
-func (c *LRU) Purge() {
- for k, v := range c.items {
- if c.onEvict != nil {
- c.onEvict(k, v.Value.(*entry).value)
- }
- delete(c.items, k)
- }
- c.evictList.Init()
-}
-
-// Add adds a value to the cache. Returns true if an eviction occurred.
-func (c *LRU) Add(key, value interface{}) (evicted bool) {
- // Check for existing item
- if ent, ok := c.items[key]; ok {
- c.evictList.MoveToFront(ent)
- ent.Value.(*entry).value = value
- return false
- }
-
- // Add new item
- ent := &entry{key, value}
- entry := c.evictList.PushFront(ent)
- c.items[key] = entry
-
- evict := c.evictList.Len() > c.size
- // Verify size not exceeded
- if evict {
- c.removeOldest()
- }
- return evict
-}
-
-// Get looks up a key's value from the cache.
-func (c *LRU) Get(key interface{}) (value interface{}, ok bool) {
- if ent, ok := c.items[key]; ok {
- c.evictList.MoveToFront(ent)
- return ent.Value.(*entry).value, true
- }
- return
-}
-
-// Contains checks if a key is in the cache, without updating the recent-ness
-// or deleting it for being stale.
-func (c *LRU) Contains(key interface{}) (ok bool) {
- _, ok = c.items[key]
- return ok
-}
-
-// Peek returns the key value (or undefined if not found) without updating
-// the "recently used"-ness of the key.
-func (c *LRU) Peek(key interface{}) (value interface{}, ok bool) {
- var ent *list.Element
- if ent, ok = c.items[key]; ok {
- return ent.Value.(*entry).value, true
- }
- return nil, ok
-}
-
-// Remove removes the provided key from the cache, returning if the
-// key was contained.
-func (c *LRU) Remove(key interface{}) (present bool) {
- if ent, ok := c.items[key]; ok {
- c.removeElement(ent)
- return true
- }
- return false
-}
-
-// RemoveOldest removes the oldest item from the cache.
-func (c *LRU) RemoveOldest() (key interface{}, value interface{}, ok bool) {
- ent := c.evictList.Back()
- if ent != nil {
- c.removeElement(ent)
- kv := ent.Value.(*entry)
- return kv.key, kv.value, true
- }
- return nil, nil, false
-}
-
-// GetOldest returns the oldest entry
-func (c *LRU) GetOldest() (key interface{}, value interface{}, ok bool) {
- ent := c.evictList.Back()
- if ent != nil {
- kv := ent.Value.(*entry)
- return kv.key, kv.value, true
- }
- return nil, nil, false
-}
-
-// Keys returns a slice of the keys in the cache, from oldest to newest.
-func (c *LRU) Keys() []interface{} {
- keys := make([]interface{}, len(c.items))
- i := 0
- for ent := c.evictList.Back(); ent != nil; ent = ent.Prev() {
- keys[i] = ent.Value.(*entry).key
- i++
- }
- return keys
-}
-
-// Len returns the number of items in the cache.
-func (c *LRU) Len() int {
- return c.evictList.Len()
-}
-
-// removeOldest removes the oldest item from the cache.
-func (c *LRU) removeOldest() {
- ent := c.evictList.Back()
- if ent != nil {
- c.removeElement(ent)
- }
-}
-
-// removeElement is used to remove a given list element from the cache
-func (c *LRU) removeElement(e *list.Element) {
- c.evictList.Remove(e)
- kv := e.Value.(*entry)
- delete(c.items, kv.key)
- if c.onEvict != nil {
- c.onEvict(kv.key, kv.value)
- }
-}
diff --git a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go b/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go
deleted file mode 100644
index 744cac01c63..00000000000
--- a/vendor/github.com/hashicorp/golang-lru/simplelru/lru_interface.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package simplelru
-
-
-// LRUCache is the interface for simple LRU cache.
-type LRUCache interface {
- // Adds a value to the cache, returns true if an eviction occurred and
- // updates the "recently used"-ness of the key.
- Add(key, value interface{}) bool
-
- // Returns key's value from the cache and
- // updates the "recently used"-ness of the key. #value, isFound
- Get(key interface{}) (value interface{}, ok bool)
-
- // Check if a key exsists in cache without updating the recent-ness.
- Contains(key interface{}) (ok bool)
-
- // Returns key's value without updating the "recently used"-ness of the key.
- Peek(key interface{}) (value interface{}, ok bool)
-
- // Removes a key from the cache.
- Remove(key interface{}) bool
-
- // Removes the oldest entry from cache.
- RemoveOldest() (interface{}, interface{}, bool)
-
- // Returns the oldest entry from the cache. #key, value, isFound
- GetOldest() (interface{}, interface{}, bool)
-
- // Returns a slice of the keys in the cache, from oldest to newest.
- Keys() []interface{}
-
- // Returns the number of items in the cache.
- Len() int
-
- // Clear all cache entries
- Purge()
-}
diff --git a/vendor/golang.org/x/net/websocket/client.go b/vendor/golang.org/x/net/websocket/client.go
deleted file mode 100644
index 69a4ac7eefe..00000000000
--- a/vendor/golang.org/x/net/websocket/client.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "bufio"
- "io"
- "net"
- "net/http"
- "net/url"
-)
-
-// DialError is an error that occurs while dialling a websocket server.
-type DialError struct {
- *Config
- Err error
-}
-
-func (e *DialError) Error() string {
- return "websocket.Dial " + e.Config.Location.String() + ": " + e.Err.Error()
-}
-
-// NewConfig creates a new WebSocket config for client connection.
-func NewConfig(server, origin string) (config *Config, err error) {
- config = new(Config)
- config.Version = ProtocolVersionHybi13
- config.Location, err = url.ParseRequestURI(server)
- if err != nil {
- return
- }
- config.Origin, err = url.ParseRequestURI(origin)
- if err != nil {
- return
- }
- config.Header = http.Header(make(map[string][]string))
- return
-}
-
-// NewClient creates a new WebSocket client connection over rwc.
-func NewClient(config *Config, rwc io.ReadWriteCloser) (ws *Conn, err error) {
- br := bufio.NewReader(rwc)
- bw := bufio.NewWriter(rwc)
- err = hybiClientHandshake(config, br, bw)
- if err != nil {
- return
- }
- buf := bufio.NewReadWriter(br, bw)
- ws = newHybiClientConn(config, buf, rwc)
- return
-}
-
-// Dial opens a new client connection to a WebSocket.
-func Dial(url_, protocol, origin string) (ws *Conn, err error) {
- config, err := NewConfig(url_, origin)
- if err != nil {
- return nil, err
- }
- if protocol != "" {
- config.Protocol = []string{protocol}
- }
- return DialConfig(config)
-}
-
-var portMap = map[string]string{
- "ws": "80",
- "wss": "443",
-}
-
-func parseAuthority(location *url.URL) string {
- if _, ok := portMap[location.Scheme]; ok {
- if _, _, err := net.SplitHostPort(location.Host); err != nil {
- return net.JoinHostPort(location.Host, portMap[location.Scheme])
- }
- }
- return location.Host
-}
-
-// DialConfig opens a new client connection to a WebSocket with a config.
-func DialConfig(config *Config) (ws *Conn, err error) {
- var client net.Conn
- if config.Location == nil {
- return nil, &DialError{config, ErrBadWebSocketLocation}
- }
- if config.Origin == nil {
- return nil, &DialError{config, ErrBadWebSocketOrigin}
- }
- dialer := config.Dialer
- if dialer == nil {
- dialer = &net.Dialer{}
- }
- client, err = dialWithDialer(dialer, config)
- if err != nil {
- goto Error
- }
- ws, err = NewClient(config, client)
- if err != nil {
- client.Close()
- goto Error
- }
- return
-
-Error:
- return nil, &DialError{config, err}
-}
diff --git a/vendor/golang.org/x/net/websocket/dial.go b/vendor/golang.org/x/net/websocket/dial.go
deleted file mode 100644
index 2dab943a489..00000000000
--- a/vendor/golang.org/x/net/websocket/dial.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "crypto/tls"
- "net"
-)
-
-func dialWithDialer(dialer *net.Dialer, config *Config) (conn net.Conn, err error) {
- switch config.Location.Scheme {
- case "ws":
- conn, err = dialer.Dial("tcp", parseAuthority(config.Location))
-
- case "wss":
- conn, err = tls.DialWithDialer(dialer, "tcp", parseAuthority(config.Location), config.TlsConfig)
-
- default:
- err = ErrBadScheme
- }
- return
-}
diff --git a/vendor/golang.org/x/net/websocket/hybi.go b/vendor/golang.org/x/net/websocket/hybi.go
deleted file mode 100644
index 8cffdd16c91..00000000000
--- a/vendor/golang.org/x/net/websocket/hybi.go
+++ /dev/null
@@ -1,583 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-// This file implements a protocol of hybi draft.
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
-
-import (
- "bufio"
- "bytes"
- "crypto/rand"
- "crypto/sha1"
- "encoding/base64"
- "encoding/binary"
- "fmt"
- "io"
- "io/ioutil"
- "net/http"
- "net/url"
- "strings"
-)
-
-const (
- websocketGUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
- closeStatusNormal = 1000
- closeStatusGoingAway = 1001
- closeStatusProtocolError = 1002
- closeStatusUnsupportedData = 1003
- closeStatusFrameTooLarge = 1004
- closeStatusNoStatusRcvd = 1005
- closeStatusAbnormalClosure = 1006
- closeStatusBadMessageData = 1007
- closeStatusPolicyViolation = 1008
- closeStatusTooBigData = 1009
- closeStatusExtensionMismatch = 1010
-
- maxControlFramePayloadLength = 125
-)
-
-var (
- ErrBadMaskingKey = &ProtocolError{"bad masking key"}
- ErrBadPongMessage = &ProtocolError{"bad pong message"}
- ErrBadClosingStatus = &ProtocolError{"bad closing status"}
- ErrUnsupportedExtensions = &ProtocolError{"unsupported extensions"}
- ErrNotImplemented = &ProtocolError{"not implemented"}
-
- handshakeHeader = map[string]bool{
- "Host": true,
- "Upgrade": true,
- "Connection": true,
- "Sec-Websocket-Key": true,
- "Sec-Websocket-Origin": true,
- "Sec-Websocket-Version": true,
- "Sec-Websocket-Protocol": true,
- "Sec-Websocket-Accept": true,
- }
-)
-
-// A hybiFrameHeader is a frame header as defined in hybi draft.
-type hybiFrameHeader struct {
- Fin bool
- Rsv [3]bool
- OpCode byte
- Length int64
- MaskingKey []byte
-
- data *bytes.Buffer
-}
-
-// A hybiFrameReader is a reader for hybi frame.
-type hybiFrameReader struct {
- reader io.Reader
-
- header hybiFrameHeader
- pos int64
- length int
-}
-
-func (frame *hybiFrameReader) Read(msg []byte) (n int, err error) {
- n, err = frame.reader.Read(msg)
- if frame.header.MaskingKey != nil {
- for i := 0; i < n; i++ {
- msg[i] = msg[i] ^ frame.header.MaskingKey[frame.pos%4]
- frame.pos++
- }
- }
- return n, err
-}
-
-func (frame *hybiFrameReader) PayloadType() byte { return frame.header.OpCode }
-
-func (frame *hybiFrameReader) HeaderReader() io.Reader {
- if frame.header.data == nil {
- return nil
- }
- if frame.header.data.Len() == 0 {
- return nil
- }
- return frame.header.data
-}
-
-func (frame *hybiFrameReader) TrailerReader() io.Reader { return nil }
-
-func (frame *hybiFrameReader) Len() (n int) { return frame.length }
-
-// A hybiFrameReaderFactory creates new frame reader based on its frame type.
-type hybiFrameReaderFactory struct {
- *bufio.Reader
-}
-
-// NewFrameReader reads a frame header from the connection, and creates new reader for the frame.
-// See Section 5.2 Base Framing protocol for detail.
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17#section-5.2
-func (buf hybiFrameReaderFactory) NewFrameReader() (frame frameReader, err error) {
- hybiFrame := new(hybiFrameReader)
- frame = hybiFrame
- var header []byte
- var b byte
- // First byte. FIN/RSV1/RSV2/RSV3/OpCode(4bits)
- b, err = buf.ReadByte()
- if err != nil {
- return
- }
- header = append(header, b)
- hybiFrame.header.Fin = ((header[0] >> 7) & 1) != 0
- for i := 0; i < 3; i++ {
- j := uint(6 - i)
- hybiFrame.header.Rsv[i] = ((header[0] >> j) & 1) != 0
- }
- hybiFrame.header.OpCode = header[0] & 0x0f
-
- // Second byte. Mask/Payload len(7bits)
- b, err = buf.ReadByte()
- if err != nil {
- return
- }
- header = append(header, b)
- mask := (b & 0x80) != 0
- b &= 0x7f
- lengthFields := 0
- switch {
- case b <= 125: // Payload length 7bits.
- hybiFrame.header.Length = int64(b)
- case b == 126: // Payload length 7+16bits
- lengthFields = 2
- case b == 127: // Payload length 7+64bits
- lengthFields = 8
- }
- for i := 0; i < lengthFields; i++ {
- b, err = buf.ReadByte()
- if err != nil {
- return
- }
- if lengthFields == 8 && i == 0 { // MSB must be zero when 7+64 bits
- b &= 0x7f
- }
- header = append(header, b)
- hybiFrame.header.Length = hybiFrame.header.Length*256 + int64(b)
- }
- if mask {
- // Masking key. 4 bytes.
- for i := 0; i < 4; i++ {
- b, err = buf.ReadByte()
- if err != nil {
- return
- }
- header = append(header, b)
- hybiFrame.header.MaskingKey = append(hybiFrame.header.MaskingKey, b)
- }
- }
- hybiFrame.reader = io.LimitReader(buf.Reader, hybiFrame.header.Length)
- hybiFrame.header.data = bytes.NewBuffer(header)
- hybiFrame.length = len(header) + int(hybiFrame.header.Length)
- return
-}
-
-// A HybiFrameWriter is a writer for hybi frame.
-type hybiFrameWriter struct {
- writer *bufio.Writer
-
- header *hybiFrameHeader
-}
-
-func (frame *hybiFrameWriter) Write(msg []byte) (n int, err error) {
- var header []byte
- var b byte
- if frame.header.Fin {
- b |= 0x80
- }
- for i := 0; i < 3; i++ {
- if frame.header.Rsv[i] {
- j := uint(6 - i)
- b |= 1 << j
- }
- }
- b |= frame.header.OpCode
- header = append(header, b)
- if frame.header.MaskingKey != nil {
- b = 0x80
- } else {
- b = 0
- }
- lengthFields := 0
- length := len(msg)
- switch {
- case length <= 125:
- b |= byte(length)
- case length < 65536:
- b |= 126
- lengthFields = 2
- default:
- b |= 127
- lengthFields = 8
- }
- header = append(header, b)
- for i := 0; i < lengthFields; i++ {
- j := uint((lengthFields - i - 1) * 8)
- b = byte((length >> j) & 0xff)
- header = append(header, b)
- }
- if frame.header.MaskingKey != nil {
- if len(frame.header.MaskingKey) != 4 {
- return 0, ErrBadMaskingKey
- }
- header = append(header, frame.header.MaskingKey...)
- frame.writer.Write(header)
- data := make([]byte, length)
- for i := range data {
- data[i] = msg[i] ^ frame.header.MaskingKey[i%4]
- }
- frame.writer.Write(data)
- err = frame.writer.Flush()
- return length, err
- }
- frame.writer.Write(header)
- frame.writer.Write(msg)
- err = frame.writer.Flush()
- return length, err
-}
-
-func (frame *hybiFrameWriter) Close() error { return nil }
-
-type hybiFrameWriterFactory struct {
- *bufio.Writer
- needMaskingKey bool
-}
-
-func (buf hybiFrameWriterFactory) NewFrameWriter(payloadType byte) (frame frameWriter, err error) {
- frameHeader := &hybiFrameHeader{Fin: true, OpCode: payloadType}
- if buf.needMaskingKey {
- frameHeader.MaskingKey, err = generateMaskingKey()
- if err != nil {
- return nil, err
- }
- }
- return &hybiFrameWriter{writer: buf.Writer, header: frameHeader}, nil
-}
-
-type hybiFrameHandler struct {
- conn *Conn
- payloadType byte
-}
-
-func (handler *hybiFrameHandler) HandleFrame(frame frameReader) (frameReader, error) {
- if handler.conn.IsServerConn() {
- // The client MUST mask all frames sent to the server.
- if frame.(*hybiFrameReader).header.MaskingKey == nil {
- handler.WriteClose(closeStatusProtocolError)
- return nil, io.EOF
- }
- } else {
- // The server MUST NOT mask all frames.
- if frame.(*hybiFrameReader).header.MaskingKey != nil {
- handler.WriteClose(closeStatusProtocolError)
- return nil, io.EOF
- }
- }
- if header := frame.HeaderReader(); header != nil {
- io.Copy(ioutil.Discard, header)
- }
- switch frame.PayloadType() {
- case ContinuationFrame:
- frame.(*hybiFrameReader).header.OpCode = handler.payloadType
- case TextFrame, BinaryFrame:
- handler.payloadType = frame.PayloadType()
- case CloseFrame:
- return nil, io.EOF
- case PingFrame, PongFrame:
- b := make([]byte, maxControlFramePayloadLength)
- n, err := io.ReadFull(frame, b)
- if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
- return nil, err
- }
- io.Copy(ioutil.Discard, frame)
- if frame.PayloadType() == PingFrame {
- if _, err := handler.WritePong(b[:n]); err != nil {
- return nil, err
- }
- }
- return nil, nil
- }
- return frame, nil
-}
-
-func (handler *hybiFrameHandler) WriteClose(status int) (err error) {
- handler.conn.wio.Lock()
- defer handler.conn.wio.Unlock()
- w, err := handler.conn.frameWriterFactory.NewFrameWriter(CloseFrame)
- if err != nil {
- return err
- }
- msg := make([]byte, 2)
- binary.BigEndian.PutUint16(msg, uint16(status))
- _, err = w.Write(msg)
- w.Close()
- return err
-}
-
-func (handler *hybiFrameHandler) WritePong(msg []byte) (n int, err error) {
- handler.conn.wio.Lock()
- defer handler.conn.wio.Unlock()
- w, err := handler.conn.frameWriterFactory.NewFrameWriter(PongFrame)
- if err != nil {
- return 0, err
- }
- n, err = w.Write(msg)
- w.Close()
- return n, err
-}
-
-// newHybiConn creates a new WebSocket connection speaking hybi draft protocol.
-func newHybiConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
- if buf == nil {
- br := bufio.NewReader(rwc)
- bw := bufio.NewWriter(rwc)
- buf = bufio.NewReadWriter(br, bw)
- }
- ws := &Conn{config: config, request: request, buf: buf, rwc: rwc,
- frameReaderFactory: hybiFrameReaderFactory{buf.Reader},
- frameWriterFactory: hybiFrameWriterFactory{
- buf.Writer, request == nil},
- PayloadType: TextFrame,
- defaultCloseStatus: closeStatusNormal}
- ws.frameHandler = &hybiFrameHandler{conn: ws}
- return ws
-}
-
-// generateMaskingKey generates a masking key for a frame.
-func generateMaskingKey() (maskingKey []byte, err error) {
- maskingKey = make([]byte, 4)
- if _, err = io.ReadFull(rand.Reader, maskingKey); err != nil {
- return
- }
- return
-}
-
-// generateNonce generates a nonce consisting of a randomly selected 16-byte
-// value that has been base64-encoded.
-func generateNonce() (nonce []byte) {
- key := make([]byte, 16)
- if _, err := io.ReadFull(rand.Reader, key); err != nil {
- panic(err)
- }
- nonce = make([]byte, 24)
- base64.StdEncoding.Encode(nonce, key)
- return
-}
-
-// removeZone removes IPv6 zone identifer from host.
-// E.g., "[fe80::1%en0]:8080" to "[fe80::1]:8080"
-func removeZone(host string) string {
- if !strings.HasPrefix(host, "[") {
- return host
- }
- i := strings.LastIndex(host, "]")
- if i < 0 {
- return host
- }
- j := strings.LastIndex(host[:i], "%")
- if j < 0 {
- return host
- }
- return host[:j] + host[i:]
-}
-
-// getNonceAccept computes the base64-encoded SHA-1 of the concatenation of
-// the nonce ("Sec-WebSocket-Key" value) with the websocket GUID string.
-func getNonceAccept(nonce []byte) (expected []byte, err error) {
- h := sha1.New()
- if _, err = h.Write(nonce); err != nil {
- return
- }
- if _, err = h.Write([]byte(websocketGUID)); err != nil {
- return
- }
- expected = make([]byte, 28)
- base64.StdEncoding.Encode(expected, h.Sum(nil))
- return
-}
-
-// Client handshake described in draft-ietf-hybi-thewebsocket-protocol-17
-func hybiClientHandshake(config *Config, br *bufio.Reader, bw *bufio.Writer) (err error) {
- bw.WriteString("GET " + config.Location.RequestURI() + " HTTP/1.1\r\n")
-
- // According to RFC 6874, an HTTP client, proxy, or other
- // intermediary must remove any IPv6 zone identifier attached
- // to an outgoing URI.
- bw.WriteString("Host: " + removeZone(config.Location.Host) + "\r\n")
- bw.WriteString("Upgrade: websocket\r\n")
- bw.WriteString("Connection: Upgrade\r\n")
- nonce := generateNonce()
- if config.handshakeData != nil {
- nonce = []byte(config.handshakeData["key"])
- }
- bw.WriteString("Sec-WebSocket-Key: " + string(nonce) + "\r\n")
- bw.WriteString("Origin: " + strings.ToLower(config.Origin.String()) + "\r\n")
-
- if config.Version != ProtocolVersionHybi13 {
- return ErrBadProtocolVersion
- }
-
- bw.WriteString("Sec-WebSocket-Version: " + fmt.Sprintf("%d", config.Version) + "\r\n")
- if len(config.Protocol) > 0 {
- bw.WriteString("Sec-WebSocket-Protocol: " + strings.Join(config.Protocol, ", ") + "\r\n")
- }
- // TODO(ukai): send Sec-WebSocket-Extensions.
- err = config.Header.WriteSubset(bw, handshakeHeader)
- if err != nil {
- return err
- }
-
- bw.WriteString("\r\n")
- if err = bw.Flush(); err != nil {
- return err
- }
-
- resp, err := http.ReadResponse(br, &http.Request{Method: "GET"})
- if err != nil {
- return err
- }
- if resp.StatusCode != 101 {
- return ErrBadStatus
- }
- if strings.ToLower(resp.Header.Get("Upgrade")) != "websocket" ||
- strings.ToLower(resp.Header.Get("Connection")) != "upgrade" {
- return ErrBadUpgrade
- }
- expectedAccept, err := getNonceAccept(nonce)
- if err != nil {
- return err
- }
- if resp.Header.Get("Sec-WebSocket-Accept") != string(expectedAccept) {
- return ErrChallengeResponse
- }
- if resp.Header.Get("Sec-WebSocket-Extensions") != "" {
- return ErrUnsupportedExtensions
- }
- offeredProtocol := resp.Header.Get("Sec-WebSocket-Protocol")
- if offeredProtocol != "" {
- protocolMatched := false
- for i := 0; i < len(config.Protocol); i++ {
- if config.Protocol[i] == offeredProtocol {
- protocolMatched = true
- break
- }
- }
- if !protocolMatched {
- return ErrBadWebSocketProtocol
- }
- config.Protocol = []string{offeredProtocol}
- }
-
- return nil
-}
-
-// newHybiClientConn creates a client WebSocket connection after handshake.
-func newHybiClientConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser) *Conn {
- return newHybiConn(config, buf, rwc, nil)
-}
-
-// A HybiServerHandshaker performs a server handshake using hybi draft protocol.
-type hybiServerHandshaker struct {
- *Config
- accept []byte
-}
-
-func (c *hybiServerHandshaker) ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error) {
- c.Version = ProtocolVersionHybi13
- if req.Method != "GET" {
- return http.StatusMethodNotAllowed, ErrBadRequestMethod
- }
- // HTTP version can be safely ignored.
-
- if strings.ToLower(req.Header.Get("Upgrade")) != "websocket" ||
- !strings.Contains(strings.ToLower(req.Header.Get("Connection")), "upgrade") {
- return http.StatusBadRequest, ErrNotWebSocket
- }
-
- key := req.Header.Get("Sec-Websocket-Key")
- if key == "" {
- return http.StatusBadRequest, ErrChallengeResponse
- }
- version := req.Header.Get("Sec-Websocket-Version")
- switch version {
- case "13":
- c.Version = ProtocolVersionHybi13
- default:
- return http.StatusBadRequest, ErrBadWebSocketVersion
- }
- var scheme string
- if req.TLS != nil {
- scheme = "wss"
- } else {
- scheme = "ws"
- }
- c.Location, err = url.ParseRequestURI(scheme + "://" + req.Host + req.URL.RequestURI())
- if err != nil {
- return http.StatusBadRequest, err
- }
- protocol := strings.TrimSpace(req.Header.Get("Sec-Websocket-Protocol"))
- if protocol != "" {
- protocols := strings.Split(protocol, ",")
- for i := 0; i < len(protocols); i++ {
- c.Protocol = append(c.Protocol, strings.TrimSpace(protocols[i]))
- }
- }
- c.accept, err = getNonceAccept([]byte(key))
- if err != nil {
- return http.StatusInternalServerError, err
- }
- return http.StatusSwitchingProtocols, nil
-}
-
-// Origin parses the Origin header in req.
-// If the Origin header is not set, it returns nil and nil.
-func Origin(config *Config, req *http.Request) (*url.URL, error) {
- var origin string
- switch config.Version {
- case ProtocolVersionHybi13:
- origin = req.Header.Get("Origin")
- }
- if origin == "" {
- return nil, nil
- }
- return url.ParseRequestURI(origin)
-}
-
-func (c *hybiServerHandshaker) AcceptHandshake(buf *bufio.Writer) (err error) {
- if len(c.Protocol) > 0 {
- if len(c.Protocol) != 1 {
- // You need choose a Protocol in Handshake func in Server.
- return ErrBadWebSocketProtocol
- }
- }
- buf.WriteString("HTTP/1.1 101 Switching Protocols\r\n")
- buf.WriteString("Upgrade: websocket\r\n")
- buf.WriteString("Connection: Upgrade\r\n")
- buf.WriteString("Sec-WebSocket-Accept: " + string(c.accept) + "\r\n")
- if len(c.Protocol) > 0 {
- buf.WriteString("Sec-WebSocket-Protocol: " + c.Protocol[0] + "\r\n")
- }
- // TODO(ukai): send Sec-WebSocket-Extensions.
- if c.Header != nil {
- err := c.Header.WriteSubset(buf, handshakeHeader)
- if err != nil {
- return err
- }
- }
- buf.WriteString("\r\n")
- return buf.Flush()
-}
-
-func (c *hybiServerHandshaker) NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
- return newHybiServerConn(c.Config, buf, rwc, request)
-}
-
-// newHybiServerConn returns a new WebSocket connection speaking hybi draft protocol.
-func newHybiServerConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
- return newHybiConn(config, buf, rwc, request)
-}
diff --git a/vendor/golang.org/x/net/websocket/server.go b/vendor/golang.org/x/net/websocket/server.go
deleted file mode 100644
index 0895dea1905..00000000000
--- a/vendor/golang.org/x/net/websocket/server.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
- "bufio"
- "fmt"
- "io"
- "net/http"
-)
-
-func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request, config *Config, handshake func(*Config, *http.Request) error) (conn *Conn, err error) {
- var hs serverHandshaker = &hybiServerHandshaker{Config: config}
- code, err := hs.ReadHandshake(buf.Reader, req)
- if err == ErrBadWebSocketVersion {
- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
- fmt.Fprintf(buf, "Sec-WebSocket-Version: %s\r\n", SupportedProtocolVersion)
- buf.WriteString("\r\n")
- buf.WriteString(err.Error())
- buf.Flush()
- return
- }
- if err != nil {
- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
- buf.WriteString("\r\n")
- buf.WriteString(err.Error())
- buf.Flush()
- return
- }
- if handshake != nil {
- err = handshake(config, req)
- if err != nil {
- code = http.StatusForbidden
- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
- buf.WriteString("\r\n")
- buf.Flush()
- return
- }
- }
- err = hs.AcceptHandshake(buf.Writer)
- if err != nil {
- code = http.StatusBadRequest
- fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
- buf.WriteString("\r\n")
- buf.Flush()
- return
- }
- conn = hs.NewServerConn(buf, rwc, req)
- return
-}
-
-// Server represents a server of a WebSocket.
-type Server struct {
- // Config is a WebSocket configuration for new WebSocket connection.
- Config
-
- // Handshake is an optional function in WebSocket handshake.
- // For example, you can check, or don't check Origin header.
- // Another example, you can select config.Protocol.
- Handshake func(*Config, *http.Request) error
-
- // Handler handles a WebSocket connection.
- Handler
-}
-
-// ServeHTTP implements the http.Handler interface for a WebSocket
-func (s Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
- s.serveWebSocket(w, req)
-}
-
-func (s Server) serveWebSocket(w http.ResponseWriter, req *http.Request) {
- rwc, buf, err := w.(http.Hijacker).Hijack()
- if err != nil {
- panic("Hijack failed: " + err.Error())
- }
- // The server should abort the WebSocket connection if it finds
- // the client did not send a handshake that matches with protocol
- // specification.
- defer rwc.Close()
- conn, err := newServerConn(rwc, buf, req, &s.Config, s.Handshake)
- if err != nil {
- return
- }
- if conn == nil {
- panic("unexpected nil conn")
- }
- s.Handler(conn)
-}
-
-// Handler is a simple interface to a WebSocket browser client.
-// It checks if Origin header is valid URL by default.
-// You might want to verify websocket.Conn.Config().Origin in the func.
-// If you use Server instead of Handler, you could call websocket.Origin and
-// check the origin in your Handshake func. So, if you want to accept
-// non-browser clients, which do not send an Origin header, set a
-// Server.Handshake that does not check the origin.
-type Handler func(*Conn)
-
-func checkOrigin(config *Config, req *http.Request) (err error) {
- config.Origin, err = Origin(config, req)
- if err == nil && config.Origin == nil {
- return fmt.Errorf("null origin")
- }
- return err
-}
-
-// ServeHTTP implements the http.Handler interface for a WebSocket
-func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
- s := Server{Handler: h, Handshake: checkOrigin}
- s.serveWebSocket(w, req)
-}
diff --git a/vendor/golang.org/x/net/websocket/websocket.go b/vendor/golang.org/x/net/websocket/websocket.go
deleted file mode 100644
index e242c89a7a1..00000000000
--- a/vendor/golang.org/x/net/websocket/websocket.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package websocket implements a client and server for the WebSocket protocol
-// as specified in RFC 6455.
-//
-// This package currently lacks some features found in an alternative
-// and more actively maintained WebSocket package:
-//
-// https://godoc.org/github.com/gorilla/websocket
-//
-package websocket // import "golang.org/x/net/websocket"
-
-import (
- "bufio"
- "crypto/tls"
- "encoding/json"
- "errors"
- "io"
- "io/ioutil"
- "net"
- "net/http"
- "net/url"
- "sync"
- "time"
-)
-
-const (
- ProtocolVersionHybi13 = 13
- ProtocolVersionHybi = ProtocolVersionHybi13
- SupportedProtocolVersion = "13"
-
- ContinuationFrame = 0
- TextFrame = 1
- BinaryFrame = 2
- CloseFrame = 8
- PingFrame = 9
- PongFrame = 10
- UnknownFrame = 255
-
- DefaultMaxPayloadBytes = 32 << 20 // 32MB
-)
-
-// ProtocolError represents WebSocket protocol errors.
-type ProtocolError struct {
- ErrorString string
-}
-
-func (err *ProtocolError) Error() string { return err.ErrorString }
-
-var (
- ErrBadProtocolVersion = &ProtocolError{"bad protocol version"}
- ErrBadScheme = &ProtocolError{"bad scheme"}
- ErrBadStatus = &ProtocolError{"bad status"}
- ErrBadUpgrade = &ProtocolError{"missing or bad upgrade"}
- ErrBadWebSocketOrigin = &ProtocolError{"missing or bad WebSocket-Origin"}
- ErrBadWebSocketLocation = &ProtocolError{"missing or bad WebSocket-Location"}
- ErrBadWebSocketProtocol = &ProtocolError{"missing or bad WebSocket-Protocol"}
- ErrBadWebSocketVersion = &ProtocolError{"missing or bad WebSocket Version"}
- ErrChallengeResponse = &ProtocolError{"mismatch challenge/response"}
- ErrBadFrame = &ProtocolError{"bad frame"}
- ErrBadFrameBoundary = &ProtocolError{"not on frame boundary"}
- ErrNotWebSocket = &ProtocolError{"not websocket protocol"}
- ErrBadRequestMethod = &ProtocolError{"bad method"}
- ErrNotSupported = &ProtocolError{"not supported"}
-)
-
-// ErrFrameTooLarge is returned by Codec's Receive method if payload size
-// exceeds limit set by Conn.MaxPayloadBytes
-var ErrFrameTooLarge = errors.New("websocket: frame payload size exceeds limit")
-
-// Addr is an implementation of net.Addr for WebSocket.
-type Addr struct {
- *url.URL
-}
-
-// Network returns the network type for a WebSocket, "websocket".
-func (addr *Addr) Network() string { return "websocket" }
-
-// Config is a WebSocket configuration
-type Config struct {
- // A WebSocket server address.
- Location *url.URL
-
- // A Websocket client origin.
- Origin *url.URL
-
- // WebSocket subprotocols.
- Protocol []string
-
- // WebSocket protocol version.
- Version int
-
- // TLS config for secure WebSocket (wss).
- TlsConfig *tls.Config
-
- // Additional header fields to be sent in WebSocket opening handshake.
- Header http.Header
-
- // Dialer used when opening websocket connections.
- Dialer *net.Dialer
-
- handshakeData map[string]string
-}
-
-// serverHandshaker is an interface to handle WebSocket server side handshake.
-type serverHandshaker interface {
- // ReadHandshake reads handshake request message from client.
- // Returns http response code and error if any.
- ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error)
-
- // AcceptHandshake accepts the client handshake request and sends
- // handshake response back to client.
- AcceptHandshake(buf *bufio.Writer) (err error)
-
- // NewServerConn creates a new WebSocket connection.
- NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) (conn *Conn)
-}
-
-// frameReader is an interface to read a WebSocket frame.
-type frameReader interface {
- // Reader is to read payload of the frame.
- io.Reader
-
- // PayloadType returns payload type.
- PayloadType() byte
-
- // HeaderReader returns a reader to read header of the frame.
- HeaderReader() io.Reader
-
- // TrailerReader returns a reader to read trailer of the frame.
- // If it returns nil, there is no trailer in the frame.
- TrailerReader() io.Reader
-
- // Len returns total length of the frame, including header and trailer.
- Len() int
-}
-
-// frameReaderFactory is an interface to creates new frame reader.
-type frameReaderFactory interface {
- NewFrameReader() (r frameReader, err error)
-}
-
-// frameWriter is an interface to write a WebSocket frame.
-type frameWriter interface {
- // Writer is to write payload of the frame.
- io.WriteCloser
-}
-
-// frameWriterFactory is an interface to create new frame writer.
-type frameWriterFactory interface {
- NewFrameWriter(payloadType byte) (w frameWriter, err error)
-}
-
-type frameHandler interface {
- HandleFrame(frame frameReader) (r frameReader, err error)
- WriteClose(status int) (err error)
-}
-
-// Conn represents a WebSocket connection.
-//
-// Multiple goroutines may invoke methods on a Conn simultaneously.
-type Conn struct {
- config *Config
- request *http.Request
-
- buf *bufio.ReadWriter
- rwc io.ReadWriteCloser
-
- rio sync.Mutex
- frameReaderFactory
- frameReader
-
- wio sync.Mutex
- frameWriterFactory
-
- frameHandler
- PayloadType byte
- defaultCloseStatus int
-
- // MaxPayloadBytes limits the size of frame payload received over Conn
- // by Codec's Receive method. If zero, DefaultMaxPayloadBytes is used.
- MaxPayloadBytes int
-}
-
-// Read implements the io.Reader interface:
-// it reads data of a frame from the WebSocket connection.
-// if msg is not large enough for the frame data, it fills the msg and next Read
-// will read the rest of the frame data.
-// it reads Text frame or Binary frame.
-func (ws *Conn) Read(msg []byte) (n int, err error) {
- ws.rio.Lock()
- defer ws.rio.Unlock()
-again:
- if ws.frameReader == nil {
- frame, err := ws.frameReaderFactory.NewFrameReader()
- if err != nil {
- return 0, err
- }
- ws.frameReader, err = ws.frameHandler.HandleFrame(frame)
- if err != nil {
- return 0, err
- }
- if ws.frameReader == nil {
- goto again
- }
- }
- n, err = ws.frameReader.Read(msg)
- if err == io.EOF {
- if trailer := ws.frameReader.TrailerReader(); trailer != nil {
- io.Copy(ioutil.Discard, trailer)
- }
- ws.frameReader = nil
- goto again
- }
- return n, err
-}
-
-// Write implements the io.Writer interface:
-// it writes data as a frame to the WebSocket connection.
-func (ws *Conn) Write(msg []byte) (n int, err error) {
- ws.wio.Lock()
- defer ws.wio.Unlock()
- w, err := ws.frameWriterFactory.NewFrameWriter(ws.PayloadType)
- if err != nil {
- return 0, err
- }
- n, err = w.Write(msg)
- w.Close()
- return n, err
-}
-
-// Close implements the io.Closer interface.
-func (ws *Conn) Close() error {
- err := ws.frameHandler.WriteClose(ws.defaultCloseStatus)
- err1 := ws.rwc.Close()
- if err != nil {
- return err
- }
- return err1
-}
-
-func (ws *Conn) IsClientConn() bool { return ws.request == nil }
-func (ws *Conn) IsServerConn() bool { return ws.request != nil }
-
-// LocalAddr returns the WebSocket Origin for the connection for client, or
-// the WebSocket location for server.
-func (ws *Conn) LocalAddr() net.Addr {
- if ws.IsClientConn() {
- return &Addr{ws.config.Origin}
- }
- return &Addr{ws.config.Location}
-}
-
-// RemoteAddr returns the WebSocket location for the connection for client, or
-// the Websocket Origin for server.
-func (ws *Conn) RemoteAddr() net.Addr {
- if ws.IsClientConn() {
- return &Addr{ws.config.Location}
- }
- return &Addr{ws.config.Origin}
-}
-
-var errSetDeadline = errors.New("websocket: cannot set deadline: not using a net.Conn")
-
-// SetDeadline sets the connection's network read & write deadlines.
-func (ws *Conn) SetDeadline(t time.Time) error {
- if conn, ok := ws.rwc.(net.Conn); ok {
- return conn.SetDeadline(t)
- }
- return errSetDeadline
-}
-
-// SetReadDeadline sets the connection's network read deadline.
-func (ws *Conn) SetReadDeadline(t time.Time) error {
- if conn, ok := ws.rwc.(net.Conn); ok {
- return conn.SetReadDeadline(t)
- }
- return errSetDeadline
-}
-
-// SetWriteDeadline sets the connection's network write deadline.
-func (ws *Conn) SetWriteDeadline(t time.Time) error {
- if conn, ok := ws.rwc.(net.Conn); ok {
- return conn.SetWriteDeadline(t)
- }
- return errSetDeadline
-}
-
-// Config returns the WebSocket config.
-func (ws *Conn) Config() *Config { return ws.config }
-
-// Request returns the http request upgraded to the WebSocket.
-// It is nil for client side.
-func (ws *Conn) Request() *http.Request { return ws.request }
-
-// Codec represents a symmetric pair of functions that implement a codec.
-type Codec struct {
- Marshal func(v interface{}) (data []byte, payloadType byte, err error)
- Unmarshal func(data []byte, payloadType byte, v interface{}) (err error)
-}
-
-// Send sends v marshaled by cd.Marshal as single frame to ws.
-func (cd Codec) Send(ws *Conn, v interface{}) (err error) {
- data, payloadType, err := cd.Marshal(v)
- if err != nil {
- return err
- }
- ws.wio.Lock()
- defer ws.wio.Unlock()
- w, err := ws.frameWriterFactory.NewFrameWriter(payloadType)
- if err != nil {
- return err
- }
- _, err = w.Write(data)
- w.Close()
- return err
-}
-
-// Receive receives single frame from ws, unmarshaled by cd.Unmarshal and stores
-// in v. The whole frame payload is read to an in-memory buffer; max size of
-// payload is defined by ws.MaxPayloadBytes. If frame payload size exceeds
-// limit, ErrFrameTooLarge is returned; in this case frame is not read off wire
-// completely. The next call to Receive would read and discard leftover data of
-// previous oversized frame before processing next frame.
-func (cd Codec) Receive(ws *Conn, v interface{}) (err error) {
- ws.rio.Lock()
- defer ws.rio.Unlock()
- if ws.frameReader != nil {
- _, err = io.Copy(ioutil.Discard, ws.frameReader)
- if err != nil {
- return err
- }
- ws.frameReader = nil
- }
-again:
- frame, err := ws.frameReaderFactory.NewFrameReader()
- if err != nil {
- return err
- }
- frame, err = ws.frameHandler.HandleFrame(frame)
- if err != nil {
- return err
- }
- if frame == nil {
- goto again
- }
- maxPayloadBytes := ws.MaxPayloadBytes
- if maxPayloadBytes == 0 {
- maxPayloadBytes = DefaultMaxPayloadBytes
- }
- if hf, ok := frame.(*hybiFrameReader); ok && hf.header.Length > int64(maxPayloadBytes) {
- // payload size exceeds limit, no need to call Unmarshal
- //
- // set frameReader to current oversized frame so that
- // the next call to this function can drain leftover
- // data before processing the next frame
- ws.frameReader = frame
- return ErrFrameTooLarge
- }
- payloadType := frame.PayloadType()
- data, err := ioutil.ReadAll(frame)
- if err != nil {
- return err
- }
- return cd.Unmarshal(data, payloadType, v)
-}
-
-func marshal(v interface{}) (msg []byte, payloadType byte, err error) {
- switch data := v.(type) {
- case string:
- return []byte(data), TextFrame, nil
- case []byte:
- return data, BinaryFrame, nil
- }
- return nil, UnknownFrame, ErrNotSupported
-}
-
-func unmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
- switch data := v.(type) {
- case *string:
- *data = string(msg)
- return nil
- case *[]byte:
- *data = msg
- return nil
- }
- return ErrNotSupported
-}
-
-/*
-Message is a codec to send/receive text/binary data in a frame on WebSocket connection.
-To send/receive text frame, use string type.
-To send/receive binary frame, use []byte type.
-
-Trivial usage:
-
- import "websocket"
-
- // receive text frame
- var message string
- websocket.Message.Receive(ws, &message)
-
- // send text frame
- message = "hello"
- websocket.Message.Send(ws, message)
-
- // receive binary frame
- var data []byte
- websocket.Message.Receive(ws, &data)
-
- // send binary frame
- data = []byte{0, 1, 2}
- websocket.Message.Send(ws, data)
-
-*/
-var Message = Codec{marshal, unmarshal}
-
-func jsonMarshal(v interface{}) (msg []byte, payloadType byte, err error) {
- msg, err = json.Marshal(v)
- return msg, TextFrame, err
-}
-
-func jsonUnmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
- return json.Unmarshal(msg, v)
-}
-
-/*
-JSON is a codec to send/receive JSON data in a frame from a WebSocket connection.
-
-Trivial usage:
-
- import "websocket"
-
- type T struct {
- Msg string
- Count int
- }
-
- // receive JSON type T
- var data T
- websocket.JSON.Receive(ws, &data)
-
- // send JSON type T
- websocket.JSON.Send(ws, data)
-*/
-var JSON = Codec{jsonMarshal, jsonUnmarshal}