Update dependencies once more

Signed-off-by: Knut Ahlers <knut@ahlers.me>

Gopkg.lock

@@ -14,8 +14,8 @@
     "http",
     "str"
   ]
-  revision = "8fdddb7041fe962e750caa553a0714f94e261c4a"
-  version = "v2.3.1"
+  revision = "15199b8e33ca5558e8c58af7924083983eb63ca4"
+  version = "v2.4.0"
 
 [[projects]]
   name = "github.com/Luzifer/rconfig"
@@ -100,7 +100,8 @@
 [[projects]]
   name = "github.com/patrickmn/go-cache"
   packages = ["."]
-  revision = "7ac151875ffb48b9f3ccce9ea20f020b0c1596c8"
+  revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"
+  version = "v2.1.0"
 
 [[projects]]
   name = "github.com/spf13/pflag"
@@ -147,9 +148,10 @@
   revision = "378d26f46672a356c46195c28f61bdb4c0a781dd"
 
 [[projects]]
+  branch = "master"
   name = "golang.org/x/time"
   packages = ["rate"]
-  revision = "711ca1cb87636abec28122ef3bc6a77269d433f3"
+  revision = "26559e0f760e39c24d730d3224364aef164ee23f"
 
 [[projects]]
   branch = "v2"

vendor/github.com/Luzifer/go_helpers/http/logHandler.go

@@ -3,17 +3,22 @@ package http
 import (
 	"log"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/Luzifer/go_helpers/accessLogger"
 )
 
 type HTTPLogHandler struct {
-	Handler http.Handler
+	Handler          http.Handler
+	TrustedIPHeaders []string
 }
 
 func NewHTTPLogHandler(h http.Handler) http.Handler {
-	return HTTPLogHandler{Handler: h}
+	return HTTPLogHandler{
+		Handler:          h,
+		TrustedIPHeaders: []string{"X-Forwarded-For", "RemoteAddr", "X-Real-IP"},
+	}
 }
 
 func (l HTTPLogHandler) ServeHTTP(res http.ResponseWriter, r *http.Request) {
@@ -23,7 +28,7 @@ func (l HTTPLogHandler) ServeHTTP(res http.ResponseWriter, r *http.Request) {
 	l.Handler.ServeHTTP(ares, r)
 
 	log.Printf("%s - \"%s %s\" %d %d \"%s\" \"%s\" %s",
-		r.RemoteAddr,
+		l.findIP(r),
 		r.Method,
 		r.URL.Path,
 		ares.StatusCode,
@@ -33,3 +38,15 @@ func (l HTTPLogHandler) ServeHTTP(res http.ResponseWriter, r *http.Request) {
 		time.Since(start),
 	)
 }
+
+func (l HTTPLogHandler) findIP(r *http.Request) string {
+	remoteAddr := strings.SplitN(r.RemoteAddr, ":", 2)[0]
+
+	for _, hdr := range l.TrustedIPHeaders {
+		if value := r.Header.Get(hdr); value != "" {
+			return strings.SplitN(value, ",", 2)[0]
+		}
+	}
+
+	return remoteAddr
+}

vendor/github.com/patrickmn/go-cache/cache.go

@@ -1074,7 +1074,6 @@ type janitor struct {
 }
 
 func (j *janitor) Run(c *cache) {
-	j.stop = make(chan bool)
 	ticker := time.NewTicker(j.Interval)
 	for {
 		select {
@@ -1094,6 +1093,7 @@ func stopJanitor(c *Cache) {
 func runJanitor(c *cache, ci time.Duration) {
 	j := &janitor{
 		Interval: ci,
+		stop:     make(chan bool),
 	}
 	c.janitor = j
 	go j.Run(c)

vendor/golang.org/x/time/rate/rate.go

@@ -10,8 +10,6 @@ import (
 	"math"
 	"sync"
 	"time"
-
-	"golang.org/x/net/context"
 )
 
 // Limit defines the maximum frequency of some events.
@@ -199,9 +197,10 @@ func (lim *Limiter) Reserve() *Reservation {
 // The Limiter takes this Reservation into account when allowing future events.
 // ReserveN returns false if n exceeds the Limiter's burst size.
 // Usage example:
-//   r, ok := lim.ReserveN(time.Now(), 1)
-//   if !ok {
+//   r := lim.ReserveN(time.Now(), 1)
+//   if !r.OK() {
 //     // Not allowed to act! Did you remember to set lim.burst to be > 0 ?
+//     return
 //   }
 //   time.Sleep(r.Delay())
 //   Act()
@@ -213,8 +212,19 @@ func (lim *Limiter) ReserveN(now time.Time, n int) *Reservation {
 	return &r
 }
 
+// contextContext is a temporary(?) copy of the context.Context type
+// to support both Go 1.6 using golang.org/x/net/context and Go 1.7+
+// with the built-in context package. If people ever stop using Go 1.6
+// we can remove this.
+type contextContext interface {
+	Deadline() (deadline time.Time, ok bool)
+	Done() <-chan struct{}
+	Err() error
+	Value(key interface{}) interface{}
+}
+
 // Wait is shorthand for WaitN(ctx, 1).
-func (lim *Limiter) Wait(ctx context.Context) (err error) {
+func (lim *Limiter) wait(ctx contextContext) (err error) {
 	return lim.WaitN(ctx, 1)
 }
 
@@ -222,7 +232,7 @@ func (lim *Limiter) Wait(ctx context.Context) (err error) {
 // It returns an error if n exceeds the Limiter's burst size, the Context is
 // canceled, or the expected wait time exceeds the Context's Deadline.
 // The burst limit is ignored if the rate limit is Inf.
-func (lim *Limiter) WaitN(ctx context.Context, n int) (err error) {
+func (lim *Limiter) waitN(ctx contextContext, n int) (err error) {
 	if n > lim.burst && lim.limit != Inf {
 		return fmt.Errorf("rate: Wait(n=%d) exceeds limiter's burst %d", n, lim.burst)
 	}

vendor/golang.org/x/time/rate/rate_go16.go

@@ -0,0 +1,21 @@
+// Copyright 2017 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.
+
+// +build !go1.7
+
+package rate
+
+import "golang.org/x/net/context"
+
+// Wait is shorthand for WaitN(ctx, 1).
+func (lim *Limiter) Wait(ctx context.Context) (err error) {
+	return lim.waitN(ctx, 1)
+}
+
+// WaitN blocks until lim permits n events to happen.
+// It returns an error if n exceeds the Limiter's burst size, the Context is
+// canceled, or the expected wait time exceeds the Context's Deadline.
+func (lim *Limiter) WaitN(ctx context.Context, n int) (err error) {
+	return lim.waitN(ctx, n)
+}

vendor/golang.org/x/time/rate/rate_go17.go

@@ -0,0 +1,21 @@
+// Copyright 2017 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.
+
+// +build go1.7
+
+package rate
+
+import "context"
+
+// Wait is shorthand for WaitN(ctx, 1).
+func (lim *Limiter) Wait(ctx context.Context) (err error) {
+	return lim.waitN(ctx, 1)
+}
+
+// WaitN blocks until lim permits n events to happen.
+// It returns an error if n exceeds the Limiter's burst size, the Context is
+// canceled, or the expected wait time exceeds the Context's Deadline.
+func (lim *Limiter) WaitN(ctx context.Context, n int) (err error) {
+	return lim.waitN(ctx, n)
+}