mirror of https://github.com/status-im/consul.git
Merge pull request #3752 from yfouquet/issue_3687
Add support for compression in http api
This commit is contained in:
commit
0d1d03c793
|
@ -701,6 +701,10 @@ func (s *HTTPServer) AgentMonitor(resp http.ResponseWriter, req *http.Request) (
|
||||||
|
|
||||||
// Send header so client can start streaming body
|
// Send header so client can start streaming body
|
||||||
resp.WriteHeader(http.StatusOK)
|
resp.WriteHeader(http.StatusOK)
|
||||||
|
|
||||||
|
// 0 byte write is needed before the Flush call so that if we are using
|
||||||
|
// a gzip stream it will go ahead and write out the HTTP response header
|
||||||
|
resp.Write([]byte(""))
|
||||||
flusher.Flush()
|
flusher.Flush()
|
||||||
|
|
||||||
// Stream logs until the connection is closed.
|
// Stream logs until the connection is closed.
|
||||||
|
|
|
@ -17,6 +17,7 @@ import (
|
||||||
"github.com/hashicorp/consul/agent/structs"
|
"github.com/hashicorp/consul/agent/structs"
|
||||||
"github.com/hashicorp/go-cleanhttp"
|
"github.com/hashicorp/go-cleanhttp"
|
||||||
"github.com/mitchellh/mapstructure"
|
"github.com/mitchellh/mapstructure"
|
||||||
|
"github.com/NYTimes/gziphandler"
|
||||||
)
|
)
|
||||||
|
|
||||||
// MethodNotAllowedError should be returned by a handler when the HTTP method is not allowed.
|
// MethodNotAllowedError should be returned by a handler when the HTTP method is not allowed.
|
||||||
|
@ -64,6 +65,7 @@ func registerEndpoint(pattern string, methods []string, fn unboundEndpoint) {
|
||||||
if endpoints[pattern] != nil || allowedMethods[pattern] != nil {
|
if endpoints[pattern] != nil || allowedMethods[pattern] != nil {
|
||||||
panic(fmt.Errorf("Pattern %q is already registered", pattern))
|
panic(fmt.Errorf("Pattern %q is already registered", pattern))
|
||||||
}
|
}
|
||||||
|
|
||||||
endpoints[pattern] = fn
|
endpoints[pattern] = fn
|
||||||
allowedMethods[pattern] = methods
|
allowedMethods[pattern] = methods
|
||||||
}
|
}
|
||||||
|
@ -111,7 +113,10 @@ func (s *HTTPServer) handler(enableDebug bool) http.Handler {
|
||||||
metrics.MeasureSince(append([]string{"consul"}, key...), start)
|
metrics.MeasureSince(append([]string{"consul"}, key...), start)
|
||||||
metrics.MeasureSince(key, start)
|
metrics.MeasureSince(key, start)
|
||||||
}
|
}
|
||||||
mux.HandleFunc(pattern, wrapper)
|
|
||||||
|
gzipWrapper, _ := gziphandler.GzipHandlerWithOpts(gziphandler.MinSize(0))
|
||||||
|
gzipHandler := gzipWrapper(http.HandlerFunc(wrapper))
|
||||||
|
mux.Handle(pattern, gzipHandler)
|
||||||
}
|
}
|
||||||
|
|
||||||
mux.HandleFunc("/", s.Index)
|
mux.HandleFunc("/", s.Index)
|
||||||
|
|
|
@ -0,0 +1,201 @@
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
|
|
||||||
|
1. Definitions.
|
||||||
|
|
||||||
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
|
other entities that control, are controlled by, or are under common
|
||||||
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
|
exercising permissions granted by this License.
|
||||||
|
|
||||||
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
|
including but not limited to software source code, documentation
|
||||||
|
source, and configuration files.
|
||||||
|
|
||||||
|
"Object" form shall mean any form resulting from mechanical
|
||||||
|
transformation or translation of a Source form, including but
|
||||||
|
not limited to compiled object code, generated documentation,
|
||||||
|
and conversions to other media types.
|
||||||
|
|
||||||
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright 2016-2017 The New York Times Company
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
|
@ -0,0 +1,52 @@
|
||||||
|
Gzip Handler
|
||||||
|
============
|
||||||
|
|
||||||
|
This is a tiny Go package which wraps HTTP handlers to transparently gzip the
|
||||||
|
response body, for clients which support it. Although it's usually simpler to
|
||||||
|
leave that to a reverse proxy (like nginx or Varnish), this package is useful
|
||||||
|
when that's undesirable.
|
||||||
|
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
Call `GzipHandler` with any handler (an object which implements the
|
||||||
|
`http.Handler` interface), and it'll return a new handler which gzips the
|
||||||
|
response. For example:
|
||||||
|
|
||||||
|
```go
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"github.com/NYTimes/gziphandler"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
withoutGz := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "text/plain")
|
||||||
|
io.WriteString(w, "Hello, World")
|
||||||
|
})
|
||||||
|
|
||||||
|
withGz := gziphandler.GzipHandler(withoutGz)
|
||||||
|
|
||||||
|
http.Handle("/", withGz)
|
||||||
|
http.ListenAndServe("0.0.0.0:8000", nil)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
The docs can be found at [godoc.org][docs], as usual.
|
||||||
|
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
[Apache 2.0][license].
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
[docs]: https://godoc.org/github.com/nytimes/gziphandler
|
||||||
|
[license]: https://github.com/nytimes/gziphandler/blob/master/LICENSE.md
|
|
@ -0,0 +1,429 @@
|
||||||
|
package gziphandler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"compress/gzip"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
vary = "Vary"
|
||||||
|
acceptEncoding = "Accept-Encoding"
|
||||||
|
contentEncoding = "Content-Encoding"
|
||||||
|
contentType = "Content-Type"
|
||||||
|
contentLength = "Content-Length"
|
||||||
|
)
|
||||||
|
|
||||||
|
type codings map[string]float64
|
||||||
|
|
||||||
|
const (
|
||||||
|
// DefaultQValue is the default qvalue to assign to an encoding if no explicit qvalue is set.
|
||||||
|
// This is actually kind of ambiguous in RFC 2616, so hopefully it's correct.
|
||||||
|
// The examples seem to indicate that it is.
|
||||||
|
DefaultQValue = 1.0
|
||||||
|
|
||||||
|
// 1500 bytes is the MTU size for the internet since that is the largest size allowed at the network layer.
|
||||||
|
// If you take a file that is 1300 bytes and compress it to 800 bytes, it’s still transmitted in that same 1500 byte packet regardless, so you’ve gained nothing.
|
||||||
|
// That being the case, you should restrict the gzip compression to files with a size greater than a single packet, 1400 bytes (1.4KB) is a safe value.
|
||||||
|
DefaultMinSize = 1400
|
||||||
|
)
|
||||||
|
|
||||||
|
// gzipWriterPools stores a sync.Pool for each compression level for reuse of
|
||||||
|
// gzip.Writers. Use poolIndex to covert a compression level to an index into
|
||||||
|
// gzipWriterPools.
|
||||||
|
var gzipWriterPools [gzip.BestCompression - gzip.BestSpeed + 2]*sync.Pool
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
for i := gzip.BestSpeed; i <= gzip.BestCompression; i++ {
|
||||||
|
addLevelPool(i)
|
||||||
|
}
|
||||||
|
addLevelPool(gzip.DefaultCompression)
|
||||||
|
}
|
||||||
|
|
||||||
|
// poolIndex maps a compression level to its index into gzipWriterPools. It
|
||||||
|
// assumes that level is a valid gzip compression level.
|
||||||
|
func poolIndex(level int) int {
|
||||||
|
// gzip.DefaultCompression == -1, so we need to treat it special.
|
||||||
|
if level == gzip.DefaultCompression {
|
||||||
|
return gzip.BestCompression - gzip.BestSpeed + 1
|
||||||
|
}
|
||||||
|
return level - gzip.BestSpeed
|
||||||
|
}
|
||||||
|
|
||||||
|
func addLevelPool(level int) {
|
||||||
|
gzipWriterPools[poolIndex(level)] = &sync.Pool{
|
||||||
|
New: func() interface{} {
|
||||||
|
// NewWriterLevel only returns error on a bad level, we are guaranteeing
|
||||||
|
// that this will be a valid level so it is okay to ignore the returned
|
||||||
|
// error.
|
||||||
|
w, _ := gzip.NewWriterLevel(nil, level)
|
||||||
|
return w
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GzipResponseWriter provides an http.ResponseWriter interface, which gzips
|
||||||
|
// bytes before writing them to the underlying response. This doesn't close the
|
||||||
|
// writers, so don't forget to do that.
|
||||||
|
// It can be configured to skip response smaller than minSize.
|
||||||
|
type GzipResponseWriter struct {
|
||||||
|
http.ResponseWriter
|
||||||
|
index int // Index for gzipWriterPools.
|
||||||
|
gw *gzip.Writer
|
||||||
|
|
||||||
|
code int // Saves the WriteHeader value.
|
||||||
|
|
||||||
|
minSize int // Specifed the minimum response size to gzip. If the response length is bigger than this value, it is compressed.
|
||||||
|
buf []byte // Holds the first part of the write before reaching the minSize or the end of the write.
|
||||||
|
|
||||||
|
contentTypes []string // Only compress if the response is one of these content-types. All are accepted if empty.
|
||||||
|
}
|
||||||
|
|
||||||
|
type GzipResponseWriterWithCloseNotify struct {
|
||||||
|
*GzipResponseWriter
|
||||||
|
}
|
||||||
|
|
||||||
|
func (w GzipResponseWriterWithCloseNotify) CloseNotify() <-chan bool {
|
||||||
|
return w.ResponseWriter.(http.CloseNotifier).CloseNotify()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write appends data to the gzip writer.
|
||||||
|
func (w *GzipResponseWriter) Write(b []byte) (int, error) {
|
||||||
|
// If content type is not set.
|
||||||
|
if _, ok := w.Header()[contentType]; !ok {
|
||||||
|
// It infer it from the uncompressed body.
|
||||||
|
w.Header().Set(contentType, http.DetectContentType(b))
|
||||||
|
}
|
||||||
|
|
||||||
|
// GZIP responseWriter is initialized. Use the GZIP responseWriter.
|
||||||
|
if w.gw != nil {
|
||||||
|
n, err := w.gw.Write(b)
|
||||||
|
return n, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save the write into a buffer for later use in GZIP responseWriter (if content is long enough) or at close with regular responseWriter.
|
||||||
|
// On the first write, w.buf changes from nil to a valid slice
|
||||||
|
w.buf = append(w.buf, b...)
|
||||||
|
|
||||||
|
// If the global writes are bigger than the minSize and we're about to write
|
||||||
|
// a response containing a content type we want to handle, enable
|
||||||
|
// compression.
|
||||||
|
if len(w.buf) >= w.minSize && handleContentType(w.contentTypes, w) && w.Header().Get(contentEncoding) == "" {
|
||||||
|
err := w.startGzip()
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return len(b), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// startGzip initialize any GZIP specific informations.
|
||||||
|
func (w *GzipResponseWriter) startGzip() error {
|
||||||
|
|
||||||
|
// Set the GZIP header.
|
||||||
|
w.Header().Set(contentEncoding, "gzip")
|
||||||
|
|
||||||
|
// if the Content-Length is already set, then calls to Write on gzip
|
||||||
|
// will fail to set the Content-Length header since its already set
|
||||||
|
// See: https://github.com/golang/go/issues/14975.
|
||||||
|
w.Header().Del(contentLength)
|
||||||
|
|
||||||
|
// Write the header to gzip response.
|
||||||
|
if w.code != 0 {
|
||||||
|
w.ResponseWriter.WriteHeader(w.code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize the GZIP response.
|
||||||
|
w.init()
|
||||||
|
|
||||||
|
// Flush the buffer into the gzip response.
|
||||||
|
n, err := w.gw.Write(w.buf)
|
||||||
|
|
||||||
|
// This should never happen (per io.Writer docs), but if the write didn't
|
||||||
|
// accept the entire buffer but returned no specific error, we have no clue
|
||||||
|
// what's going on, so abort just to be safe.
|
||||||
|
if err == nil && n < len(w.buf) {
|
||||||
|
return io.ErrShortWrite
|
||||||
|
}
|
||||||
|
|
||||||
|
w.buf = nil
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteHeader just saves the response code until close or GZIP effective writes.
|
||||||
|
func (w *GzipResponseWriter) WriteHeader(code int) {
|
||||||
|
if w.code == 0 {
|
||||||
|
w.code = code
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// init graps a new gzip writer from the gzipWriterPool and writes the correct
|
||||||
|
// content encoding header.
|
||||||
|
func (w *GzipResponseWriter) init() {
|
||||||
|
// Bytes written during ServeHTTP are redirected to this gzip writer
|
||||||
|
// before being written to the underlying response.
|
||||||
|
gzw := gzipWriterPools[w.index].Get().(*gzip.Writer)
|
||||||
|
gzw.Reset(w.ResponseWriter)
|
||||||
|
w.gw = gzw
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close will close the gzip.Writer and will put it back in the gzipWriterPool.
|
||||||
|
func (w *GzipResponseWriter) Close() error {
|
||||||
|
if w.gw == nil {
|
||||||
|
// Gzip not trigged yet, write out regular response.
|
||||||
|
if w.code != 0 {
|
||||||
|
w.ResponseWriter.WriteHeader(w.code)
|
||||||
|
}
|
||||||
|
if w.buf != nil {
|
||||||
|
_, writeErr := w.ResponseWriter.Write(w.buf)
|
||||||
|
// Returns the error if any at write.
|
||||||
|
if writeErr != nil {
|
||||||
|
return fmt.Errorf("gziphandler: write to regular responseWriter at close gets error: %q", writeErr.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
err := w.gw.Close()
|
||||||
|
gzipWriterPools[w.index].Put(w.gw)
|
||||||
|
w.gw = nil
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Flush flushes the underlying *gzip.Writer and then the underlying
|
||||||
|
// http.ResponseWriter if it is an http.Flusher. This makes GzipResponseWriter
|
||||||
|
// an http.Flusher.
|
||||||
|
func (w *GzipResponseWriter) Flush() {
|
||||||
|
if w.gw == nil {
|
||||||
|
// Only flush once startGzip has been called.
|
||||||
|
//
|
||||||
|
// Flush is thus a no-op until the written body
|
||||||
|
// exceeds minSize.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.gw.Flush()
|
||||||
|
|
||||||
|
if fw, ok := w.ResponseWriter.(http.Flusher); ok {
|
||||||
|
fw.Flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hijack implements http.Hijacker. If the underlying ResponseWriter is a
|
||||||
|
// Hijacker, its Hijack method is returned. Otherwise an error is returned.
|
||||||
|
func (w *GzipResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
|
||||||
|
if hj, ok := w.ResponseWriter.(http.Hijacker); ok {
|
||||||
|
return hj.Hijack()
|
||||||
|
}
|
||||||
|
return nil, nil, fmt.Errorf("http.Hijacker interface is not supported")
|
||||||
|
}
|
||||||
|
|
||||||
|
// verify Hijacker interface implementation
|
||||||
|
var _ http.Hijacker = &GzipResponseWriter{}
|
||||||
|
|
||||||
|
// MustNewGzipLevelHandler behaves just like NewGzipLevelHandler except that in
|
||||||
|
// an error case it panics rather than returning an error.
|
||||||
|
func MustNewGzipLevelHandler(level int) func(http.Handler) http.Handler {
|
||||||
|
wrap, err := NewGzipLevelHandler(level)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
return wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewGzipLevelHandler returns a wrapper function (often known as middleware)
|
||||||
|
// which can be used to wrap an HTTP handler to transparently gzip the response
|
||||||
|
// body if the client supports it (via the Accept-Encoding header). Responses will
|
||||||
|
// be encoded at the given gzip compression level. An error will be returned only
|
||||||
|
// if an invalid gzip compression level is given, so if one can ensure the level
|
||||||
|
// is valid, the returned error can be safely ignored.
|
||||||
|
func NewGzipLevelHandler(level int) (func(http.Handler) http.Handler, error) {
|
||||||
|
return NewGzipLevelAndMinSize(level, DefaultMinSize)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewGzipLevelAndMinSize behave as NewGzipLevelHandler except it let the caller
|
||||||
|
// specify the minimum size before compression.
|
||||||
|
func NewGzipLevelAndMinSize(level, minSize int) (func(http.Handler) http.Handler, error) {
|
||||||
|
return GzipHandlerWithOpts(CompressionLevel(level), MinSize(minSize))
|
||||||
|
}
|
||||||
|
|
||||||
|
func GzipHandlerWithOpts(opts ...option) (func(http.Handler) http.Handler, error) {
|
||||||
|
c := &config{
|
||||||
|
level: gzip.DefaultCompression,
|
||||||
|
minSize: DefaultMinSize,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, o := range opts {
|
||||||
|
o(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := c.validate(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return func(h http.Handler) http.Handler {
|
||||||
|
index := poolIndex(c.level)
|
||||||
|
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Add(vary, acceptEncoding)
|
||||||
|
if acceptsGzip(r) {
|
||||||
|
gw := &GzipResponseWriter{
|
||||||
|
ResponseWriter: w,
|
||||||
|
index: index,
|
||||||
|
minSize: c.minSize,
|
||||||
|
contentTypes: c.contentTypes,
|
||||||
|
}
|
||||||
|
defer gw.Close()
|
||||||
|
|
||||||
|
if _, ok := w.(http.CloseNotifier); ok {
|
||||||
|
gwcn := GzipResponseWriterWithCloseNotify{gw}
|
||||||
|
h.ServeHTTP(gwcn, r)
|
||||||
|
} else {
|
||||||
|
h.ServeHTTP(gw, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
h.ServeHTTP(w, r)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Used for functional configuration.
|
||||||
|
type config struct {
|
||||||
|
minSize int
|
||||||
|
level int
|
||||||
|
contentTypes []string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *config) validate() error {
|
||||||
|
if c.level != gzip.DefaultCompression && (c.level < gzip.BestSpeed || c.level > gzip.BestCompression) {
|
||||||
|
return fmt.Errorf("invalid compression level requested: %d", c.level)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.minSize < 0 {
|
||||||
|
return fmt.Errorf("minimum size must be more than zero")
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type option func(c *config)
|
||||||
|
|
||||||
|
func MinSize(size int) option {
|
||||||
|
return func(c *config) {
|
||||||
|
c.minSize = size
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func CompressionLevel(level int) option {
|
||||||
|
return func(c *config) {
|
||||||
|
c.level = level
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ContentTypes(types []string) option {
|
||||||
|
return func(c *config) {
|
||||||
|
c.contentTypes = []string{}
|
||||||
|
for _, v := range types {
|
||||||
|
c.contentTypes = append(c.contentTypes, strings.ToLower(v))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GzipHandler wraps an HTTP handler, to transparently gzip the response body if
|
||||||
|
// the client supports it (via the Accept-Encoding header). This will compress at
|
||||||
|
// the default compression level.
|
||||||
|
func GzipHandler(h http.Handler) http.Handler {
|
||||||
|
wrapper, _ := NewGzipLevelHandler(gzip.DefaultCompression)
|
||||||
|
return wrapper(h)
|
||||||
|
}
|
||||||
|
|
||||||
|
// acceptsGzip returns true if the given HTTP request indicates that it will
|
||||||
|
// accept a gzipped response.
|
||||||
|
func acceptsGzip(r *http.Request) bool {
|
||||||
|
acceptedEncodings, _ := parseEncodings(r.Header.Get(acceptEncoding))
|
||||||
|
return acceptedEncodings["gzip"] > 0.0
|
||||||
|
}
|
||||||
|
|
||||||
|
// returns true if we've been configured to compress the specific content type.
|
||||||
|
func handleContentType(contentTypes []string, w http.ResponseWriter) bool {
|
||||||
|
// If contentTypes is empty we handle all content types.
|
||||||
|
if len(contentTypes) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
ct := strings.ToLower(w.Header().Get(contentType))
|
||||||
|
for _, c := range contentTypes {
|
||||||
|
if c == ct {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseEncodings attempts to parse a list of codings, per RFC 2616, as might
|
||||||
|
// appear in an Accept-Encoding header. It returns a map of content-codings to
|
||||||
|
// quality values, and an error containing the errors encountered. It's probably
|
||||||
|
// safe to ignore those, because silently ignoring errors is how the internet
|
||||||
|
// works.
|
||||||
|
//
|
||||||
|
// See: http://tools.ietf.org/html/rfc2616#section-14.3.
|
||||||
|
func parseEncodings(s string) (codings, error) {
|
||||||
|
c := make(codings)
|
||||||
|
var e []string
|
||||||
|
|
||||||
|
for _, ss := range strings.Split(s, ",") {
|
||||||
|
coding, qvalue, err := parseCoding(ss)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
e = append(e, err.Error())
|
||||||
|
} else {
|
||||||
|
c[coding] = qvalue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO (adammck): Use a proper multi-error struct, so the individual errors
|
||||||
|
// can be extracted if anyone cares.
|
||||||
|
if len(e) > 0 {
|
||||||
|
return c, fmt.Errorf("errors while parsing encodings: %s", strings.Join(e, ", "))
|
||||||
|
}
|
||||||
|
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseCoding parses a single conding (content-coding with an optional qvalue),
|
||||||
|
// as might appear in an Accept-Encoding header. It attempts to forgive minor
|
||||||
|
// formatting errors.
|
||||||
|
func parseCoding(s string) (coding string, qvalue float64, err error) {
|
||||||
|
for n, part := range strings.Split(s, ";") {
|
||||||
|
part = strings.TrimSpace(part)
|
||||||
|
qvalue = DefaultQValue
|
||||||
|
|
||||||
|
if n == 0 {
|
||||||
|
coding = strings.ToLower(part)
|
||||||
|
} else if strings.HasPrefix(part, "q=") {
|
||||||
|
qvalue, err = strconv.ParseFloat(strings.TrimPrefix(part, "q="), 64)
|
||||||
|
|
||||||
|
if qvalue < 0.0 {
|
||||||
|
qvalue = 0.0
|
||||||
|
} else if qvalue > 1.0 {
|
||||||
|
qvalue = 1.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if coding == "" {
|
||||||
|
err = fmt.Errorf("empty content-coding")
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
|
@ -0,0 +1,43 @@
|
||||||
|
// +build go1.8
|
||||||
|
|
||||||
|
package gziphandler
|
||||||
|
|
||||||
|
import "net/http"
|
||||||
|
|
||||||
|
// Push initiates an HTTP/2 server push.
|
||||||
|
// Push returns ErrNotSupported if the client has disabled push or if push
|
||||||
|
// is not supported on the underlying connection.
|
||||||
|
func (w *GzipResponseWriter) Push(target string, opts *http.PushOptions) error {
|
||||||
|
pusher, ok := w.ResponseWriter.(http.Pusher)
|
||||||
|
if ok && pusher != nil {
|
||||||
|
return pusher.Push(target, setAcceptEncodingForPushOptions(opts))
|
||||||
|
}
|
||||||
|
return http.ErrNotSupported
|
||||||
|
}
|
||||||
|
|
||||||
|
// setAcceptEncodingForPushOptions sets "Accept-Encoding" : "gzip" for PushOptions without overriding existing headers.
|
||||||
|
func setAcceptEncodingForPushOptions(opts *http.PushOptions) *http.PushOptions {
|
||||||
|
|
||||||
|
if opts == nil {
|
||||||
|
opts = &http.PushOptions{
|
||||||
|
Header: http.Header{
|
||||||
|
acceptEncoding: []string{"gzip"},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return opts
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.Header == nil {
|
||||||
|
opts.Header = http.Header{
|
||||||
|
acceptEncoding: []string{"gzip"},
|
||||||
|
}
|
||||||
|
return opts
|
||||||
|
}
|
||||||
|
|
||||||
|
if encoding := opts.Header.Get(acceptEncoding); encoding == "" {
|
||||||
|
opts.Header.Add(acceptEncoding, "gzip")
|
||||||
|
return opts
|
||||||
|
}
|
||||||
|
|
||||||
|
return opts
|
||||||
|
}
|
|
@ -4,6 +4,7 @@
|
||||||
"package": [
|
"package": [
|
||||||
{"path":"github.com/DataDog/datadog-go/statsd","checksumSHA1":"JhyS/zIicgtrSasHSZ6WtXGWJVk=","revision":"cc2f4770f4d61871e19bfee967bc767fe730b0d9","revisionTime":"2016-03-29T13:52:53Z"},
|
{"path":"github.com/DataDog/datadog-go/statsd","checksumSHA1":"JhyS/zIicgtrSasHSZ6WtXGWJVk=","revision":"cc2f4770f4d61871e19bfee967bc767fe730b0d9","revisionTime":"2016-03-29T13:52:53Z"},
|
||||||
{"path":"github.com/Microsoft/go-winio","checksumSHA1":"AzjRkOQtVBTwIw4RJLTygFhJs3s=","revision":"c4dc1301f1dc0307acd38e611aa375a64dfe0642","revisionTime":"2017-07-12T04:46:15Z"},
|
{"path":"github.com/Microsoft/go-winio","checksumSHA1":"AzjRkOQtVBTwIw4RJLTygFhJs3s=","revision":"c4dc1301f1dc0307acd38e611aa375a64dfe0642","revisionTime":"2017-07-12T04:46:15Z"},
|
||||||
|
{"path":"github.com/NYTimes/gziphandler","checksumSHA1":"GM+KgxfAv3HJdtffkEPpegaFxe0=","revision":"2600fb119af974220d3916a5916d6e31176aac1b","revisionTime":"2018-02-20T23:40:21Z","version":"v1.0.1","versionExact":"v1.0.1"},
|
||||||
{"path":"github.com/StackExchange/wmi","checksumSHA1":"9NR0rrcAT5J76C5xMS4AVksS9o0=","revision":"e54cbda6595d7293a7a468ccf9525f6bc8887f99","revisionTime":"2016-08-11T21:45:55Z"},
|
{"path":"github.com/StackExchange/wmi","checksumSHA1":"9NR0rrcAT5J76C5xMS4AVksS9o0=","revision":"e54cbda6595d7293a7a468ccf9525f6bc8887f99","revisionTime":"2016-08-11T21:45:55Z"},
|
||||||
{"path":"github.com/armon/circbuf","checksumSHA1":"l0iFqayYAaEip6Olaq3/LCOa/Sg=","revision":"bbbad097214e2918d8543d5201d12bfd7bca254d","revisionTime":"2015-08-27T00:49:46Z"},
|
{"path":"github.com/armon/circbuf","checksumSHA1":"l0iFqayYAaEip6Olaq3/LCOa/Sg=","revision":"bbbad097214e2918d8543d5201d12bfd7bca254d","revisionTime":"2015-08-27T00:49:46Z"},
|
||||||
{"path":"github.com/armon/go-metrics","checksumSHA1":"0et4hA6AYqZCgYiY+c6Z17t3k3k=","revision":"023a4bbe4bb9bfb23ee7e1afc8d0abad217641f3","revisionTime":"2017-08-09T01:16:44Z"},
|
{"path":"github.com/armon/go-metrics","checksumSHA1":"0et4hA6AYqZCgYiY+c6Z17t3k3k=","revision":"023a4bbe4bb9bfb23ee7e1afc8d0abad217641f3","revisionTime":"2017-08-09T01:16:44Z"},
|
||||||
|
|
Loading…
Reference in New Issue