Merge pull request #356 from jehiah/bump_dependencies_356

Update vendored dependencies.
This commit is contained in:
Jehiah Czebotar 2017-03-27 21:07:08 -04:00 committed by GitHub
commit 712739f777
3 changed files with 8 additions and 12 deletions

View File

@ -1,6 +1,5 @@
language: go language: go
go: go:
- 1.6.4
- 1.7.5 - 1.7.5
- 1.8 - 1.8
script: script:

11
Godeps
View File

@ -1,9 +1,10 @@
github.com/18F/hmacauth 1.0.1 github.com/18F/hmacauth 1.0.1
github.com/BurntSushi/toml 3883ac1ce943878302255f538fce319d23226223 github.com/BurntSushi/toml d94612f9fc140360834f9742158c70b5c5b5535b
github.com/bitly/go-simplejson 3378bdcb5cebedcbf8b5750edee28010f128fe24 github.com/bitly/go-simplejson da1a8928f709389522c8023062a3739f3b4af419
github.com/mreiferson/go-options 33795234b6f327f1be2d78a541893012362a4e06 github.com/mreiferson/go-options 77551d20752b54535462404ad9d877ebdb26e53d
github.com/bmizerany/assert e17e99893cb6509f428e1728281c2ad60a6b31e3 github.com/bmizerany/assert e17e99893cb6509f428e1728281c2ad60a6b31e3
gopkg.in/fsnotify.v1 v1.2.0 gopkg.in/fsnotify.v1 v1.2.0
golang.org/x/oauth2 04e1573abc896e70388bd387a69753c378d46466 golang.org/x/oauth2 7fdf09982454086d5570c7db3e11f360194830ca
google.golang.org/api/admin/directory/v1 a5c3e2a4792aff40e59840d9ecdff0542a202a80 golang.org/x/net/context 242b6b35177ec3909636b6cf6a47e8c2c6324b5d
google.golang.org/api/admin/directory/v1 650535c7d6201e8304c92f38c922a9a3a36c6877
cloud.google.com/go/compute/metadata v0.7.0 cloud.google.com/go/compute/metadata v0.7.0

View File

@ -599,8 +599,7 @@ type SignatureAuthenticator struct {
auth hmacauth.HmacAuth auth hmacauth.HmacAuth
} }
func (v *SignatureAuthenticator) Authenticate( func (v *SignatureAuthenticator) Authenticate(w http.ResponseWriter, r *http.Request) {
w http.ResponseWriter, r *http.Request) {
result, headerSig, computedSig := v.auth.AuthenticateRequest(r) result, headerSig, computedSig := v.auth.AuthenticateRequest(r)
if result == hmacauth.ResultNoSignature { if result == hmacauth.ResultNoSignature {
w.Write([]byte("no signature received")) w.Write([]byte("no signature received"))
@ -688,10 +687,7 @@ func (st *SignatureTest) MakeRequestWithExpectedKey(method, body, key string) {
if body != "" { if body != "" {
bodyBuf = ioutil.NopCloser(&fakeNetConn{reqBody: body}) bodyBuf = ioutil.NopCloser(&fakeNetConn{reqBody: body})
} }
req, err := http.NewRequest(method, "/foo/bar", bodyBuf) req := httptest.NewRequest(method, "/foo/bar", bodyBuf)
if err != nil {
panic(err)
}
req.Header = st.header req.Header = st.header
state := &providers.SessionState{ state := &providers.SessionState{