From 77314fc8d224ea843e8cc8e3e4eb3480ac125118 Mon Sep 17 00:00:00 2001
From: Hani Alshikh <39484930+HaniAlshikh@users.noreply.github.com>
Date: Wed, 21 Sep 2022 17:24:09 +0200
Subject: [PATCH] Fix creating system admin rolebinding with no resource is not
 allowed (#246)

---
 api/domain/commanddata/user.proto             |  2 +-
 go.mk                                         |  3 ++
 pkg/api/domain/commanddata/user.pb.go         | 32 +++++++++----------
 .../domain/commanddata/user.pb.validate.go    | 22 +++++++------
 pkg/grpc/middleware/validator/user_test.go    |  6 ++++
 5 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/api/domain/commanddata/user.proto b/api/domain/commanddata/user.proto
index d53a42e9f..e8d0e5c3e 100644
--- a/api/domain/commanddata/user.proto
+++ b/api/domain/commanddata/user.proto
@@ -47,7 +47,7 @@ message CreateUserRoleBindingCommandData {
   // Unique identifier of the affected resource within scope (UUID 128-bit
   // number)
   google.protobuf.StringValue resource = 4
-      [ (validate.rules).string.uuid = true ];
+      [ (validate.rules).string = {ignore_empty: true, uuid: true} ];
 }
 
 // Command data to update a user
diff --git a/go.mk b/go.mk
index 2630516fc..1216bfc64 100644
--- a/go.mk
+++ b/go.mk
@@ -103,6 +103,9 @@ endif
 ifeq ($(PROTO_ARCH),arm64)
 PROTO_ARCH = aarch_64
 endif
+ifeq ($(PROTO_ARCH),amd64)
+PROTO_ARCH = x86_64
+endif
 PROTO_ARCH_OS := $(PROTO_OS)-$(PROTO_ARCH)
 
 ## Tool Config
diff --git a/pkg/api/domain/commanddata/user.pb.go b/pkg/api/domain/commanddata/user.pb.go
index 84fc67c79..7c1aac8b1 100644
--- a/pkg/api/domain/commanddata/user.pb.go
+++ b/pkg/api/domain/commanddata/user.pb.go
@@ -236,7 +236,7 @@ var file_api_domain_commanddata_user_proto_rawDesc = []byte{
 	0x6c, 0x12, 0x34, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42,
 	0x20, 0xfa, 0x42, 0x1d, 0x72, 0x1b, 0x10, 0x03, 0x18, 0x96, 0x01, 0x32, 0x14, 0x5e, 0x5b, 0x5e,
 	0x5c, 0x73, 0x5d, 0x2b, 0x28, 0x5c, 0x73, 0x2b, 0x5b, 0x5e, 0x5c, 0x73, 0x5d, 0x2b, 0x29, 0x2a,
-	0x24, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xdf, 0x01, 0x0a, 0x20, 0x43, 0x72, 0x65, 0x61,
+	0x24, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0xe2, 0x01, 0x0a, 0x20, 0x43, 0x72, 0x65, 0x61,
 	0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x6f, 0x6c, 0x65, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e,
 	0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x07,
 	0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa,
@@ -246,23 +246,23 @@ var file_api_domain_commanddata_user_proto_rawDesc = []byte{
 	0x5d, 0x2b, 0x24, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x2a, 0x0a, 0x05, 0x73, 0x63, 0x6f,
 	0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x14, 0xfa, 0x42, 0x11, 0x72, 0x0f, 0x18,
 	0x3c, 0x32, 0x0b, 0x5e, 0x5b, 0x61, 0x2d, 0x7a, 0x30, 0x2d, 0x39, 0x5d, 0x2b, 0x24, 0x52, 0x05,
-	0x73, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x42, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x73, 0x63, 0x6f, 0x70, 0x65, 0x12, 0x45, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
 	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0xb0, 0x01, 0x01, 0x52,
-	0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x6b, 0x0a, 0x15, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x44, 0x61,
-	0x74, 0x61, 0x12, 0x52, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x20,
-	0xfa, 0x42, 0x1d, 0x72, 0x1b, 0x10, 0x03, 0x18, 0x96, 0x01, 0x32, 0x14, 0x5e, 0x5b, 0x5e, 0x5c,
-	0x73, 0x5d, 0x2b, 0x28, 0x5c, 0x73, 0x2b, 0x5b, 0x5e, 0x5c, 0x73, 0x5d, 0x2b, 0x29, 0x2a, 0x24,
-	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x66, 0x69, 0x6e, 0x6c, 0x65, 0x61, 0x70, 0x2d, 0x63, 0x6f, 0x6e,
-	0x6e, 0x65, 0x63, 0x74, 0x2f, 0x6d, 0x6f, 0x6e, 0x6f, 0x73, 0x6b, 0x6f, 0x70, 0x65, 0x2f, 0x70,
-	0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, 0x63, 0x6f,
-	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xb0, 0x01, 0x01, 0xd0,
+	0x01, 0x01, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0x6b, 0x0a, 0x15,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
+	0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x52, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x42, 0x20, 0xfa, 0x42, 0x1d, 0x72, 0x1b, 0x10, 0x03, 0x18, 0x96, 0x01, 0x32, 0x14, 0x5e,
+	0x5b, 0x5e, 0x5c, 0x73, 0x5d, 0x2b, 0x28, 0x5c, 0x73, 0x2b, 0x5b, 0x5e, 0x5c, 0x73, 0x5d, 0x2b,
+	0x29, 0x2a, 0x24, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x41, 0x5a, 0x3f, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x66, 0x69, 0x6e, 0x6c, 0x65, 0x61, 0x70, 0x2d,
+	0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2f, 0x6d, 0x6f, 0x6e, 0x6f, 0x73, 0x6b, 0x6f, 0x70,
+	0x65, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x64, 0x6f, 0x6d, 0x61, 0x69, 0x6e,
+	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/pkg/api/domain/commanddata/user.pb.validate.go b/pkg/api/domain/commanddata/user.pb.validate.go
index bce598f23..3f00b52b3 100644
--- a/pkg/api/domain/commanddata/user.pb.validate.go
+++ b/pkg/api/domain/commanddata/user.pb.validate.go
@@ -307,16 +307,20 @@ func (m *CreateUserRoleBindingCommandData) validate(all bool) error {
 
 	if wrapper := m.GetResource(); wrapper != nil {
 
-		if err := m._validateUuid(wrapper.GetValue()); err != nil {
-			err = CreateUserRoleBindingCommandDataValidationError{
-				field:  "Resource",
-				reason: "value must be a valid UUID",
-				cause:  err,
+		if wrapper.GetValue() != "" {
+
+			if err := m._validateUuid(wrapper.GetValue()); err != nil {
+				err = CreateUserRoleBindingCommandDataValidationError{
+					field:  "Resource",
+					reason: "value must be a valid UUID",
+					cause:  err,
+				}
+				if !all {
+					return err
+				}
+				errors = append(errors, err)
 			}
-			if !all {
-				return err
-			}
-			errors = append(errors, err)
+
 		}
 
 	}
diff --git a/pkg/grpc/middleware/validator/user_test.go b/pkg/grpc/middleware/validator/user_test.go
index a83ba7dc0..0e0c44f93 100644
--- a/pkg/grpc/middleware/validator/user_test.go
+++ b/pkg/grpc/middleware/validator/user_test.go
@@ -72,6 +72,12 @@ var _ = Describe("Test validation rules for user messages", func() {
 			Expect(err).NotTo(HaveOccurred())
 		})
 
+		It("should allow empty resource id for cases like system admin", func() {
+			cd.Resource = wrapperspb.String("")
+			err := cd.Validate()
+			Expect(err).NotTo(HaveOccurred())
+		})
+
 		It("should check for a valid UserId", func() {
 			cd.UserId = invalidUUID
 			ValidateErrorExpected()