Remove redundant gRPC auth interceptor
This commit is contained in:
@@ -41,7 +41,7 @@ func StartHost(addr string, lifecycle lifecycleBackend, profiles map[string]pass
|
|||||||
}
|
}
|
||||||
|
|
||||||
service := NewServerWithLifecycle(vault.Model{}, profiles, clipboardWriter, lifecycle)
|
service := NewServerWithLifecycle(vault.Model{}, profiles, clipboardWriter, lifecycle)
|
||||||
server := grpc.NewServer(grpc.UnaryInterceptor(AuthInterceptor(service)))
|
server := grpc.NewServer()
|
||||||
keepassgov1.RegisterVaultServiceServer(server, service)
|
keepassgov1.RegisterVaultServiceServer(server, service)
|
||||||
|
|
||||||
host := &Host{
|
host := &Host{
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import (
|
|||||||
"git.julianfamily.org/keepassgo/internal/vault"
|
"git.julianfamily.org/keepassgo/internal/vault"
|
||||||
"git.julianfamily.org/keepassgo/internal/webdav"
|
"git.julianfamily.org/keepassgo/internal/webdav"
|
||||||
keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1"
|
keepassgov1 "git.julianfamily.org/keepassgo/proto/keepassgo/v1"
|
||||||
"google.golang.org/grpc"
|
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
"google.golang.org/grpc/metadata"
|
"google.golang.org/grpc/metadata"
|
||||||
"google.golang.org/grpc/status"
|
"google.golang.org/grpc/status"
|
||||||
@@ -1012,25 +1011,3 @@ func copyOperation(target string) apitokens.Operation {
|
|||||||
return apitokens.OperationCopyPassword
|
return apitokens.OperationCopyPassword
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func AuthInterceptor(server *Server) grpc.UnaryServerInterceptor {
|
|
||||||
return func(
|
|
||||||
ctx context.Context,
|
|
||||||
req any,
|
|
||||||
info *grpc.UnaryServerInfo,
|
|
||||||
handler grpc.UnaryHandler,
|
|
||||||
) (any, error) {
|
|
||||||
switch info.FullMethod {
|
|
||||||
case "/keepassgo.v1.VaultService/GetSessionStatus",
|
|
||||||
"/keepassgo.v1.VaultService/OpenVault",
|
|
||||||
"/keepassgo.v1.VaultService/OpenRemoteVault",
|
|
||||||
"/keepassgo.v1.VaultService/SaveVault",
|
|
||||||
"/keepassgo.v1.VaultService/LockVault",
|
|
||||||
"/keepassgo.v1.VaultService/UnlockVault":
|
|
||||||
if _, err := server.authenticateRequest(ctx); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return handler(ctx, req)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1188,7 +1188,7 @@ func newTestHarnessForModel(t *testing.T, model vault.Model) (keepassgov1.VaultS
|
|||||||
listener := bufconn.Listen(1024 * 1024)
|
listener := bufconn.Listen(1024 * 1024)
|
||||||
clipboardWriter := &memoryClipboardWriter{}
|
clipboardWriter := &memoryClipboardWriter{}
|
||||||
service := NewServer(model, passwords.DefaultProfiles(), clipboardWriter)
|
service := NewServer(model, passwords.DefaultProfiles(), clipboardWriter)
|
||||||
server := grpc.NewServer(grpc.UnaryInterceptor(AuthInterceptor(service)))
|
server := grpc.NewServer()
|
||||||
keepassgov1.RegisterVaultServiceServer(server, service)
|
keepassgov1.RegisterVaultServiceServer(server, service)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
@@ -1231,7 +1231,7 @@ func newTestHarnessWithLifecycle(t *testing.T, lifecycle *stubLifecycle) (keepas
|
|||||||
))
|
))
|
||||||
lifecycle.model = model
|
lifecycle.model = model
|
||||||
service := NewServerWithLifecycle(model, passwords.DefaultProfiles(), clipboardWriter, lifecycle)
|
service := NewServerWithLifecycle(model, passwords.DefaultProfiles(), clipboardWriter, lifecycle)
|
||||||
server := grpc.NewServer(grpc.UnaryInterceptor(AuthInterceptor(service)))
|
server := grpc.NewServer()
|
||||||
keepassgov1.RegisterVaultServiceServer(server, service)
|
keepassgov1.RegisterVaultServiceServer(server, service)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
|
|||||||
Reference in New Issue
Block a user