Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decompositioning, implement Fosite #62

Merged
merged 114 commits into from
May 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
7bd22eb
restructure
Mar 22, 2016
20426eb
fosite preview
Mar 23, 2016
871a12c
unstaged
Mar 29, 2016
2f6ed35
unstaged
Mar 29, 2016
22f3abf
unstaged
Mar 30, 2016
f21a01c
unstaged
Mar 30, 2016
64967b8
unstaged
Mar 31, 2016
4f2d92f
unstaged
Apr 1, 2016
40846bc
unstaged
Apr 11, 2016
485f9f3
unstaged
Apr 21, 2016
8e1ccc6
unstaged
Apr 22, 2016
6e5653d
tests for client manager and warden
Apr 26, 2016
18abf0c
add authenticate client tests
Apr 26, 2016
28506ee
add authenticate client tests
Apr 26, 2016
407eb8a
unstaged
Apr 27, 2016
0e21963
unstaged
Apr 27, 2016
31f9a7e
unstaged
Apr 27, 2016
6b0fefd
unstaged
Apr 28, 2016
2951e6b
unstaged
Apr 28, 2016
b230678
unstaged
Apr 29, 2016
e29cb40
oauth2 tests run
Apr 30, 2016
c185f57
unstaged
May 1, 2016
e36ae0f
unstaged
May 8, 2016
87f09d5
unstaged
May 8, 2016
cd2319a
cli logon etc works
May 8, 2016
39c9d35
storage
May 8, 2016
2292eb1
Update README.md
May 8, 2016
85c9020
Update README.md
May 8, 2016
964bf9f
readme
May 9, 2016
ae0de39
readme
May 9, 2016
e81fa34
readme
May 9, 2016
ecdde59
unstaged
May 9, 2016
ec7c1b9
jwk key manager
May 12, 2016
d9cbd76
cli refactor
May 12, 2016
9c330fa
cli refactor
May 13, 2016
88f35fb
client handlers
May 14, 2016
b2c1800
vendor: glide
May 14, 2016
61fa93f
travis
May 14, 2016
28ee919
travis
May 14, 2016
a63e544
travis
May 14, 2016
20d8dca
travis
May 14, 2016
59e85b2
travis
May 14, 2016
da5f9e1
travis
May 14, 2016
b465d34
vendor, docker
May 14, 2016
e38afe3
self signed tls
May 15, 2016
8ef1a78
key manager cli
May 15, 2016
bda467d
cli tests
May 15, 2016
8efbe47
policy cli
May 15, 2016
5952a1d
improved help
May 15, 2016
63ef096
quickstart
May 15, 2016
f802657
quickstart
May 15, 2016
0ba06c6
quickstart
May 15, 2016
1166b87
quickstart
May 15, 2016
ccd26cf
quickstart
May 15, 2016
ed432ed
quickstart
May 15, 2016
9185b2b
quickstart
May 15, 2016
f9ea4fd
cli: add token
May 16, 2016
9507df3
docker compose
May 17, 2016
86812f3
add race tests
May 17, 2016
f4b1afc
remove factory package
May 17, 2016
faf04ac
package moving
May 17, 2016
b7b0a40
package moving
May 17, 2016
a00e1b1
package moving
May 17, 2016
6ef3646
package moving
May 17, 2016
fa91db7
package moving
May 17, 2016
3cca3a7
package moving
May 17, 2016
88c20e3
package moving
May 17, 2016
1ae9823
tests
May 17, 2016
f168b91
tests
May 17, 2016
c5db1d7
tests
May 17, 2016
cab7966
tests
May 17, 2016
de1eaa3
exclude cmd from race tests
May 18, 2016
a94481a
jwk tests
May 18, 2016
3faf695
structure refactoring
May 18, 2016
c8d07ab
coverage
May 18, 2016
c5445e1
coverage
May 18, 2016
dc2b351
readme
May 18, 2016
04bf7c4
how2gif
May 18, 2016
e93bd73
how2gif
May 18, 2016
096a4ce
how2gif
May 18, 2016
e6c2e35
how2gif
May 18, 2016
66502ff
gorethinkdb
May 19, 2016
77bca1c
gorethinkdb
May 19, 2016
fce05df
bench authenticate
May 19, 2016
cb615b7
more rethink
May 19, 2016
194383a
jwk rethink wip
May 19, 2016
ec01013
example policies
May 19, 2016
a61a84f
close 74: spec: /jwk/:set/:kid must return array
May 19, 2016
35cc0ae
rethink db jwk
May 19, 2016
341f0af
jwks
May 26, 2016
a26d925
rethink db jwk
May 26, 2016
242f5d0
finished rethinkdb adapters
May 26, 2016
a352d05
test pass
May 26, 2016
d3c44e6
goimports, docker travis
May 26, 2016
ad2a0cf
unstaged
May 27, 2016
e94a94c
unstaged
May 27, 2016
2153578
unstaged
May 27, 2016
1903ec5
unstaged
May 27, 2016
56ba5dc
unstaged
May 28, 2016
4c2b725
unstaged
May 28, 2016
27e3e3d
unstaged
May 28, 2016
5151c3e
unstaged
May 28, 2016
a56923e
rethinkdb finalization
May 28, 2016
54bbab6
unstaged
May 28, 2016
c9446b4
unstaged
May 28, 2016
c0bdfd3
unstaged
May 28, 2016
4620f55
unstaged
May 28, 2016
f005463
unstaged
May 28, 2016
d9d2c06
unstaged
May 29, 2016
0b0f6b4
unstaged
May 29, 2016
8cf073a
unstaged
May 29, 2016
f407005
unstaged
May 29, 2016
a3622bb
unstaged
May 29, 2016
11bfe74
fix travis
May 29, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .cobra.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
author: Aeneas Rekkas <aeneas@ory.am>
license: Apache License Version 2.0
Empty file removed .coveralls.yml
Empty file.
2 changes: 2 additions & 0 deletions .docker-home/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!.gitignore
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor/
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ node_modules/
*.log
*.stackdump
.DS_Store
vendor/
.hydra.yml
cover.out
1 change: 0 additions & 1 deletion .godir

This file was deleted.

21 changes: 13 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,19 @@ go:
- 1.6

install:
- go get github.com/axw/gocov/gocov
- go get github.com/mattn/goveralls
- go get golang.org/x/tools/cmd/cover
- go get github.com/golang/lint/golint
- go get github.com/pierrre/gotestcover
- go get -t $(go list ./... | grep -v /vendor/)
- go get github.com/axw/gocov/gocov github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover
# Workaround for travis
- go get -t -v ./...
- go install github.com/ory-am/hydra
- git clone https://github.com/docker-library/official-images.git ~/official-images

script:
# - go vet -x ./...
- gotestcover -coverprofile="cover.out" -race -covermode="count" $(go list ./... | grep -v /vendor/)
- go test -bench=.* -run=nothing $(go list ./... | grep -v /vendor)
- go test -race $(go list ./... | grep -v /vendor | grep -v /cmd)
- gotestcover -coverprofile="cover.out" $(go list ./... | grep -v /vendor/)
- goveralls -coverprofile="cover.out"
- docker build -t hydra-travis-ci .
- docker run -d hydra-travis-ci
- $GOPATH/bin/hydra host --dangerous-auto-logon &
- sleep 2
- $GOPATH/bin/hydra token client --skip-tls-verify
12 changes: 12 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM golang:1.6

ADD . /go/src/github.com/ory-am/hydra
WORKDIR /go/src/github.com/ory-am/hydra

RUN go get github.com/Masterminds/glide
RUN glide install
RUN go install github.com/ory-am/hydra

ENTRYPOINT /go/bin/hydra host

EXPOSE 4444
12 changes: 12 additions & 0 deletions Dockerfile-dangerous
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM golang:1.6

ADD . /go/src/github.com/ory-am/hydra
WORKDIR /go/src/github.com/ory-am/hydra

RUN go get github.com/Masterminds/glide
RUN glide install
RUN go install github.com/ory-am/hydra

ENTRYPOINT sleep 5; /go/bin/hydra host --dangerous-auto-logon

EXPOSE 4444
206 changes: 0 additions & 206 deletions Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: hydra-host start
web: hydra host
Loading