MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-27 15:45:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bandwidth quota now supports 100-Continue

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-04-26 20:06:55 -07:00
parent 9431a54a27
commit 258bf55e31
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/api_router.go
View File

@ -92,10 +92,10 @@ func HTTPHandler(domain string, driver drivers.Driver) http.Handler {
} }
h := validateHandler(conf, ignoreResourcesHandler(mux)) h := validateHandler(conf, ignoreResourcesHandler(mux))
h = quota.BandwidthCap(h, 250*1024*1024, time.Duration(30*time.Minute)) h = quota.BandwidthCap(h, 25*1024*1024, time.Duration(30*time.Minute))
// h = quota.BandwidthCap(h, 1024*1024*1024, time.Duration(24*time.Hour)) h = quota.BandwidthCap(h, 100*1024*1024, time.Duration(24*time.Hour))
// h = quota.RequestLimit(h, 100, time.Duration(30*time.Minute)) h = quota.RequestLimit(h, 100, time.Duration(30*time.Minute))
// h = quota.RequestLimit(h, 1000, time.Duration(24*time.Hour)) h = quota.RequestLimit(h, 1000, time.Duration(24*time.Hour))
// h = quota.ConnectionLimit(h, 5) h = quota.ConnectionLimit(h, 5)
return h return h
} }

16
pkg/api/quota/bandwidth_cap.go
View File

@ -20,7 +20,6 @@ import (
"errors" "errors"
"github.com/minio-io/minio/pkg/iodine" "github.com/minio-io/minio/pkg/iodine"
"io" "io"
"log"
"net" "net"
"net/http" "net/http"
"time" "time"
@ -40,10 +39,22 @@ var bandwidthQuotaExceeded = ErrorResponse{
HostID: "", HostID: "",
} }
var bandwidthInsufficientToProceed = ErrorResponse{
Code: "BandwidthQuotaWillBeExceeded",
Message: "Bandwidth quota will be exceeded with this request",
Resource: "",
RequestID: "",
HostID: "",
}
// ServeHTTP is an http.Handler ServeHTTP method // ServeHTTP is an http.Handler ServeHTTP method
func (h *bandwidthQuotaHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { func (h *bandwidthQuotaHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
host, _, _ := net.SplitHostPort(req.RemoteAddr) host, _, _ := net.SplitHostPort(req.RemoteAddr)
longIP := longIP{net.ParseIP(host)}.IptoUint32() longIP := longIP{net.ParseIP(host)}.IptoUint32()
if h.quotas.WillExceedQuota(longIP, req.ContentLength) {
writeError(w, req, bandwidthInsufficientToProceed, 429)
return
}
req.Body = &quotaReader{ req.Body = &quotaReader{
ReadCloser: req.Body, ReadCloser: req.Body,
quotas: h.quotas, quotas: h.quotas,
@ -56,7 +67,6 @@ func (h *bandwidthQuotaHandler) ServeHTTP(w http.ResponseWriter, req *http.Reque
quotas: h.quotas, quotas: h.quotas,
ip: longIP, ip: longIP,
} }
log.Println("serving")
h.handler.ServeHTTP(w, req) h.handler.ServeHTTP(w, req)
} }
@ -84,12 +94,10 @@ type quotaReader struct {
func (q *quotaReader) Read(b []byte) (int, error) { func (q *quotaReader) Read(b []byte) (int, error) {
if q.err { if q.err {
log.Println("Shortcut, quitting")
return 0, iodine.New(errors.New("Quota Met"), nil) return 0, iodine.New(errors.New("Quota Met"), nil)
} }
if q.quotas.IsQuotaMet(q.ip) { if q.quotas.IsQuotaMet(q.ip) {
q.err = true q.err = true
log.Println("QUOTA!!!")
writeError(q.w, q.req, bandwidthQuotaExceeded, 429) writeError(q.w, q.req, bandwidthQuotaExceeded, 429)
return 0, iodine.New(errors.New("Quota Met"), nil) return 0, iodine.New(errors.New("Quota Met"), nil)
} }