summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/rpc/ability_handler.go11
-rw-r--r--pkg/rpc/server.go7
-rw-r--r--pkg/rpc/server_test.go10
3 files changed, 7 insertions, 21 deletions
diff --git a/pkg/rpc/ability_handler.go b/pkg/rpc/ability_handler.go
index a881b41..b36ce14 100644
--- a/pkg/rpc/ability_handler.go
+++ b/pkg/rpc/ability_handler.go
@@ -2,19 +2,14 @@ package rpc
import (
context "context"
- "net/http"
-
- "github.com/xlgmokha/x/pkg/x"
- "gitlab.com/mokhax/spike/pkg/authz"
)
type AbilityHandler struct {
- authorizer authz.Authorizer
UnimplementedAbilityServer
}
func (h *AbilityHandler) Allowed(ctx context.Context, req *AllowRequest) (*AllowReply, error) {
- // TODO:: Replace http.Request with authz.Request
- request := x.Must(http.NewRequestWithContext(ctx, req.Permission, req.Resource, nil))
- return &AllowReply{Result: h.authorizer.Authorize(request)}, nil
+ return &AllowReply{
+ Result: false,
+ }, nil
}
diff --git a/pkg/rpc/server.go b/pkg/rpc/server.go
index ba96b61..c78b5d4 100644
--- a/pkg/rpc/server.go
+++ b/pkg/rpc/server.go
@@ -1,14 +1,11 @@
package rpc
import (
- "gitlab.com/mokhax/spike/pkg/authz"
grpc "google.golang.org/grpc"
)
-func New(authorizer authz.Authorizer, options ...grpc.ServerOption) *grpc.Server {
+func New(options ...grpc.ServerOption) *grpc.Server {
server := grpc.NewServer(options...)
- RegisterAbilityServer(server, &AbilityHandler{
- authorizer: authorizer,
- })
+ RegisterAbilityServer(server, &AbilityHandler{})
return server
}
diff --git a/pkg/rpc/server_test.go b/pkg/rpc/server_test.go
index aed219e..0ae0f01 100644
--- a/pkg/rpc/server_test.go
+++ b/pkg/rpc/server_test.go
@@ -2,26 +2,20 @@ package rpc
import (
"net"
- "net/http"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gitlab.com/mokhax/spike/pkg/authz"
grpc "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
func TestServer(t *testing.T) {
- authorizer := authz.AuthorizerFunc(func(r *http.Request) bool {
- return true
- })
-
listener, err := net.Listen("tcp", "localhost:0")
require.NoError(t, err)
defer listener.Close()
- server := New(authorizer)
+ server := New()
defer server.Stop()
go func() {
@@ -44,6 +38,6 @@ func TestServer(t *testing.T) {
Resource: "",
})
require.NoError(t, err)
- assert.True(t, reply.Result)
+ assert.False(t, reply.Result)
})
}