certmanager updates

internal/grpc/handler/account.go

@@ -0,0 +1,82 @@
+package handler
+
+import (
+	"context"
+
+	"certmanager/pkg/cmctl"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
+)
+
+func (hand *Handler) Authentificate(ctx context.Context) (int64, error) {
+	var err error
+	var userID int64
+
+	meta, _ := metadata.FromIncomingContext(ctx)
+	hand.log.Debugf("Reqest username: %s", meta["username"])
+	hand.log.Debugf("Reqest password: %s", meta["password"])
+	usernameArr := meta["username"]
+	passwordArr := meta["password"]
+	if len(usernameArr) == 0 || len(passwordArr) == 0 {
+		err := status.Errorf(codes.PermissionDenied, "Empty auth data")
+		return userID, err
+	}
+	username := meta["username"][0]
+	password := meta["password"][0]
+	validated, userID, err := hand.lg.ValidateAcount(ctx, username, password)
+	if !validated {
+		err := status.Errorf(codes.PermissionDenied, "Wrong auth data")
+		return userID, err
+	}
+	return userID, err
+}
+
+func (hand *Handler) CreateAccount(ctx context.Context, params *cmctl.CreateAccountParams) (*cmctl.CreateAccountResult, error) {
+	var err error
+	hand.log.Debugf("Handle CreateAccount call")
+	res := &cmctl.CreateAccountResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.CreateAccount(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) DeleteAccount(ctx context.Context, params *cmctl.DeleteAccountParams) (*cmctl.DeleteAccountResult, error) {
+	var err error
+	hand.log.Debugf("Handle DeleteAccount call")
+	res := &cmctl.DeleteAccountResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.DeleteAccount(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) ListAccounts(ctx context.Context, params *cmctl.ListAccountsParams) (*cmctl.ListAccountsResult, error) {
+	var err error
+	hand.log.Debugf("Handle ListAccounts call")
+	res := &cmctl.ListAccountsResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.ListAccounts(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) UpdateAccount(ctx context.Context, params *cmctl.UpdateAccountParams) (*cmctl.UpdateAccountResult, error) {
+	var err error
+	hand.log.Debugf("Handle UpdateAccount call")
+	res := &cmctl.UpdateAccountResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.UpdateAccount(ctx, userID, params)
+	return res, err
+}

internal/grpc/handler/certman.go

@@ -1,84 +0,0 @@
-package handler
-
-import (
-	"context"
-
-	"certmanager/pkg/cmctl"
-)
-
-func (hand *Handler) CreateIssuerPair(ctx context.Context, params *cmctl.CreateIssuerPairParams) (*cmctl.CreateIssuerPairResult, error) {
-	var err error
-	hand.log.Debugf("Handle CreateIssuerPair call")
-	res, err := hand.lg.CreateIssuerPair(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) ImportIssuerPair(ctx context.Context, params *cmctl.ImportIssuerPairParams) (*cmctl.ImportIssuerPairResult, error) {
-	var err error
-	hand.log.Debugf("Handle ImportIssuerPair call")
-	res, err := hand.lg.ImportIssuerPair(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) RevokeIssuerPair(ctx context.Context, params *cmctl.RevokeIssuerPairParams) (*cmctl.RevokeIssuerPairResult, error) {
-	var err error
-	hand.log.Debugf("Handle RevokeIssuerPair call")
-	res, err := hand.lg.RevokeIssuerPair(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) UnrevokeIssuerPair(ctx context.Context, params *cmctl.UnrevokeIssuerPairParams) (*cmctl.UnrevokeIssuerPairResult, error) {
-	var err error
-	hand.log.Debugf("Handle UnrevokeIssuerPair call")
-	res, err := hand.lg.UnrevokeIssuerPair(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) ListIssuerPairs(ctx context.Context, params *cmctl.ListIssuerPairsParams) (*cmctl.ListIssuerPairsResult, error) {
-	var err error
-	hand.log.Debugf("Handle ListIssuerPairs call")
-	res, err := hand.lg.ListIssuerPairs(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) GetIssuerCertificate(ctx context.Context, params *cmctl.GetIssuerCertificateParams) (*cmctl.GetIssuerCertificateResult, error) {
-	var err error
-	hand.log.Debugf("Handle GetIssuerCertificate call")
-	res, err := hand.lg.GetIssuerCertificate(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) CreateServicePair(ctx context.Context, params *cmctl.CreateServicePairParams) (*cmctl.CreateServicePairResult, error) {
-	var err error
-	hand.log.Debugf("Handle CreateServicePair call")
-	res, err := hand.lg.CreateServicePair(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) RevokeServicePair(ctx context.Context, params *cmctl.RevokeServicePairParams) (*cmctl.RevokeServicePairResult, error) {
-	var err error
-	hand.log.Debugf("Handle RevokeServicePair call")
-	res, err := hand.lg.RevokeServicePair(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) UnrevokeServicePair(ctx context.Context, params *cmctl.UnrevokeServicePairParams) (*cmctl.UnrevokeServicePairResult, error) {
-	var err error
-	hand.log.Debugf("Handle UnrevokeServicePair call")
-	res, err := hand.lg.UnrevokeServicePair(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) ListServicePairs(ctx context.Context, params *cmctl.ListServicePairsParams) (*cmctl.ListServicePairsResult, error) {
-	var err error
-	hand.log.Debugf("Handle ListServicePairs call")
-	res, err := hand.lg.ListServicePairs(ctx, params)
-	return res, err
-}
-
-func (hand *Handler) GetServicePair(ctx context.Context, params *cmctl.GetServicePairParams) (*cmctl.GetServicePairResult, error) {
-	var err error
-	hand.log.Debugf("Handle GetServicePair call")
-	res, err := hand.lg.GetServicePair(ctx, params)
-	return res, err
-}

internal/grpc/handler/issuer.go

@@ -0,0 +1,79 @@
+package handler
+
+import (
+	"context"
+
+	"certmanager/pkg/cmctl"
+)
+
+func (hand *Handler) CreateIssuerPair(ctx context.Context, params *cmctl.CreateIssuerPairParams) (*cmctl.CreateIssuerPairResult, error) {
+	var err error
+	hand.log.Debugf("Handle CreateIssuerPair call")
+	res := &cmctl.CreateIssuerPairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.CreateIssuerPair(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) ImportIssuerPair(ctx context.Context, params *cmctl.ImportIssuerPairParams) (*cmctl.ImportIssuerPairResult, error) {
+	var err error
+	hand.log.Debugf("Handle ImportIssuerPair call")
+	res := &cmctl.ImportIssuerPairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.ImportIssuerPair(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) RevokeIssuerPair(ctx context.Context, params *cmctl.RevokeIssuerPairParams) (*cmctl.RevokeIssuerPairResult, error) {
+	var err error
+	hand.log.Debugf("Handle RevokeIssuerPair call")
+	res := &cmctl.RevokeIssuerPairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.RevokeIssuerPair(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) UnrevokeIssuerPair(ctx context.Context, params *cmctl.UnrevokeIssuerPairParams) (*cmctl.UnrevokeIssuerPairResult, error) {
+	var err error
+	hand.log.Debugf("Handle UnrevokeIssuerPair call")
+	res := &cmctl.UnrevokeIssuerPairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.UnrevokeIssuerPair(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) ListIssuerPairs(ctx context.Context, params *cmctl.ListIssuerPairsParams) (*cmctl.ListIssuerPairsResult, error) {
+	var err error
+	hand.log.Debugf("Handle ListIssuerPairs call")
+	res := &cmctl.ListIssuerPairsResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.ListIssuerPairs(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) GetIssuerCertificate(ctx context.Context, params *cmctl.GetIssuerCertificateParams) (*cmctl.GetIssuerCertificateResult, error) {
+	var err error
+	hand.log.Debugf("Handle GetIssuerCertificate call")
+	res := &cmctl.GetIssuerCertificateResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.GetIssuerCertificate(ctx, userID, params)
+	return res, err
+}

internal/grpc/handler/service.go

@@ -0,0 +1,67 @@
+package handler
+
+import (
+	"context"
+
+	"certmanager/pkg/cmctl"
+)
+
+func (hand *Handler) CreateServicePair(ctx context.Context, params *cmctl.CreateServicePairParams) (*cmctl.CreateServicePairResult, error) {
+	var err error
+	hand.log.Debugf("Handle CreateServicePair call")
+	res := &cmctl.CreateServicePairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.CreateServicePair(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) RevokeServicePair(ctx context.Context, params *cmctl.RevokeServicePairParams) (*cmctl.RevokeServicePairResult, error) {
+	var err error
+	hand.log.Debugf("Handle RevokeServicePair call")
+	res := &cmctl.RevokeServicePairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.RevokeServicePair(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) UnrevokeServicePair(ctx context.Context, params *cmctl.UnrevokeServicePairParams) (*cmctl.UnrevokeServicePairResult, error) {
+	var err error
+	hand.log.Debugf("Handle UnrevokeServicePair call")
+	res := &cmctl.UnrevokeServicePairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.UnrevokeServicePair(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) ListServicePairs(ctx context.Context, params *cmctl.ListServicePairsParams) (*cmctl.ListServicePairsResult, error) {
+	var err error
+	hand.log.Debugf("Handle ListServicePairs call")
+	res := &cmctl.ListServicePairsResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.ListServicePairs(ctx, userID, params)
+	return res, err
+}
+
+func (hand *Handler) GetServicePair(ctx context.Context, params *cmctl.GetServicePairParams) (*cmctl.GetServicePairResult, error) {
+	var err error
+	hand.log.Debugf("Handle GetServicePair call")
+	res := &cmctl.GetServicePairResult{}
+	userID, err := hand.Authentificate(ctx)
+	if err != nil {
+		return res, err
+	}
+	res, err = hand.lg.GetServicePair(ctx, userID, params)
+	return res, err
+}