diff --git a/.gitignore b/.gitignore index d43fc38..d133439 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ _testmain.go *.test *.prof gin-bin + +# C tags +tags diff --git a/README.md b/README.md index fb433ff..885abe9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![slumber](http://i.imgur.com/RXDVdB0.png)](https://github.com/sogko/slumber) -[![Build Status](https://drone.io/github.com/sogko/slumber/status.png)](https://drone.io/github.com/sogko/slumber/latest) -[![Coverage Status](https://coveralls.io/repos/sogko/slumber/badge.svg?branch=master)](https://coveralls.io/r/sogko/slumber?branch=master) +[![slumber](http://i.imgur.com/RXDVdB0.png)](https://github.com/grsouza/slumber) +[![Build Status](https://drone.io/github.com/grsouza/slumber/status.png)](https://drone.io/github.com/grsouza/slumber/latest) +[![Coverage Status](https://coveralls.io/repos/grsouza/slumber/badge.svg?branch=master)](https://coveralls.io/r/grsouza/slumber?branch=master) A complete example of a REST-ful API server in written in Go (golang). @@ -43,10 +43,10 @@ To run an instance of a server example: ```bash # get go-package and put it in your go-workspace -go get github.com/sogko/slumber +go get github.com/grsouza/slumber # go to package root folder -cd $GOPATH/src/github.com/sogko/slumber +cd $GOPATH/src/github.com/grsouza/slumber # install dependencies go get @@ -103,12 +103,12 @@ $GOPATH/bin/ginkgo watch -r -p -nodes=4 ``` ## Code coverage -Coveralls.io link: [https://coveralls.io/r/sogko/slumber] +Coveralls.io link: [https://coveralls.io/r/grsouza/slumber] To generate coverage profile ```bash -cd $GOPATH/src/github.com/sogko/slumber +cd $GOPATH/src/github.com/grsouza/slumber # run test recursively and generate coverage data for each package $GOPATH/bin/ginkgo -r -cover -p @@ -120,7 +120,7 @@ $GOPATH/bin/gover . slumber.coverprofile To view coverage ```bash -go tool cover -html=$GOPATH/src/github.com/sogko/slumber/slumber.coverprofile +go tool cover -html=$GOPATH/src/github.com/grsouza/slumber/slumber.coverprofile ``` ## Sessions Management diff --git a/domain/accept_headers_test.go b/domain/accept_headers_test.go index fcde6c8..371cb2f 100644 --- a/domain/accept_headers_test.go +++ b/domain/accept_headers_test.go @@ -4,7 +4,7 @@ import ( "fmt" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" ) var _ = Describe("AcceptHeaders Tests", func() { diff --git a/domain/access_controller_test.go b/domain/access_controller_test.go index bc34b23..386427a 100644 --- a/domain/access_controller_test.go +++ b/domain/access_controller_test.go @@ -3,7 +3,7 @@ package domain_test import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" "net/http" ) diff --git a/domain/domain.coverprofile b/domain/domain.coverprofile index ea73100..4ac8e03 100644 --- a/domain/domain.coverprofile +++ b/domain/domain.coverprofile @@ -1,35 +1,35 @@ mode: atomic -github.com/sogko/slumber/domain/access_controller.go:11.49,14.23 2 6 -github.com/sogko/slumber/domain/access_controller.go:17.2,17.29 1 6 -github.com/sogko/slumber/domain/access_controller.go:22.2,22.12 1 6 -github.com/sogko/slumber/domain/access_controller.go:14.23,16.3 1 6 -github.com/sogko/slumber/domain/access_controller.go:17.29,18.28 1 9 -github.com/sogko/slumber/domain/access_controller.go:18.28,20.4 1 9 -github.com/sogko/slumber/domain/middleware.go:9.94,11.2 1 1 -github.com/sogko/slumber/domain/middleware.go:15.99,17.2 1 1 -github.com/sogko/slumber/domain/middleware.go:21.120,23.2 1 1 -github.com/sogko/slumber/domain/routes.go:27.51,30.27 2 4 -github.com/sogko/slumber/domain/routes.go:33.2,33.33 1 4 -github.com/sogko/slumber/domain/routes.go:38.2,38.12 1 4 -github.com/sogko/slumber/domain/routes.go:30.27,32.3 1 5 -github.com/sogko/slumber/domain/routes.go:33.33,34.34 1 5 -github.com/sogko/slumber/domain/routes.go:34.34,36.4 1 5 -github.com/sogko/slumber/domain/accept_headers.go:28.59,33.47 2 12 -github.com/sogko/slumber/domain/accept_headers.go:78.2,80.42 3 12 -github.com/sogko/slumber/domain/accept_headers.go:92.2,92.16 1 12 -github.com/sogko/slumber/domain/accept_headers.go:33.47,44.53 6 15 -github.com/sogko/slumber/domain/accept_headers.go:58.3,59.22 2 15 -github.com/sogko/slumber/domain/accept_headers.go:64.3,70.43 5 12 -github.com/sogko/slumber/domain/accept_headers.go:75.3,75.19 1 12 -github.com/sogko/slumber/domain/accept_headers.go:44.53,46.45 2 9 -github.com/sogko/slumber/domain/accept_headers.go:46.45,48.20 2 12 -github.com/sogko/slumber/domain/accept_headers.go:51.5,51.19 1 12 -github.com/sogko/slumber/domain/accept_headers.go:48.20,50.6 1 1 -github.com/sogko/slumber/domain/accept_headers.go:51.19,53.6 1 11 -github.com/sogko/slumber/domain/accept_headers.go:59.22,61.4 1 3 -github.com/sogko/slumber/domain/accept_headers.go:70.43,73.4 2 5 -github.com/sogko/slumber/domain/accept_headers.go:80.42,83.41 3 15 -github.com/sogko/slumber/domain/accept_headers.go:90.3,90.36 1 15 -github.com/sogko/slumber/domain/accept_headers.go:83.41,85.18 2 6 -github.com/sogko/slumber/domain/accept_headers.go:88.4,88.28 1 6 -github.com/sogko/slumber/domain/accept_headers.go:85.18,87.5 1 1 +github.com/grsouza/slumber/domain/access_controller.go:11.49,14.23 2 6 +github.com/grsouza/slumber/domain/access_controller.go:17.2,17.29 1 6 +github.com/grsouza/slumber/domain/access_controller.go:22.2,22.12 1 6 +github.com/grsouza/slumber/domain/access_controller.go:14.23,16.3 1 6 +github.com/grsouza/slumber/domain/access_controller.go:17.29,18.28 1 9 +github.com/grsouza/slumber/domain/access_controller.go:18.28,20.4 1 9 +github.com/grsouza/slumber/domain/middleware.go:9.94,11.2 1 1 +github.com/grsouza/slumber/domain/middleware.go:15.99,17.2 1 1 +github.com/grsouza/slumber/domain/middleware.go:21.120,23.2 1 1 +github.com/grsouza/slumber/domain/routes.go:27.51,30.27 2 4 +github.com/grsouza/slumber/domain/routes.go:33.2,33.33 1 4 +github.com/grsouza/slumber/domain/routes.go:38.2,38.12 1 4 +github.com/grsouza/slumber/domain/routes.go:30.27,32.3 1 5 +github.com/grsouza/slumber/domain/routes.go:33.33,34.34 1 5 +github.com/grsouza/slumber/domain/routes.go:34.34,36.4 1 5 +github.com/grsouza/slumber/domain/accept_headers.go:28.59,33.47 2 12 +github.com/grsouza/slumber/domain/accept_headers.go:78.2,80.42 3 12 +github.com/grsouza/slumber/domain/accept_headers.go:92.2,92.16 1 12 +github.com/grsouza/slumber/domain/accept_headers.go:33.47,44.53 6 15 +github.com/grsouza/slumber/domain/accept_headers.go:58.3,59.22 2 15 +github.com/grsouza/slumber/domain/accept_headers.go:64.3,70.43 5 12 +github.com/grsouza/slumber/domain/accept_headers.go:75.3,75.19 1 12 +github.com/grsouza/slumber/domain/accept_headers.go:44.53,46.45 2 9 +github.com/grsouza/slumber/domain/accept_headers.go:46.45,48.20 2 12 +github.com/grsouza/slumber/domain/accept_headers.go:51.5,51.19 1 12 +github.com/grsouza/slumber/domain/accept_headers.go:48.20,50.6 1 1 +github.com/grsouza/slumber/domain/accept_headers.go:51.19,53.6 1 11 +github.com/grsouza/slumber/domain/accept_headers.go:59.22,61.4 1 3 +github.com/grsouza/slumber/domain/accept_headers.go:70.43,73.4 2 5 +github.com/grsouza/slumber/domain/accept_headers.go:80.42,83.41 3 15 +github.com/grsouza/slumber/domain/accept_headers.go:90.3,90.36 1 15 +github.com/grsouza/slumber/domain/accept_headers.go:83.41,85.18 2 6 +github.com/grsouza/slumber/domain/accept_headers.go:88.4,88.28 1 6 +github.com/grsouza/slumber/domain/accept_headers.go:85.18,87.5 1 1 diff --git a/domain/middleware_test.go b/domain/middleware_test.go index a4ed502..56a7352 100644 --- a/domain/middleware_test.go +++ b/domain/middleware_test.go @@ -3,8 +3,8 @@ package domain_test import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sogko/slumber/domain" - "github.com/sogko/slumber/middlewares/context" + "github.com/grsouza/slumber/domain" + "github.com/grsouza/slumber/middlewares/context" "net/http" "net/http/httptest" ) diff --git a/domain/routes_test.go b/domain/routes_test.go index b2871ed..257cf79 100644 --- a/domain/routes_test.go +++ b/domain/routes_test.go @@ -3,7 +3,7 @@ package domain_test import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" ) var _ = Describe("Routes Tests", func() { diff --git a/main.go b/main.go index e105a27..a51ab0a 100644 --- a/main.go +++ b/main.go @@ -3,14 +3,16 @@ package main import ( "errors" "fmt" - "github.com/sogko/slumber-sessions" - "github.com/sogko/slumber-users" - "github.com/sogko/slumber/middlewares/context" - "github.com/sogko/slumber/middlewares/mongodb" - "github.com/sogko/slumber/middlewares/renderer" - "github.com/sogko/slumber/server" "io/ioutil" "time" + + jwt "github.com/dgrijalva/jwt-go" + "github.com/grsouza/slumber-sessions" + "github.com/grsouza/slumber-users" + "github.com/grsouza/slumber/middlewares/context" + "github.com/grsouza/slumber/middlewares/mongodb" + "github.com/grsouza/slumber/middlewares/renderer" + "github.com/grsouza/slumber/server" ) func main() { @@ -26,6 +28,17 @@ func main() { panic(errors.New(fmt.Sprintf("Error loading public signing key: %v", err.Error()))) } + // Casting keys loaded to proper type + privateKey, err := jwt.ParseRSAPrivateKeyFromPEM(privateSigningKey) + if err != nil { + panic(errors.New(fmt.Sprintf("Error parsing private key: %v", err.Error()))) + } + + publicKey, err := jwt.ParseRSAPublicKeyFromPEM(publicSigningKey) + if err != nil { + panic(errors.New(fmt.Sprintf("Error parsing public key: %v", err.Error()))) + } + // create current project context ctx := context.New() @@ -49,8 +62,8 @@ func main() { // set up sessions resource sessionsResource := sessions.NewResource(ctx, &sessions.Options{ - PrivateSigningKey: privateSigningKey, - PublicSigningKey: publicSigningKey, + PrivateSigningKey: privateKey, + PublicSigningKey: publicKey, Database: db, Renderer: renderer, UserRepositoryFactory: usersResource.UserRepositoryFactory, @@ -76,6 +89,6 @@ func main() { // bam! s.Run(":3001", server.Options{ - Timeout: 10*time.Second, + Timeout: 10 * time.Second, }) } diff --git a/middlewares/context/context.go b/middlewares/context/context.go index 1c76490..afc7be2 100644 --- a/middlewares/context/context.go +++ b/middlewares/context/context.go @@ -2,7 +2,7 @@ package context import ( "github.com/gorilla/context" - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" "net/http" ) diff --git a/middlewares/mongodb/mongodb.go b/middlewares/mongodb/mongodb.go index ba6bb71..7b39790 100644 --- a/middlewares/mongodb/mongodb.go +++ b/middlewares/mongodb/mongodb.go @@ -1,7 +1,7 @@ package mongodb import ( - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" "gopkg.in/mgo.v2" "net/http" "time" diff --git a/middlewares/renderer/renderer.go b/middlewares/renderer/renderer.go index c51687c..38c3b0f 100644 --- a/middlewares/renderer/renderer.go +++ b/middlewares/renderer/renderer.go @@ -1,7 +1,7 @@ package renderer import ( - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" "github.com/unrolled/render" "net/http" ) diff --git a/server/access_controller.go b/server/access_controller.go index 53c69d6..527113d 100644 --- a/server/access_controller.go +++ b/server/access_controller.go @@ -1,8 +1,8 @@ package server import ( - // "github.com/sogko/slumber/controllers" - "github.com/sogko/slumber/domain" + // "github.com/grsouza/slumber/controllers" + "github.com/grsouza/slumber/domain" "net/http" ) diff --git a/server/access_controller_test.go b/server/access_controller_test.go index 8e328f7..6a2b897 100644 --- a/server/access_controller_test.go +++ b/server/access_controller_test.go @@ -3,11 +3,11 @@ package server_test import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sogko/slumber-users" - "github.com/sogko/slumber/domain" - "github.com/sogko/slumber/middlewares/context" - "github.com/sogko/slumber/middlewares/renderer" - "github.com/sogko/slumber/server" + "github.com/grsouza/slumber-users" + "github.com/grsouza/slumber/domain" + "github.com/grsouza/slumber/middlewares/context" + "github.com/grsouza/slumber/middlewares/renderer" + "github.com/grsouza/slumber/server" "gopkg.in/mgo.v2/bson" "net/http" "net/http/httptest" diff --git a/server/router.go b/server/router.go index edbe2ce..4ef1c12 100644 --- a/server/router.go +++ b/server/router.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" "github.com/gorilla/mux" - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" "net/http" ) diff --git a/server/router_test.go b/server/router_test.go index 95f795f..3d592c1 100644 --- a/server/router_test.go +++ b/server/router_test.go @@ -1,15 +1,16 @@ package server_test import ( - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - "github.com/sogko/slumber/domain" - "github.com/sogko/slumber/middlewares/context" - "github.com/sogko/slumber/middlewares/renderer" - "github.com/sogko/slumber/server" - "github.com/sogko/slumber/test_helpers" "net/http" "net/http/httptest" + + "github.com/grsouza/slumber/domain" + "github.com/grsouza/slumber/middlewares/context" + "github.com/grsouza/slumber/middlewares/renderer" + "github.com/grsouza/slumber/server" + "github.com/grsouza/slumber/test_helpers" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Router", func() { @@ -64,7 +65,6 @@ var _ = Describe("Router", func() { Context("when user does not specify API version", func() { It("should use default API version", func() { - request, _ = http.NewRequest("GET", "/api/test", nil) s.ServeHTTP(recorder, request) bodyJSON = test_helpers.MapFromJSON(recorder.Body.Bytes()) diff --git a/server/server.coverprofile b/server/server.coverprofile index 9df5513..3519321 100644 --- a/server/server.coverprofile +++ b/server/server.coverprofile @@ -1,47 +1,47 @@ mode: atomic -github.com/sogko/slumber/server/access_controller.go:17.92,19.2 1 15 -github.com/sogko/slumber/server/access_controller.go:28.56,30.2 1 16 -github.com/sogko/slumber/server/access_controller.go:32.86,34.2 1 12 -github.com/sogko/slumber/server/access_controller.go:36.59,39.2 2 3 -github.com/sogko/slumber/server/access_controller.go:41.142,43.15 2 9 -github.com/sogko/slumber/server/access_controller.go:48.2,49.19 2 8 -github.com/sogko/slumber/server/access_controller.go:52.2,52.24 1 8 -github.com/sogko/slumber/server/access_controller.go:43.15,46.3 1 1 -github.com/sogko/slumber/server/access_controller.go:49.19,51.3 1 8 -github.com/sogko/slumber/server/access_controller.go:55.102,57.56 1 3 -github.com/sogko/slumber/server/access_controller.go:57.56,63.14 3 5 -github.com/sogko/slumber/server/access_controller.go:71.3,71.15 1 2 -github.com/sogko/slumber/server/access_controller.go:63.14,69.4 2 3 -github.com/sogko/slumber/server/router.go:20.164,21.58 1 20 -github.com/sogko/slumber/server/router.go:21.58,26.35 3 7 -github.com/sogko/slumber/server/router.go:45.3,45.16 1 7 -github.com/sogko/slumber/server/router.go:50.3,50.14 1 7 -github.com/sogko/slumber/server/router.go:26.35,29.81 2 7 -github.com/sogko/slumber/server/router.go:34.4,35.19 2 4 -github.com/sogko/slumber/server/router.go:38.4,38.79 1 3 -github.com/sogko/slumber/server/router.go:29.81,30.13 1 3 -github.com/sogko/slumber/server/router.go:35.19,36.13 1 1 -github.com/sogko/slumber/server/router.go:38.79,41.10 2 1 -github.com/sogko/slumber/server/router.go:45.16,47.4 1 1 -github.com/sogko/slumber/server/router.go:47.4,49.4 1 6 -github.com/sogko/slumber/server/router.go:55.74,59.2 2 11 -github.com/sogko/slumber/server/router.go:61.64,62.19 1 11 -github.com/sogko/slumber/server/router.go:65.2,65.32 1 10 -github.com/sogko/slumber/server/router.go:85.2,85.15 1 9 -github.com/sogko/slumber/server/router.go:62.19,64.3 1 1 -github.com/sogko/slumber/server/router.go:65.32,70.10 2 21 -github.com/sogko/slumber/server/router.go:76.3,81.23 2 20 -github.com/sogko/slumber/server/router.go:70.10,75.4 1 1 -github.com/sogko/slumber/server/router.go:81.23,83.4 1 12 -github.com/sogko/slumber/server/router.go:88.75,89.37 1 3 -github.com/sogko/slumber/server/router.go:97.2,97.15 1 2 -github.com/sogko/slumber/server/router.go:89.37,90.31 1 4 -github.com/sogko/slumber/server/router.go:95.3,95.38 1 3 -github.com/sogko/slumber/server/router.go:90.31,94.4 1 1 -github.com/sogko/slumber/server/server.go:30.41,38.2 3 7 -github.com/sogko/slumber/server/server.go:40.71,44.2 2 1 -github.com/sogko/slumber/server/server.go:46.85,51.2 2 8 -github.com/sogko/slumber/server/server.go:53.52,57.2 2 7 -github.com/sogko/slumber/server/server.go:59.69,67.2 4 1 -github.com/sogko/slumber/server/server.go:69.25,71.2 1 1 -github.com/sogko/slumber/server/server.go:73.76,76.2 2 7 +github.com/grsouza/slumber/server/access_controller.go:17.92,19.2 1 15 +github.com/grsouza/slumber/server/access_controller.go:28.56,30.2 1 16 +github.com/grsouza/slumber/server/access_controller.go:32.86,34.2 1 12 +github.com/grsouza/slumber/server/access_controller.go:36.59,39.2 2 3 +github.com/grsouza/slumber/server/access_controller.go:41.142,43.15 2 9 +github.com/grsouza/slumber/server/access_controller.go:48.2,49.19 2 8 +github.com/grsouza/slumber/server/access_controller.go:52.2,52.24 1 8 +github.com/grsouza/slumber/server/access_controller.go:43.15,46.3 1 1 +github.com/grsouza/slumber/server/access_controller.go:49.19,51.3 1 8 +github.com/grsouza/slumber/server/access_controller.go:55.102,57.56 1 3 +github.com/grsouza/slumber/server/access_controller.go:57.56,63.14 3 5 +github.com/grsouza/slumber/server/access_controller.go:71.3,71.15 1 2 +github.com/grsouza/slumber/server/access_controller.go:63.14,69.4 2 3 +github.com/grsouza/slumber/server/router.go:20.164,21.58 1 20 +github.com/grsouza/slumber/server/router.go:21.58,26.35 3 7 +github.com/grsouza/slumber/server/router.go:45.3,45.16 1 7 +github.com/grsouza/slumber/server/router.go:50.3,50.14 1 7 +github.com/grsouza/slumber/server/router.go:26.35,29.81 2 7 +github.com/grsouza/slumber/server/router.go:34.4,35.19 2 4 +github.com/grsouza/slumber/server/router.go:38.4,38.79 1 3 +github.com/grsouza/slumber/server/router.go:29.81,30.13 1 3 +github.com/grsouza/slumber/server/router.go:35.19,36.13 1 1 +github.com/grsouza/slumber/server/router.go:38.79,41.10 2 1 +github.com/grsouza/slumber/server/router.go:45.16,47.4 1 1 +github.com/grsouza/slumber/server/router.go:47.4,49.4 1 6 +github.com/grsouza/slumber/server/router.go:55.74,59.2 2 11 +github.com/grsouza/slumber/server/router.go:61.64,62.19 1 11 +github.com/grsouza/slumber/server/router.go:65.2,65.32 1 10 +github.com/grsouza/slumber/server/router.go:85.2,85.15 1 9 +github.com/grsouza/slumber/server/router.go:62.19,64.3 1 1 +github.com/grsouza/slumber/server/router.go:65.32,70.10 2 21 +github.com/grsouza/slumber/server/router.go:76.3,81.23 2 20 +github.com/grsouza/slumber/server/router.go:70.10,75.4 1 1 +github.com/grsouza/slumber/server/router.go:81.23,83.4 1 12 +github.com/grsouza/slumber/server/router.go:88.75,89.37 1 3 +github.com/grsouza/slumber/server/router.go:97.2,97.15 1 2 +github.com/grsouza/slumber/server/router.go:89.37,90.31 1 4 +github.com/grsouza/slumber/server/router.go:95.3,95.38 1 3 +github.com/grsouza/slumber/server/router.go:90.31,94.4 1 1 +github.com/grsouza/slumber/server/server.go:30.41,38.2 3 7 +github.com/grsouza/slumber/server/server.go:40.71,44.2 2 1 +github.com/grsouza/slumber/server/server.go:46.85,51.2 2 8 +github.com/grsouza/slumber/server/server.go:53.52,57.2 2 7 +github.com/grsouza/slumber/server/server.go:59.69,67.2 4 1 +github.com/grsouza/slumber/server/server.go:69.25,71.2 1 1 +github.com/grsouza/slumber/server/server.go:73.76,76.2 2 7 diff --git a/server/server.go b/server/server.go index edbe88a..69bffd7 100644 --- a/server/server.go +++ b/server/server.go @@ -3,7 +3,7 @@ package server import ( "github.com/codegangsta/negroni" "github.com/gorilla/context" - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" "gopkg.in/tylerb/graceful.v1" "net/http" "time" diff --git a/server/server_test.go b/server/server_test.go index 6e1dfa8..668508f 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -3,18 +3,20 @@ package server_test import ( "errors" "fmt" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - "github.com/sogko/slumber-sessions" - "github.com/sogko/slumber-users" - "github.com/sogko/slumber/middlewares/context" - "github.com/sogko/slumber/middlewares/mongodb" - "github.com/sogko/slumber/middlewares/renderer" - "github.com/sogko/slumber/server" "io/ioutil" "net/http" "net/http/httptest" "time" + + jwt "github.com/dgrijalva/jwt-go" + "github.com/grsouza/slumber-sessions" + "github.com/grsouza/slumber-users" + "github.com/grsouza/slumber/middlewares/context" + "github.com/grsouza/slumber/middlewares/mongodb" + "github.com/grsouza/slumber/middlewares/renderer" + "github.com/grsouza/slumber/server" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) var _ = Describe("Server", func() { @@ -29,6 +31,17 @@ var _ = Describe("Server", func() { panic(errors.New(fmt.Sprintf("Error loading public signing key: %v", err.Error()))) } + // Casting keys loaded to proper type + privateKey, err := jwt.ParseRSAPrivateKeyFromPEM(privateSigningKey) + if err != nil { + panic(errors.New(fmt.Sprintf("Error parsing private key: %v", err.Error()))) + } + + publicKey, err := jwt.ParseRSAPublicKeyFromPEM(publicSigningKey) + if err != nil { + panic(errors.New(fmt.Sprintf("Error parsing public key: %v", err.Error()))) + } + Describe("Basic sanity test", func() { ctx := context.New() @@ -53,8 +66,8 @@ var _ = Describe("Server", func() { sessionsResource := sessions.NewResource(ctx, &sessions.Options{ Database: db, Renderer: renderer, - PrivateSigningKey: privateSigningKey, - PublicSigningKey: publicSigningKey, + PrivateSigningKey: privateKey, + PublicSigningKey: publicKey, UserRepositoryFactory: usersResource.UserRepositoryFactory, }) @@ -81,7 +94,7 @@ var _ = Describe("Server", func() { It("should serve request", func() { // run server and it shouldn't panic go s.Run(":8001", server.Options{ - Timeout: 1*time.Millisecond, + Timeout: 1 * time.Millisecond, }) time.Sleep(100 * time.Millisecond) diff --git a/slumber.coverprofile b/slumber.coverprofile index 5e584a8..4b55ff0 100644 --- a/slumber.coverprofile +++ b/slumber.coverprofile @@ -1,130 +1,130 @@ mode: atomic -github.com/sogko/slumber/domain/access_controller.go:11.49,14.23 2 6 -github.com/sogko/slumber/domain/access_controller.go:17.2,17.29 1 6 -github.com/sogko/slumber/domain/access_controller.go:22.2,22.12 1 6 -github.com/sogko/slumber/domain/access_controller.go:14.23,16.3 1 6 -github.com/sogko/slumber/domain/access_controller.go:17.29,18.28 1 9 -github.com/sogko/slumber/domain/access_controller.go:18.28,20.4 1 9 -github.com/sogko/slumber/domain/middleware.go:9.94,11.2 1 1 -github.com/sogko/slumber/domain/middleware.go:15.99,17.2 1 1 -github.com/sogko/slumber/domain/middleware.go:21.120,23.2 1 1 -github.com/sogko/slumber/domain/routes.go:27.51,30.27 2 4 -github.com/sogko/slumber/domain/routes.go:33.2,33.33 1 4 -github.com/sogko/slumber/domain/routes.go:38.2,38.12 1 4 -github.com/sogko/slumber/domain/routes.go:30.27,32.3 1 5 -github.com/sogko/slumber/domain/routes.go:33.33,34.34 1 5 -github.com/sogko/slumber/domain/routes.go:34.34,36.4 1 5 -github.com/sogko/slumber/domain/accept_headers.go:28.59,33.47 2 12 -github.com/sogko/slumber/domain/accept_headers.go:78.2,80.42 3 12 -github.com/sogko/slumber/domain/accept_headers.go:92.2,92.16 1 12 -github.com/sogko/slumber/domain/accept_headers.go:33.47,44.53 6 15 -github.com/sogko/slumber/domain/accept_headers.go:58.3,59.22 2 15 -github.com/sogko/slumber/domain/accept_headers.go:64.3,70.43 5 12 -github.com/sogko/slumber/domain/accept_headers.go:75.3,75.19 1 12 -github.com/sogko/slumber/domain/accept_headers.go:44.53,46.45 2 9 -github.com/sogko/slumber/domain/accept_headers.go:46.45,48.20 2 12 -github.com/sogko/slumber/domain/accept_headers.go:51.5,51.19 1 12 -github.com/sogko/slumber/domain/accept_headers.go:48.20,50.6 1 1 -github.com/sogko/slumber/domain/accept_headers.go:51.19,53.6 1 11 -github.com/sogko/slumber/domain/accept_headers.go:59.22,61.4 1 3 -github.com/sogko/slumber/domain/accept_headers.go:70.43,73.4 2 5 -github.com/sogko/slumber/domain/accept_headers.go:80.42,83.41 3 15 -github.com/sogko/slumber/domain/accept_headers.go:90.3,90.36 1 15 -github.com/sogko/slumber/domain/accept_headers.go:83.41,85.18 2 6 -github.com/sogko/slumber/domain/accept_headers.go:88.4,88.28 1 6 -github.com/sogko/slumber/domain/accept_headers.go:85.18,87.5 1 1 -github.com/sogko/slumber/server/access_controller.go:17.92,19.2 1 15 -github.com/sogko/slumber/server/access_controller.go:28.56,30.2 1 16 -github.com/sogko/slumber/server/access_controller.go:32.86,34.2 1 12 -github.com/sogko/slumber/server/access_controller.go:36.59,39.2 2 3 -github.com/sogko/slumber/server/access_controller.go:41.142,43.15 2 9 -github.com/sogko/slumber/server/access_controller.go:48.2,49.19 2 8 -github.com/sogko/slumber/server/access_controller.go:52.2,52.24 1 8 -github.com/sogko/slumber/server/access_controller.go:43.15,46.3 1 1 -github.com/sogko/slumber/server/access_controller.go:49.19,51.3 1 8 -github.com/sogko/slumber/server/access_controller.go:55.102,57.56 1 3 -github.com/sogko/slumber/server/access_controller.go:57.56,63.14 3 5 -github.com/sogko/slumber/server/access_controller.go:71.3,71.15 1 2 -github.com/sogko/slumber/server/access_controller.go:63.14,69.4 2 3 -github.com/sogko/slumber/server/router.go:20.164,21.58 1 20 -github.com/sogko/slumber/server/router.go:21.58,26.35 3 7 -github.com/sogko/slumber/server/router.go:45.3,45.16 1 7 -github.com/sogko/slumber/server/router.go:50.3,50.14 1 7 -github.com/sogko/slumber/server/router.go:26.35,29.81 2 7 -github.com/sogko/slumber/server/router.go:34.4,35.19 2 4 -github.com/sogko/slumber/server/router.go:38.4,38.79 1 3 -github.com/sogko/slumber/server/router.go:29.81,30.13 1 3 -github.com/sogko/slumber/server/router.go:35.19,36.13 1 1 -github.com/sogko/slumber/server/router.go:38.79,41.10 2 1 -github.com/sogko/slumber/server/router.go:45.16,47.4 1 1 -github.com/sogko/slumber/server/router.go:47.4,49.4 1 6 -github.com/sogko/slumber/server/router.go:55.74,59.2 2 11 -github.com/sogko/slumber/server/router.go:61.64,62.19 1 11 -github.com/sogko/slumber/server/router.go:65.2,65.32 1 10 -github.com/sogko/slumber/server/router.go:85.2,85.15 1 9 -github.com/sogko/slumber/server/router.go:62.19,64.3 1 1 -github.com/sogko/slumber/server/router.go:65.32,70.10 2 21 -github.com/sogko/slumber/server/router.go:76.3,81.23 2 20 -github.com/sogko/slumber/server/router.go:70.10,75.4 1 1 -github.com/sogko/slumber/server/router.go:81.23,83.4 1 12 -github.com/sogko/slumber/server/router.go:88.75,89.37 1 3 -github.com/sogko/slumber/server/router.go:97.2,97.15 1 2 -github.com/sogko/slumber/server/router.go:89.37,90.31 1 4 -github.com/sogko/slumber/server/router.go:95.3,95.38 1 3 -github.com/sogko/slumber/server/router.go:90.31,94.4 1 1 -github.com/sogko/slumber/server/server.go:30.41,38.2 3 7 -github.com/sogko/slumber/server/server.go:40.71,44.2 2 1 -github.com/sogko/slumber/server/server.go:46.85,51.2 2 8 -github.com/sogko/slumber/server/server.go:53.52,57.2 2 7 -github.com/sogko/slumber/server/server.go:59.69,67.2 4 1 -github.com/sogko/slumber/server/server.go:69.25,71.2 1 1 -github.com/sogko/slumber/server/server.go:73.76,76.2 2 7 -github.com/sogko/slumber/test_helpers/test_helpers.go:24.107,26.2 1 9 -github.com/sogko/slumber/test_helpers/test_helpers.go:34.57,36.2 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:37.55,38.40 1 14 -github.com/sogko/slumber/test_helpers/test_helpers.go:41.2,62.3 1 13 -github.com/sogko/slumber/test_helpers/test_helpers.go:38.40,40.3 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:64.107,66.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:67.97,69.2 1 5 -github.com/sogko/slumber/test_helpers/test_helpers.go:70.88,74.2 1 3 -github.com/sogko/slumber/test_helpers/test_helpers.go:75.89,79.16 4 2 -github.com/sogko/slumber/test_helpers/test_helpers.go:84.2,87.4 1 2 -github.com/sogko/slumber/test_helpers/test_helpers.go:79.16,83.3 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:90.56,92.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:97.136,99.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:101.42,103.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:108.108,110.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:115.54,118.16 3 2 -github.com/sogko/slumber/test_helpers/test_helpers.go:121.2,121.40 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:118.16,120.3 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:127.107,130.16 3 8 -github.com/sogko/slumber/test_helpers/test_helpers.go:133.2,133.12 1 7 -github.com/sogko/slumber/test_helpers/test_helpers.go:130.16,132.3 1 1 -github.com/sogko/slumber/test_helpers/test_server.go:43.60,48.15 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:55.2,64.29 4 6 -github.com/sogko/slumber/test_helpers/test_server.go:73.2,74.14 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:81.2,88.45 4 6 -github.com/sogko/slumber/test_helpers/test_server.go:93.2,93.49 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:98.2,98.12 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:48.15,53.3 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:64.29,70.3 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:74.14,78.3 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:88.45,90.3 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:93.49,96.3 1 18 -github.com/sogko/slumber/test_helpers/test_server.go:101.67,102.37 1 12 -github.com/sogko/slumber/test_helpers/test_server.go:102.37,104.3 1 12 -github.com/sogko/slumber/test_helpers/test_server.go:106.66,107.41 1 19 -github.com/sogko/slumber/test_helpers/test_server.go:107.41,108.33 1 19 -github.com/sogko/slumber/test_helpers/test_server.go:109.3,110.60 1 7 -github.com/sogko/slumber/test_helpers/test_server.go:111.3,112.74 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:113.3,114.50 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:118.170,125.17 3 6 -github.com/sogko/slumber/test_helpers/test_server.go:132.2,134.24 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:137.2,137.32 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:150.2,151.49 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:125.17,128.3 2 2 -github.com/sogko/slumber/test_helpers/test_server.go:128.3,130.3 1 4 -github.com/sogko/slumber/test_helpers/test_server.go:134.24,136.3 1 3 -github.com/sogko/slumber/test_helpers/test_server.go:137.32,143.3 2 1 -github.com/sogko/slumber/test_helpers/test_server.go:143.3,144.30 1 5 -github.com/sogko/slumber/test_helpers/test_server.go:144.30,146.4 1 2 +github.com/grsouza/slumber/domain/access_controller.go:11.49,14.23 2 6 +github.com/grsouza/slumber/domain/access_controller.go:17.2,17.29 1 6 +github.com/grsouza/slumber/domain/access_controller.go:22.2,22.12 1 6 +github.com/grsouza/slumber/domain/access_controller.go:14.23,16.3 1 6 +github.com/grsouza/slumber/domain/access_controller.go:17.29,18.28 1 9 +github.com/grsouza/slumber/domain/access_controller.go:18.28,20.4 1 9 +github.com/grsouza/slumber/domain/middleware.go:9.94,11.2 1 1 +github.com/grsouza/slumber/domain/middleware.go:15.99,17.2 1 1 +github.com/grsouza/slumber/domain/middleware.go:21.120,23.2 1 1 +github.com/grsouza/slumber/domain/routes.go:27.51,30.27 2 4 +github.com/grsouza/slumber/domain/routes.go:33.2,33.33 1 4 +github.com/grsouza/slumber/domain/routes.go:38.2,38.12 1 4 +github.com/grsouza/slumber/domain/routes.go:30.27,32.3 1 5 +github.com/grsouza/slumber/domain/routes.go:33.33,34.34 1 5 +github.com/grsouza/slumber/domain/routes.go:34.34,36.4 1 5 +github.com/grsouza/slumber/domain/accept_headers.go:28.59,33.47 2 12 +github.com/grsouza/slumber/domain/accept_headers.go:78.2,80.42 3 12 +github.com/grsouza/slumber/domain/accept_headers.go:92.2,92.16 1 12 +github.com/grsouza/slumber/domain/accept_headers.go:33.47,44.53 6 15 +github.com/grsouza/slumber/domain/accept_headers.go:58.3,59.22 2 15 +github.com/grsouza/slumber/domain/accept_headers.go:64.3,70.43 5 12 +github.com/grsouza/slumber/domain/accept_headers.go:75.3,75.19 1 12 +github.com/grsouza/slumber/domain/accept_headers.go:44.53,46.45 2 9 +github.com/grsouza/slumber/domain/accept_headers.go:46.45,48.20 2 12 +github.com/grsouza/slumber/domain/accept_headers.go:51.5,51.19 1 12 +github.com/grsouza/slumber/domain/accept_headers.go:48.20,50.6 1 1 +github.com/grsouza/slumber/domain/accept_headers.go:51.19,53.6 1 11 +github.com/grsouza/slumber/domain/accept_headers.go:59.22,61.4 1 3 +github.com/grsouza/slumber/domain/accept_headers.go:70.43,73.4 2 5 +github.com/grsouza/slumber/domain/accept_headers.go:80.42,83.41 3 15 +github.com/grsouza/slumber/domain/accept_headers.go:90.3,90.36 1 15 +github.com/grsouza/slumber/domain/accept_headers.go:83.41,85.18 2 6 +github.com/grsouza/slumber/domain/accept_headers.go:88.4,88.28 1 6 +github.com/grsouza/slumber/domain/accept_headers.go:85.18,87.5 1 1 +github.com/grsouza/slumber/server/access_controller.go:17.92,19.2 1 15 +github.com/grsouza/slumber/server/access_controller.go:28.56,30.2 1 16 +github.com/grsouza/slumber/server/access_controller.go:32.86,34.2 1 12 +github.com/grsouza/slumber/server/access_controller.go:36.59,39.2 2 3 +github.com/grsouza/slumber/server/access_controller.go:41.142,43.15 2 9 +github.com/grsouza/slumber/server/access_controller.go:48.2,49.19 2 8 +github.com/grsouza/slumber/server/access_controller.go:52.2,52.24 1 8 +github.com/grsouza/slumber/server/access_controller.go:43.15,46.3 1 1 +github.com/grsouza/slumber/server/access_controller.go:49.19,51.3 1 8 +github.com/grsouza/slumber/server/access_controller.go:55.102,57.56 1 3 +github.com/grsouza/slumber/server/access_controller.go:57.56,63.14 3 5 +github.com/grsouza/slumber/server/access_controller.go:71.3,71.15 1 2 +github.com/grsouza/slumber/server/access_controller.go:63.14,69.4 2 3 +github.com/grsouza/slumber/server/router.go:20.164,21.58 1 20 +github.com/grsouza/slumber/server/router.go:21.58,26.35 3 7 +github.com/grsouza/slumber/server/router.go:45.3,45.16 1 7 +github.com/grsouza/slumber/server/router.go:50.3,50.14 1 7 +github.com/grsouza/slumber/server/router.go:26.35,29.81 2 7 +github.com/grsouza/slumber/server/router.go:34.4,35.19 2 4 +github.com/grsouza/slumber/server/router.go:38.4,38.79 1 3 +github.com/grsouza/slumber/server/router.go:29.81,30.13 1 3 +github.com/grsouza/slumber/server/router.go:35.19,36.13 1 1 +github.com/grsouza/slumber/server/router.go:38.79,41.10 2 1 +github.com/grsouza/slumber/server/router.go:45.16,47.4 1 1 +github.com/grsouza/slumber/server/router.go:47.4,49.4 1 6 +github.com/grsouza/slumber/server/router.go:55.74,59.2 2 11 +github.com/grsouza/slumber/server/router.go:61.64,62.19 1 11 +github.com/grsouza/slumber/server/router.go:65.2,65.32 1 10 +github.com/grsouza/slumber/server/router.go:85.2,85.15 1 9 +github.com/grsouza/slumber/server/router.go:62.19,64.3 1 1 +github.com/grsouza/slumber/server/router.go:65.32,70.10 2 21 +github.com/grsouza/slumber/server/router.go:76.3,81.23 2 20 +github.com/grsouza/slumber/server/router.go:70.10,75.4 1 1 +github.com/grsouza/slumber/server/router.go:81.23,83.4 1 12 +github.com/grsouza/slumber/server/router.go:88.75,89.37 1 3 +github.com/grsouza/slumber/server/router.go:97.2,97.15 1 2 +github.com/grsouza/slumber/server/router.go:89.37,90.31 1 4 +github.com/grsouza/slumber/server/router.go:95.3,95.38 1 3 +github.com/grsouza/slumber/server/router.go:90.31,94.4 1 1 +github.com/grsouza/slumber/server/server.go:30.41,38.2 3 7 +github.com/grsouza/slumber/server/server.go:40.71,44.2 2 1 +github.com/grsouza/slumber/server/server.go:46.85,51.2 2 8 +github.com/grsouza/slumber/server/server.go:53.52,57.2 2 7 +github.com/grsouza/slumber/server/server.go:59.69,67.2 4 1 +github.com/grsouza/slumber/server/server.go:69.25,71.2 1 1 +github.com/grsouza/slumber/server/server.go:73.76,76.2 2 7 +github.com/grsouza/slumber/test_helpers/test_helpers.go:24.107,26.2 1 9 +github.com/grsouza/slumber/test_helpers/test_helpers.go:34.57,36.2 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:37.55,38.40 1 14 +github.com/grsouza/slumber/test_helpers/test_helpers.go:41.2,62.3 1 13 +github.com/grsouza/slumber/test_helpers/test_helpers.go:38.40,40.3 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:64.107,66.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:67.97,69.2 1 5 +github.com/grsouza/slumber/test_helpers/test_helpers.go:70.88,74.2 1 3 +github.com/grsouza/slumber/test_helpers/test_helpers.go:75.89,79.16 4 2 +github.com/grsouza/slumber/test_helpers/test_helpers.go:84.2,87.4 1 2 +github.com/grsouza/slumber/test_helpers/test_helpers.go:79.16,83.3 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:90.56,92.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:97.136,99.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:101.42,103.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:108.108,110.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:115.54,118.16 3 2 +github.com/grsouza/slumber/test_helpers/test_helpers.go:121.2,121.40 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:118.16,120.3 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:127.107,130.16 3 8 +github.com/grsouza/slumber/test_helpers/test_helpers.go:133.2,133.12 1 7 +github.com/grsouza/slumber/test_helpers/test_helpers.go:130.16,132.3 1 1 +github.com/grsouza/slumber/test_helpers/test_server.go:43.60,48.15 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:55.2,64.29 4 6 +github.com/grsouza/slumber/test_helpers/test_server.go:73.2,74.14 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:81.2,88.45 4 6 +github.com/grsouza/slumber/test_helpers/test_server.go:93.2,93.49 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:98.2,98.12 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:48.15,53.3 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:64.29,70.3 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:74.14,78.3 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:88.45,90.3 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:93.49,96.3 1 18 +github.com/grsouza/slumber/test_helpers/test_server.go:101.67,102.37 1 12 +github.com/grsouza/slumber/test_helpers/test_server.go:102.37,104.3 1 12 +github.com/grsouza/slumber/test_helpers/test_server.go:106.66,107.41 1 19 +github.com/grsouza/slumber/test_helpers/test_server.go:107.41,108.33 1 19 +github.com/grsouza/slumber/test_helpers/test_server.go:109.3,110.60 1 7 +github.com/grsouza/slumber/test_helpers/test_server.go:111.3,112.74 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:113.3,114.50 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:118.170,125.17 3 6 +github.com/grsouza/slumber/test_helpers/test_server.go:132.2,134.24 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:137.2,137.32 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:150.2,151.49 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:125.17,128.3 2 2 +github.com/grsouza/slumber/test_helpers/test_server.go:128.3,130.3 1 4 +github.com/grsouza/slumber/test_helpers/test_server.go:134.24,136.3 1 3 +github.com/grsouza/slumber/test_helpers/test_server.go:137.32,143.3 2 1 +github.com/grsouza/slumber/test_helpers/test_server.go:143.3,144.30 1 5 +github.com/grsouza/slumber/test_helpers/test_server.go:144.30,146.4 1 2 diff --git a/test_helpers/test_helpers.coverprofile b/test_helpers/test_helpers.coverprofile index 9497b4f..31427d6 100644 --- a/test_helpers/test_helpers.coverprofile +++ b/test_helpers/test_helpers.coverprofile @@ -1,50 +1,50 @@ mode: atomic -github.com/sogko/slumber/test_helpers/test_helpers.go:24.107,26.2 1 9 -github.com/sogko/slumber/test_helpers/test_helpers.go:34.57,36.2 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:37.55,38.40 1 14 -github.com/sogko/slumber/test_helpers/test_helpers.go:41.2,62.3 1 13 -github.com/sogko/slumber/test_helpers/test_helpers.go:38.40,40.3 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:64.107,66.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:67.97,69.2 1 5 -github.com/sogko/slumber/test_helpers/test_helpers.go:70.88,74.2 1 3 -github.com/sogko/slumber/test_helpers/test_helpers.go:75.89,79.16 4 2 -github.com/sogko/slumber/test_helpers/test_helpers.go:84.2,87.4 1 2 -github.com/sogko/slumber/test_helpers/test_helpers.go:79.16,83.3 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:90.56,92.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:97.136,99.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:101.42,103.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:108.108,110.2 1 6 -github.com/sogko/slumber/test_helpers/test_helpers.go:115.54,118.16 3 2 -github.com/sogko/slumber/test_helpers/test_helpers.go:121.2,121.40 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:118.16,120.3 1 1 -github.com/sogko/slumber/test_helpers/test_helpers.go:127.107,130.16 3 8 -github.com/sogko/slumber/test_helpers/test_helpers.go:133.2,133.12 1 7 -github.com/sogko/slumber/test_helpers/test_helpers.go:130.16,132.3 1 1 -github.com/sogko/slumber/test_helpers/test_server.go:43.60,48.15 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:55.2,64.29 4 6 -github.com/sogko/slumber/test_helpers/test_server.go:73.2,74.14 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:81.2,88.45 4 6 -github.com/sogko/slumber/test_helpers/test_server.go:93.2,93.49 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:98.2,98.12 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:48.15,53.3 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:64.29,70.3 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:74.14,78.3 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:88.45,90.3 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:93.49,96.3 1 18 -github.com/sogko/slumber/test_helpers/test_server.go:101.67,102.37 1 12 -github.com/sogko/slumber/test_helpers/test_server.go:102.37,104.3 1 12 -github.com/sogko/slumber/test_helpers/test_server.go:106.66,107.41 1 19 -github.com/sogko/slumber/test_helpers/test_server.go:107.41,108.33 1 19 -github.com/sogko/slumber/test_helpers/test_server.go:109.3,110.60 1 7 -github.com/sogko/slumber/test_helpers/test_server.go:111.3,112.74 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:113.3,114.50 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:118.170,125.17 3 6 -github.com/sogko/slumber/test_helpers/test_server.go:132.2,134.24 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:137.2,137.32 1 6 -github.com/sogko/slumber/test_helpers/test_server.go:150.2,151.49 2 6 -github.com/sogko/slumber/test_helpers/test_server.go:125.17,128.3 2 2 -github.com/sogko/slumber/test_helpers/test_server.go:128.3,130.3 1 4 -github.com/sogko/slumber/test_helpers/test_server.go:134.24,136.3 1 3 -github.com/sogko/slumber/test_helpers/test_server.go:137.32,143.3 2 1 -github.com/sogko/slumber/test_helpers/test_server.go:143.3,144.30 1 5 -github.com/sogko/slumber/test_helpers/test_server.go:144.30,146.4 1 2 +github.com/grsouza/slumber/test_helpers/test_helpers.go:24.107,26.2 1 9 +github.com/grsouza/slumber/test_helpers/test_helpers.go:34.57,36.2 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:37.55,38.40 1 14 +github.com/grsouza/slumber/test_helpers/test_helpers.go:41.2,62.3 1 13 +github.com/grsouza/slumber/test_helpers/test_helpers.go:38.40,40.3 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:64.107,66.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:67.97,69.2 1 5 +github.com/grsouza/slumber/test_helpers/test_helpers.go:70.88,74.2 1 3 +github.com/grsouza/slumber/test_helpers/test_helpers.go:75.89,79.16 4 2 +github.com/grsouza/slumber/test_helpers/test_helpers.go:84.2,87.4 1 2 +github.com/grsouza/slumber/test_helpers/test_helpers.go:79.16,83.3 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:90.56,92.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:97.136,99.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:101.42,103.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:108.108,110.2 1 6 +github.com/grsouza/slumber/test_helpers/test_helpers.go:115.54,118.16 3 2 +github.com/grsouza/slumber/test_helpers/test_helpers.go:121.2,121.40 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:118.16,120.3 1 1 +github.com/grsouza/slumber/test_helpers/test_helpers.go:127.107,130.16 3 8 +github.com/grsouza/slumber/test_helpers/test_helpers.go:133.2,133.12 1 7 +github.com/grsouza/slumber/test_helpers/test_helpers.go:130.16,132.3 1 1 +github.com/grsouza/slumber/test_helpers/test_server.go:43.60,48.15 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:55.2,64.29 4 6 +github.com/grsouza/slumber/test_helpers/test_server.go:73.2,74.14 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:81.2,88.45 4 6 +github.com/grsouza/slumber/test_helpers/test_server.go:93.2,93.49 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:98.2,98.12 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:48.15,53.3 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:64.29,70.3 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:74.14,78.3 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:88.45,90.3 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:93.49,96.3 1 18 +github.com/grsouza/slumber/test_helpers/test_server.go:101.67,102.37 1 12 +github.com/grsouza/slumber/test_helpers/test_server.go:102.37,104.3 1 12 +github.com/grsouza/slumber/test_helpers/test_server.go:106.66,107.41 1 19 +github.com/grsouza/slumber/test_helpers/test_server.go:107.41,108.33 1 19 +github.com/grsouza/slumber/test_helpers/test_server.go:109.3,110.60 1 7 +github.com/grsouza/slumber/test_helpers/test_server.go:111.3,112.74 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:113.3,114.50 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:118.170,125.17 3 6 +github.com/grsouza/slumber/test_helpers/test_server.go:132.2,134.24 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:137.2,137.32 1 6 +github.com/grsouza/slumber/test_helpers/test_server.go:150.2,151.49 2 6 +github.com/grsouza/slumber/test_helpers/test_server.go:125.17,128.3 2 2 +github.com/grsouza/slumber/test_helpers/test_server.go:128.3,130.3 1 4 +github.com/grsouza/slumber/test_helpers/test_server.go:134.24,136.3 1 3 +github.com/grsouza/slumber/test_helpers/test_server.go:137.32,143.3 2 1 +github.com/grsouza/slumber/test_helpers/test_server.go:143.3,144.30 1 5 +github.com/grsouza/slumber/test_helpers/test_server.go:144.30,146.4 1 2 diff --git a/test_helpers/test_helpers.go b/test_helpers/test_helpers.go index 03881d4..fb1466c 100644 --- a/test_helpers/test_helpers.go +++ b/test_helpers/test_helpers.go @@ -9,7 +9,7 @@ import ( "net/http/httptest" "strings" - "github.com/sogko/slumber/domain" + "github.com/grsouza/slumber/domain" ) type TestRequestBody struct { diff --git a/test_helpers/test_helpers_suite_test.go b/test_helpers/test_helpers_suite_test.go index cd8e295..652898c 100644 --- a/test_helpers/test_helpers_suite_test.go +++ b/test_helpers/test_helpers_suite_test.go @@ -1,20 +1,23 @@ package test_helpers_test import ( + "crypto/rsa" "errors" "fmt" + "io/ioutil" + "testing" + + jwt "github.com/dgrijalva/jwt-go" . "github.com/onsi/ginkgo" "github.com/onsi/ginkgo/config" . "github.com/onsi/gomega" - "io/ioutil" - "testing" ) var TestDatabaseServerName = "localhost" var TestDatabaseName = "test_db" -var privateSigningKey []byte -var publicSigningKey []byte +var privateSigningKey *rsa.PrivateKey +var publicSigningKey *rsa.PublicKey func TestTestHelpers(t *testing.T) { RegisterFailHandler(Fail) @@ -26,12 +29,23 @@ var _ = BeforeSuite(func() { TestDatabaseName = fmt.Sprintf("test_db_node%v", config.GinkgoConfig.ParallelNode) var err error - privateSigningKey, err = ioutil.ReadFile("../keys/demo.rsa") + privateKey, err := ioutil.ReadFile("../keys/demo.rsa") if err != nil { panic(errors.New(fmt.Sprintf("Error loading private signing key: %v", err.Error()))) } - publicSigningKey, err = ioutil.ReadFile("../keys/demo.rsa.pub") + publicKey, err := ioutil.ReadFile("../keys/demo.rsa.pub") if err != nil { panic(errors.New(fmt.Sprintf("Error loading public signing key: %v", err.Error()))) } + + // Casting keys loaded to proper type + privateSigningKey, err = jwt.ParseRSAPrivateKeyFromPEM(privateKey) + if err != nil { + panic(errors.New(fmt.Sprintf("Error parsing private key: %v", err.Error()))) + } + + publicSigningKey, err = jwt.ParseRSAPublicKeyFromPEM(publicKey) + if err != nil { + panic(errors.New(fmt.Sprintf("Error parsing public key: %v", err.Error()))) + } }) diff --git a/test_helpers/test_helpers_test.go b/test_helpers/test_helpers_test.go index fd3a01a..c3c4e96 100644 --- a/test_helpers/test_helpers_test.go +++ b/test_helpers/test_helpers_test.go @@ -5,8 +5,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sogko/slumber/middlewares/context" - "github.com/sogko/slumber/test_helpers" + "github.com/grsouza/slumber/middlewares/context" + "github.com/grsouza/slumber/test_helpers" ) var _ = Describe("Test Helpers", func() { diff --git a/test_helpers/test_server.go b/test_helpers/test_server.go index 97fdb0c..6e610a6 100644 --- a/test_helpers/test_server.go +++ b/test_helpers/test_server.go @@ -2,23 +2,25 @@ package test_helpers import ( "bytes" + "crypto/rsa" "encoding/json" "fmt" - "github.com/sogko/slumber-sessions" - sessionsDomain "github.com/sogko/slumber-sessions/domain" - "github.com/sogko/slumber/domain" - "github.com/sogko/slumber/middlewares/context" - "github.com/sogko/slumber/middlewares/mongodb" - "github.com/sogko/slumber/middlewares/renderer" - "github.com/sogko/slumber/server" "net/http" "net/http/httptest" + + "github.com/grsouza/slumber-sessions" + sessionsDomain "github.com/grsouza/slumber-sessions/domain" + "github.com/grsouza/slumber/domain" + "github.com/grsouza/slumber/middlewares/context" + "github.com/grsouza/slumber/middlewares/mongodb" + "github.com/grsouza/slumber/middlewares/renderer" + "github.com/grsouza/slumber/server" ) type TestServerOptions struct { RequestAcceptHeader string - PrivateSigningKey []byte - PublicSigningKey []byte + PrivateSigningKey *rsa.PrivateKey + PublicSigningKey *rsa.PublicKey TokenAuthority sessionsDomain.ITokenAuthority Database domain.IDatabase Renderer domain.IRenderer diff --git a/test_helpers/test_server_test.go b/test_helpers/test_server_test.go index e06577b..f25a6f3 100644 --- a/test_helpers/test_server_test.go +++ b/test_helpers/test_server_test.go @@ -5,12 +5,12 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sogko/slumber-sessions" - "github.com/sogko/slumber-users" - "github.com/sogko/slumber/domain" - "github.com/sogko/slumber/middlewares/context" - "github.com/sogko/slumber/middlewares/renderer" - "github.com/sogko/slumber/test_helpers" + "github.com/grsouza/slumber-sessions" + "github.com/grsouza/slumber-users" + "github.com/grsouza/slumber/domain" + "github.com/grsouza/slumber/middlewares/context" + "github.com/grsouza/slumber/middlewares/renderer" + "github.com/grsouza/slumber/test_helpers" "gopkg.in/mgo.v2/bson" )