unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

use requested service (#1413)

Browse Source
This commit is contained in:
Asim Aslam 2020-03-25 20:59:37 +00:00 committed by GitHub
parent 8d0826a031
commit 6efc5556e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service.go
View File

@ -46,7 +46,7 @@ func newService(opts ...Option) Service {
options.Server.Init(
server.WrapHandler(wrapper.HandlerStats(stats.DefaultStats)),
server.WrapHandler(wrapper.TraceHandler(trace.DefaultTracer)),
server.WrapHandler(wrapper.AuthHandler(authFn, serviceName)),
server.WrapHandler(wrapper.AuthHandler(authFn)),
)
// set opts

6
util/kubernetes/client/types.go
View File

@ -40,9 +40,9 @@ type DeploymentSpec struct {
// DeploymentCondition describes the state of deployment
type DeploymentCondition struct {
LastUpdate string `json:lastUpdateTime`
Type string `json:"type"`
reason string `json:"reason,omitempty"`
message string `json:"message,omitempty"`
Type string `json:"type"`
reason string `json:"reason,omitempty"`
message string `json:"message,omitempty"`
}
// DeploymentStatus is returned when querying deployment

8
util/wrapper/wrapper.go
View File

@ -152,7 +152,7 @@ func TraceHandler(t trace.Tracer) server.HandlerWrapper {
}
// AuthHandler wraps a server handler to perform auth
func AuthHandler(fn func() auth.Auth, srvName string) server.HandlerWrapper {
func AuthHandler(fn func() auth.Auth) server.HandlerWrapper {
return func(h server.HandlerFunc) server.HandlerFunc {
return func(ctx context.Context, req server.Request, rsp interface{}) error {
// get the auth.Auth interface
@ -187,11 +187,11 @@ func AuthHandler(fn func() auth.Auth, srvName string) server.HandlerWrapper {
}
// Verify the caller has access to the resource
err = a.Verify(account, &auth.Resource{Type: "service", Name: srvName, Endpoint: req.Endpoint()})
err = a.Verify(account, &auth.Resource{Type: "service", Name: req.Service(), Endpoint: req.Endpoint()})
if err != nil && len(account.ID) > 0 {
return errors.Forbidden("go.micro.auth", "Forbidden call made to %v:%v by %v", srvName, req.Endpoint(), account.ID)
return errors.Forbidden("go.micro.auth", "Forbidden call made to %v:%v by %v", req.Service(), req.Endpoint(), account.ID)
} else if err != nil {
return errors.Unauthorized("go.micro.auth", "Unauthorised call made to %v:%v", srvName, req.Endpoint())
return errors.Unauthorized("go.micro.auth", "Unauthorised call made to %v:%v", req.Service(), req.Endpoint())
}
// There is an account, set it in the context