Skip to content

Commit

Permalink
Merge 7e101b2 into 7a25bc6
Browse files Browse the repository at this point in the history
  • Loading branch information
harture committed Aug 14, 2019
2 parents 7a25bc6 + 7e101b2 commit ea8fe6a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Expand Up @@ -27,7 +27,7 @@

[[constraint]]
name = "github.com/cloudtrust/common-service"
version = "1.0-rc4"
version = "1.0-rc5"

[[constraint]]
name = "github.com/cloudtrust/keycloak-client"
Expand Down
2 changes: 1 addition & 1 deletion api/management/swagger-api_management.yaml
@@ -1,7 +1,7 @@
openapi: 3.0.1
info:
title: Swagger Cloudtrust Management
description: 'Mangement API for Cloudtrust.'
description: 'Mangement API for Cloudtrust'
version: 1.0.0
servers:
- url: http://localhost:8888/management
Expand Down
12 changes: 12 additions & 0 deletions cmd/keycloakb/keycloak_bridge.go
Expand Up @@ -509,6 +509,10 @@ func main() {
// Version.
route.Handle("/", http.HandlerFunc(commonhttp.MakeVersionHandler(ComponentName, ComponentID, Version, Environment, GitCommit)))

// Rights
var rightsHandler = configureRightsHandler(ComponentName, ComponentID, idGenerator, authorizationManager, keycloakClient, audienceRequired, tracer, logger)
route.Path("/rights").Methods("GET").Handler(rightsHandler)

// Statistics
var getStatisticsHandler = configureEventsHandler(ComponentName, ComponentID, idGenerator, keycloakClient, audienceRequired, tracer, logger)(statisticsEndpoints.GetStatistics)
route.Path("/statistics/realms/{realm}").Methods("GET").Handler(getStatisticsHandler)
Expand Down Expand Up @@ -789,6 +793,14 @@ func configureManagementHandler(ComponentName string, ComponentID string, idGene
}
}

func configureRightsHandler(ComponentName string, ComponentID string, idGenerator idgenerator.IDGenerator, authorizationManager security.AuthorizationManager, keycloakClient *keycloak.Client, audienceRequired string, tracer tracing.OpentracingClient, logger log.Logger) http.Handler {
var handler http.Handler
handler = commonhttp.MakeRightsHandler(authorizationManager)
handler = middleware.MakeHTTPCorrelationIDMW(idGenerator, tracer, logger, ComponentName, ComponentID)(handler)
handler = middleware.MakeHTTPOIDCTokenValidationMW(keycloakClient, audienceRequired, logger)(handler)
return handler
}

func configureAccountHandler(ComponentName string, ComponentID string, idGenerator idgenerator.IDGenerator, keycloakClient *keycloak.Client, audienceRequired string, tracer tracing.OpentracingClient, logger log.Logger) func(endpoint endpoint.Endpoint) http.Handler {
return func(endpoint endpoint.Endpoint) http.Handler {
var handler http.Handler
Expand Down

0 comments on commit ea8fe6a

Please sign in to comment.