2020-03-24 14:15:01 +01:00
|
|
|
package server
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"net/http"
|
2020-07-08 13:56:37 +02:00
|
|
|
"strings"
|
2020-03-24 14:15:01 +01:00
|
|
|
|
|
|
|
"github.com/caos/logging"
|
2020-07-08 13:56:37 +02:00
|
|
|
grpc_util "github.com/caos/zitadel/internal/api/grpc"
|
2020-03-24 14:15:01 +01:00
|
|
|
client_middleware "github.com/caos/zitadel/internal/api/grpc/client/middleware"
|
|
|
|
http_util "github.com/caos/zitadel/internal/api/http"
|
|
|
|
http_mw "github.com/caos/zitadel/internal/api/http/middleware"
|
2020-12-02 08:50:59 +01:00
|
|
|
"github.com/caos/zitadel/internal/telemetry/tracing"
|
feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 10:30:11 +01:00
|
|
|
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
|
|
|
|
"google.golang.org/grpc"
|
2021-04-19 17:20:18 +02:00
|
|
|
"google.golang.org/protobuf/encoding/protojson"
|
2020-03-24 14:15:01 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
|
|
|
defaultGatewayPort = "8080"
|
|
|
|
mimeWildcard = "*/*"
|
|
|
|
)
|
|
|
|
|
|
|
|
var (
|
2021-04-19 17:20:18 +02:00
|
|
|
DefaultJSONMarshaler = &runtime.JSONPb{
|
|
|
|
UnmarshalOptions: protojson.UnmarshalOptions{
|
|
|
|
DiscardUnknown: true,
|
|
|
|
},
|
|
|
|
}
|
2020-03-24 14:15:01 +01:00
|
|
|
|
2020-07-08 13:56:37 +02:00
|
|
|
DefaultServeMuxOptions = func(customHeaders ...string) []runtime.ServeMuxOption {
|
|
|
|
return []runtime.ServeMuxOption{
|
feat: protos refactoring
* start with user
* user first try done in all services
* user, org, idp for discussion
* remove unused stuff
* bla
* dockerbuild
* rename search, get multiple to list...
* add annotation
* update proto dependencies
* update proto dependencies
* change proto imports
* replace all old imports
* fix go out
* remove unused lines
* correct protoc flags
* grpc and openapi flags
* go out source path relative
* -p
* remove dead code
* sourcepath relative
* ls
* is onenapi the problem?
* hobla
* authoption output
* wrong field name
* gopf
* correct option, add correct flags
* small improvments
* SIMPLYFY
* relative path
* gopf bin ich en tubel
* correct path
* default policies in admin
* grpc generation in one file
* remove non ascii
* metadata on manipulations
* correct auth_option import
* fixes
* larry
* idp provider to idp
* fix generate
* admin and auth nearly done
* admin and auth nearly done
* gen
* healthz
* imports
* deleted too much imports
* fix org
* add import
* imports
* import
* naming
* auth_opt
* gopf
* management
* imports
* _TYPE_UNSPECIFIED
* improts
* auth opts
* management policies
* imports
* passwordlessType to MFAType
* auth_opt
* add user grant calls
* add missing messages
* result
* fix option
* improvements
* ids
* fix http
* imports
* fixes
* fields
* body
* add fields
* remove wrong member query
* fix request response
* fixes
* add copy files
* variable versions
* generate all files
* improvements
* add dependencies
* factors
* user session
* oidc information, iam
* remove unused file
* changes
* enums
* dockerfile
* fix build
* remove unused folder
* update readme for build
* move old server impl
* add event type to change
* some changes
* start admin
* remove wrong field
* admin only list calls missing
* fix proto numbers
* surprisingly it compiles
* service ts changes
* admin mgmt
* mgmt
* auth manipulation and gets done, lists missing
* validations and some field changes
* validations
* enum validations
* remove todo
* move proto files to proto/zitadel
* change proto path in dockerfile
* it compiles!
* add validate import
* remove duplicate import
* fix protos
* fix import
* tests
* cleanup
* remove unimplemented methods
* iam member multiple queries
* all auth and admin calls
* add initial password on crate human
* message names
* management user server
* machine done
* fix: todos (#1346)
* fix: pub sub in new eventstore
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix: todos
* fix tests
* fix: search method domain
* admin service, user import type typescript
* admin changes
* admin changes
* fix: search method domain
* more user grpc and begin org, fix configs
* fix: return object details
* org grpc
* remove creation date add details
* app
* fix: return object details
* fix: return object details
* mgmt service, project members
* app
* fix: convert policies
* project, members, granted projects, searches
* fix: convert usergrants
* fix: convert usergrants
* auth user detail, user detail, mfa, second factor, auth
* fix: convert usergrants
* mfa, memberships, password, owned proj detail
* fix: convert usergrants
* project grant
* missing details
* changes, userview
* idp table, keys
* org list and user table filter
* unify rest paths (#1381)
* unify rest paths
* post for all searches,
mfa to multi_factor,
secondfactor to second_factor
* remove v1
* fix tests
* rename api client key to app key
* machine keys, age policy
* user list, machine keys, changes
* fix: org states
* add default flag to policy
* second factor to type
* idp id
* app type
* unify ListQuery, ListDetails, ObjectDetails field names
* user grants, apps, memberships
* fix type params
* metadata to detail, linke idps
* api create, membership, app detail, create
* idp, app, policy
* queries, multi -> auth factors and missing fields
* update converters
* provider to user, remove old mgmt refs
* temp remove authfactor dialog, build finish
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
2021-03-09 10:30:11 +01:00
|
|
|
runtime.WithMarshalerOption(DefaultJSONMarshaler.ContentType(nil), DefaultJSONMarshaler),
|
2020-07-08 13:56:37 +02:00
|
|
|
runtime.WithMarshalerOption(mimeWildcard, DefaultJSONMarshaler),
|
|
|
|
runtime.WithMarshalerOption(runtime.MIMEWildcard, DefaultJSONMarshaler),
|
|
|
|
runtime.WithIncomingHeaderMatcher(DefaultHeaderMatcher(customHeaders...)),
|
|
|
|
runtime.WithOutgoingHeaderMatcher(runtime.DefaultHeaderMatcher),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DefaultHeaderMatcher = func(customHeaders ...string) runtime.HeaderMatcherFunc {
|
|
|
|
return func(header string) (string, bool) {
|
|
|
|
for _, customHeader := range customHeaders {
|
|
|
|
if strings.HasPrefix(strings.ToLower(header), customHeader) {
|
|
|
|
return header, true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return runtime.DefaultHeaderMatcher(header)
|
|
|
|
}
|
2020-03-24 14:15:01 +01:00
|
|
|
}
|
|
|
|
)
|
|
|
|
|
|
|
|
type Gateway interface {
|
2020-07-08 13:56:37 +02:00
|
|
|
RegisterGateway() GatewayFunc
|
|
|
|
GatewayPathPrefix() string
|
2020-03-24 14:15:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type GatewayFunc func(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) error
|
|
|
|
|
2020-07-08 13:56:37 +02:00
|
|
|
//optional extending interfaces of Gateway below
|
|
|
|
|
2020-03-24 14:15:01 +01:00
|
|
|
type gatewayCustomServeMuxOptions interface {
|
|
|
|
GatewayServeMuxOptions() []runtime.ServeMuxOption
|
|
|
|
}
|
2020-07-08 13:56:37 +02:00
|
|
|
|
2020-03-24 14:15:01 +01:00
|
|
|
type grpcGatewayCustomInterceptor interface {
|
|
|
|
GatewayHTTPInterceptor(http.Handler) http.Handler
|
|
|
|
}
|
|
|
|
|
|
|
|
type gatewayCustomCallOptions interface {
|
|
|
|
GatewayCallOptions() []grpc.DialOption
|
|
|
|
}
|
|
|
|
|
2020-07-08 13:56:37 +02:00
|
|
|
type GatewayHandler struct {
|
|
|
|
mux *http.ServeMux
|
|
|
|
serverPort string
|
|
|
|
gatewayPort string
|
|
|
|
customHeaders []string
|
|
|
|
}
|
|
|
|
|
|
|
|
func CreateGatewayHandler(config grpc_util.Config) *GatewayHandler {
|
|
|
|
return &GatewayHandler{
|
|
|
|
mux: http.NewServeMux(),
|
|
|
|
serverPort: config.ServerPort,
|
|
|
|
gatewayPort: config.GatewayPort,
|
|
|
|
customHeaders: config.CustomHeaders,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//RegisterGateway registers a handler (Gateway interface) on defined port
|
|
|
|
//Gateway interface may be extended with optional implementation of interfaces (gatewayCustomServeMuxOptions, ...)
|
|
|
|
func (g *GatewayHandler) RegisterGateway(ctx context.Context, gateway Gateway) {
|
|
|
|
handler := createGateway(ctx, gateway, g.serverPort, g.customHeaders...)
|
|
|
|
prefix := gateway.GatewayPathPrefix()
|
|
|
|
g.RegisterHandler(prefix, handler)
|
2020-03-24 14:15:01 +01:00
|
|
|
}
|
|
|
|
|
2020-07-08 13:56:37 +02:00
|
|
|
func (g *GatewayHandler) RegisterHandler(prefix string, handler http.Handler) {
|
|
|
|
http_util.RegisterHandler(g.mux, prefix, handler)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (g *GatewayHandler) Serve(ctx context.Context) {
|
|
|
|
http_util.Serve(ctx, g.mux, g.gatewayPort, "api")
|
|
|
|
}
|
|
|
|
|
|
|
|
func createGateway(ctx context.Context, g Gateway, port string, customHeaders ...string) http.Handler {
|
|
|
|
mux := createMux(g, customHeaders...)
|
|
|
|
opts := createDialOptions(g)
|
2021-09-27 13:43:49 +02:00
|
|
|
err := g.RegisterGateway()(ctx, mux, "localhost"+http_util.Endpoint(port), opts)
|
2020-11-20 07:57:39 +01:00
|
|
|
logging.Log("SERVE-7B7G0E").OnError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Panic("failed to register grpc gateway")
|
2020-07-08 13:56:37 +02:00
|
|
|
return addInterceptors(mux, g)
|
|
|
|
}
|
|
|
|
|
|
|
|
func createMux(g Gateway, customHeaders ...string) *runtime.ServeMux {
|
|
|
|
muxOptions := DefaultServeMuxOptions(customHeaders...)
|
2020-03-24 14:15:01 +01:00
|
|
|
if customOpts, ok := g.(gatewayCustomServeMuxOptions); ok {
|
|
|
|
muxOptions = customOpts.GatewayServeMuxOptions()
|
|
|
|
}
|
2020-07-08 13:56:37 +02:00
|
|
|
return runtime.NewServeMux(muxOptions...)
|
|
|
|
}
|
2020-03-24 14:15:01 +01:00
|
|
|
|
2020-07-08 13:56:37 +02:00
|
|
|
func createDialOptions(g Gateway) []grpc.DialOption {
|
2020-11-20 07:57:39 +01:00
|
|
|
opts := []grpc.DialOption{
|
|
|
|
grpc.WithInsecure(),
|
|
|
|
grpc.WithUnaryInterceptor(client_middleware.DefaultTracingClient()),
|
|
|
|
}
|
2020-03-24 14:15:01 +01:00
|
|
|
|
|
|
|
if customOpts, ok := g.(gatewayCustomCallOptions); ok {
|
|
|
|
opts = append(opts, customOpts.GatewayCallOptions()...)
|
|
|
|
}
|
2020-07-08 13:56:37 +02:00
|
|
|
return opts
|
2020-03-24 14:15:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func addInterceptors(handler http.Handler, g Gateway) http.Handler {
|
2020-12-02 08:50:59 +01:00
|
|
|
handler = http_mw.DefaultMetricsHandler(handler)
|
|
|
|
handler = http_mw.DefaultTelemetryHandler(handler)
|
2020-03-24 14:15:01 +01:00
|
|
|
if interceptor, ok := g.(grpcGatewayCustomInterceptor); ok {
|
|
|
|
handler = interceptor.GatewayHTTPInterceptor(handler)
|
|
|
|
}
|
2020-08-24 10:06:55 +02:00
|
|
|
return http_mw.CORSInterceptor(handler)
|
2020-03-24 14:15:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
func gatewayPort(port string) string {
|
|
|
|
if port == "" {
|
|
|
|
return defaultGatewayPort
|
|
|
|
}
|
|
|
|
return port
|
|
|
|
}
|