⚡ vendor: switch to versioned gorethink api (#81)

* vendor: switch to versioned gorethink api * readme: bug bounty / hall of fame * readme: add fosite and ladon reference
ory · May 30, 2016 · 15242e2 · 15242e2
1 parent ebfc9a9
commit 15242e2
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,10 @@
 [![Coverage Status](https://coveralls.io/repos/ory-am/hydra/badge.svg?branch=master&service=github)](https://coveralls.io/github/ory-am/hydra?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/ory-am/hydra)](https://goreportcard.com/report/github.com/ory-am/hydra)
 
-Hydra is being developed by german-based company [Ory](https://ory.am). Join our [mailinglist](http://eepurl.com/bKT3N9) to stay on top of new developments. There is also a [Google Group](https://groups.google.com/forum/#!forum/ory-hydra/new) and a [Gitter Channel](https://gitter.im/ory-am/hydra).
+Hydra is being developed by german-based company [Ory](https://ory.am). Join our [mailinglist](http://eepurl.com/bKT3N9) to stay on top of new developments.
+There is also a [Google Group](https://groups.google.com/forum/#!forum/ory-hydra/new) and a [Gitter Channel](https://gitter.im/ory-am/hydra).
+
+Hydra uses the security first OAuth2 and OpenID Connect SDK [Fosite](https://github.com/ory-am/fosite) and [Ladon](https://github.com/ory-am/ladon) for policy-based access control.
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -21,6 +24,7 @@ Hydra is being developed by german-based company [Ory](https://ory.am). Join our
   - [REST API Documentation](#rest-api-documentation)
   - [CLI Documentation](#cli-documentation)
   - [Develop](#develop)
+- [Hall of Fame](#hall-of-fame)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -75,7 +79,7 @@ $ docker run -d -p 4444:4444 oryam/hydra --name my-hydra
 ec91228cb105db315553499c81918258f52cee9636ea2a4821bdb8226872f54b
 ```
 
-**The CLI client is available at **[gobuild.io](https://gobuild.io/ory-am/hydra)**.
+**The CLI client is available at [gobuild.io](https://gobuild.io/ory-am/hydra)**.
 
 There is currently no installer which adds the CLI to your path automatically. You have to set up the path yourself.
 If you do not understand what that means, ask on our [Gitter channel](https://gitter.im/ory-am/hydra).
@@ -264,3 +268,9 @@ DATABASE_URL=rethinkdb://localhost:28015/hydra go run main.go
 # Docker Terminal
 DATABASE_URL=rethinkdb://$(docker-machine ip default):28015/hydra go run main.go
 ```
+
+## Hall of Fame
+
+A list of extraordinary contributors and [bug hunters](https://github.com/ory-am/hydra/issues/84).
+
+* [Alexander Widerberg (leetal)](https://github.com/leetal) for implementing the prototype RethinkDB adapters.
diff --git a/client/manager_rethinkdb.go b/client/manager_rethinkdb.go
@@ -5,13 +5,13 @@ import (
 
 	"time"
 
-	r "github.com/dancannon/gorethink"
 	"github.com/go-errors/errors"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/fosite/hash"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/pborman/uuid"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 type RethinkManager struct {

diff --git a/client/manager_test.go b/client/manager_test.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"testing"
 
-	r "github.com/dancannon/gorethink"
+	r "gopkg.in/dancannon/gorethink.v2"
 
 	"log"
 	"os"

diff --git a/cmd/server/handler_client_factory.go b/cmd/server/handler_client_factory.go
@@ -2,13 +2,13 @@ package server
 
 import (
 	"github.com/Sirupsen/logrus"
-	r "github.com/dancannon/gorethink"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/hydra/client"
 	"github.com/ory-am/hydra/config"
 	"github.com/ory-am/hydra/herodot"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 func newClientManager(c *config.Config) client.Manager {

diff --git a/cmd/server/handler_connection_factory.go b/cmd/server/handler_connection_factory.go
@@ -2,12 +2,12 @@ package server
 
 import (
 	"github.com/Sirupsen/logrus"
-	r "github.com/dancannon/gorethink"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory-am/hydra/config"
 	"github.com/ory-am/hydra/connection"
 	"github.com/ory-am/hydra/herodot"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 func newConnectionHandler(c *config.Config, router *httprouter.Router) *connection.Handler {

diff --git a/cmd/server/handler_jwk_factory.go b/cmd/server/handler_jwk_factory.go
@@ -2,13 +2,13 @@ package server
 
 import (
 	"github.com/Sirupsen/logrus"
-	r "github.com/dancannon/gorethink"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory-am/hydra/config"
 	"github.com/ory-am/hydra/herodot"
 	"github.com/ory-am/hydra/jwk"
 	"github.com/square/go-jose"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 func newJWKHandler(c *config.Config, router *httprouter.Router) *jwk.Handler {

diff --git a/cmd/server/handler_oauth2_factory.go b/cmd/server/handler_oauth2_factory.go
@@ -6,7 +6,6 @@ import (
 	"net/url"
 
 	"github.com/Sirupsen/logrus"
-	r "github.com/dancannon/gorethink"
 	"github.com/go-errors/errors"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory-am/fosite"
@@ -29,6 +28,7 @@ import (
 	"github.com/ory-am/hydra/oauth2"
 	"github.com/ory-am/hydra/pkg"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 func injectFositeStore(c *config.Config, clients client.Manager) {

diff --git a/config/backend_connections.go b/config/backend_connections.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	r "github.com/dancannon/gorethink"
 	"github.com/go-errors/errors"
 	"github.com/ory-am/hydra/pkg"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 type MemoryConnection struct{}

diff --git a/config/config.go b/config/config.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	r "github.com/dancannon/gorethink"
 	"github.com/go-errors/errors"
 	"github.com/ory-am/fosite/handler/core/strategy"
 	"github.com/ory-am/fosite/hash"
@@ -24,6 +23,7 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/clientcredentials"
+	r "gopkg.in/dancannon/gorethink.v2"
 	"gopkg.in/yaml.v2"
 )
 

diff --git a/connection/manager_rethinkdb.go b/connection/manager_rethinkdb.go
@@ -3,7 +3,7 @@ package connection
 import (
 	"sync"
 
-	r "github.com/dancannon/gorethink"
+	r "gopkg.in/dancannon/gorethink.v2"
 
 	"time"
 

diff --git a/connection/manager_test.go b/connection/manager_test.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"time"
 
-	r "github.com/dancannon/gorethink"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/hydra/herodot"
@@ -21,11 +20,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 	"gopkg.in/ory-am/dockertest.v2"
 )
 
 var connections = []*Connection{
-	&Connection{
+	{
 		ID:            uuid.New(),
 		LocalSubject:  "peter",
 		RemoteSubject: "peterson",

diff --git a/glide.lock b/glide.lock
diff --git a/internal/fosite_store_rethinkdb.go b/internal/fosite_store_rethinkdb.go
@@ -6,12 +6,12 @@ import (
 	"sync"
 	"time"
 
-	r "github.com/dancannon/gorethink"
 	"github.com/go-errors/errors"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/hydra/client"
 	"github.com/ory-am/hydra/pkg"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 type RDBItems map[string]*RdbSchema

diff --git a/internal/fosite_store_test.go b/internal/fosite_store_test.go
@@ -7,12 +7,12 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	r "github.com/dancannon/gorethink"
 	c "github.com/ory-am/common/pkg"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/pborman/uuid"
 	"golang.org/x/net/context"
+	r "gopkg.in/dancannon/gorethink.v2"
 	"gopkg.in/ory-am/dockertest.v2"
 )
 

diff --git a/jwk/aead.go b/jwk/aead.go
@@ -5,8 +5,9 @@ import (
 	"crypto/cipher"
 	"crypto/rand"
 	"encoding/base64"
-	"github.com/go-errors/errors"
 	"io"
+
+	"github.com/go-errors/errors"
 )
 
 type AEAD struct {

diff --git a/jwk/aead_test.go b/jwk/aead_test.go
@@ -1,11 +1,12 @@
 package jwk
 
 import (
+	"testing"
+
 	"github.com/ory-am/fosite/rand"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/pborman/uuid"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestAEAD(t *testing.T) {

diff --git a/jwk/generator_ecdsa256.go b/jwk/generator_ecdsa256.go
@@ -19,11 +19,11 @@ func (g *ECDSA256Generator) Generate(id string) (*jose.JsonWebKeySet, error) {
 
 	return &jose.JsonWebKeySet{
 		Keys: []jose.JsonWebKey{
-			jose.JsonWebKey{
+			{
 				Key:   key,
 				KeyID: ider("private", id),
 			},
-			jose.JsonWebKey{
+			{
 				Key:   &key.PublicKey,
 				KeyID: ider("public", id),
 			},

diff --git a/jwk/generator_ecdsa521.go b/jwk/generator_ecdsa521.go
@@ -19,11 +19,11 @@ func (g *ECDSA521Generator) Generate(id string) (*jose.JsonWebKeySet, error) {
 
 	return &jose.JsonWebKeySet{
 		Keys: []jose.JsonWebKey{
-			jose.JsonWebKey{
+			{
 				Key:   key,
 				KeyID: ider("private", id),
 			},
-			jose.JsonWebKey{
+			{
 				Key:   &key.PublicKey,
 				KeyID: ider("public", id),
 			},

diff --git a/jwk/generator_hs256.go b/jwk/generator_hs256.go
@@ -26,7 +26,7 @@ func (g *HS256Generator) Generate(id string) (*jose.JsonWebKeySet, error) {
 
 	return &jose.JsonWebKeySet{
 		Keys: []jose.JsonWebKey{
-			jose.JsonWebKey{
+			{
 				Key:   []byte(string(key)),
 				KeyID: id,
 			},

diff --git a/jwk/generator_rs256.go b/jwk/generator_rs256.go
@@ -23,11 +23,11 @@ func (g *RS256Generator) Generate(id string) (*jose.JsonWebKeySet, error) {
 	key.Precomputed = rsa.PrecomputedValues{}
 	return &jose.JsonWebKeySet{
 		Keys: []jose.JsonWebKey{
-			jose.JsonWebKey{
+			{
 				Key:   key,
 				KeyID: ider("private", id),
 			},
-			jose.JsonWebKey{
+			{
 				Key:   &key.PublicKey,
 				KeyID: ider("public", id),
 			},

diff --git a/jwk/manager_rethinkdb.go b/jwk/manager_rethinkdb.go
@@ -5,12 +5,13 @@ import (
 
 	"encoding/json"
 
-	r "github.com/dancannon/gorethink"
+	"time"
+
 	"github.com/go-errors/errors"
 	"github.com/ory-am/hydra/pkg"
 	"github.com/square/go-jose"
 	"golang.org/x/net/context"
-	"time"
+	r "gopkg.in/dancannon/gorethink.v2"
 )
 
 type RethinkManager struct {

diff --git a/jwk/manager_test.go b/jwk/manager_test.go
@@ -5,7 +5,6 @@ import (
 	"net/url"
 	"testing"
 
-	r "github.com/dancannon/gorethink"
 	"github.com/julienschmidt/httprouter"
 	"github.com/ory-am/fosite"
 	"github.com/ory-am/hydra/herodot"
@@ -14,6 +13,7 @@ import (
 	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/ladon"
 	"github.com/stretchr/testify/assert"
+	r "gopkg.in/dancannon/gorethink.v2"
 
 	"log"
 	"os"

diff --git a/warden/warden_local.go b/warden/warden_local.go
@@ -10,16 +10,16 @@ import (
 	. "github.com/ory-am/hydra/firewall"
 	"github.com/ory-am/hydra/herodot"
 	"github.com/ory-am/hydra/oauth2"
+	"github.com/ory-am/hydra/pkg"
 	"github.com/ory-am/ladon"
 	"golang.org/x/net/context"
-	"github.com/ory-am/hydra/pkg"
 )
 
 type LocalWarden struct {
 	Warden         ladon.Warden
 	TokenValidator *core.CoreValidator
 
-	Issuer         string
+	Issuer string
 }
 
 func (w *LocalWarden) actionAllowed(ctx context.Context, a *ladon.Request, scopes []string, oauthRequest fosite.AccessRequester, session *oauth2.Session) (*Context, error) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ package connection @@
     import (
     	"sync"
-    	r "github.com/dancannon/gorethink"
+    	r "gopkg.in/dancannon/gorethink.v2"
     	"time"
@@ Expand Down @@