Merge pull request #446 from nspcc-dev/feature/bearer-issuer

Support bearer token issuer
nspcc-dev · Mar 5, 2024 · 35bc78d · 35bc78d
2 parents cb87bbd + c97dae0
commit 35bc78d
Show file tree

Hide file tree

Showing 28 changed files with 169 additions and 111 deletions.
diff --git a/accounting/grpc/service.pb.go b/accounting/grpc/service.pb.go
diff --git a/accounting/grpc/types.pb.go b/accounting/grpc/types.pb.go
diff --git a/acl/convert.go b/acl/convert.go
@@ -435,6 +435,7 @@ func (bt *BearerTokenBody) ToGRPCMessage() grpc.Message {
 		m = new(acl.BearerToken_Body)
 
 		m.SetOwnerId(bt.ownerID.ToGRPCMessage().(*refsGRPC.OwnerID))
+		m.SetIssuer(bt.issuer.ToGRPCMessage().(*refsGRPC.OwnerID))
 		m.SetLifetime(bt.lifetime.ToGRPCMessage().(*acl.BearerToken_Body_TokenLifetime))
 		m.SetEaclTable(bt.eacl.ToGRPCMessage().(*acl.EACLTable))
 	}
@@ -464,6 +465,20 @@ func (bt *BearerTokenBody) FromGRPCMessage(m grpc.Message) error {
 		}
 	}
 
+	issuer := v.GetIssuer()
+	if issuer == nil {
+		bt.issuer = nil
+	} else {
+		if bt.issuer == nil {
+			bt.issuer = new(refs.OwnerID)
+		}
+
+		err = bt.issuer.FromGRPCMessage(issuer)
+		if err != nil {
+			return err
+		}
+	}
+
 	lifetime := v.GetLifetime()
 	if lifetime == nil {
 		bt.lifetime = nil

diff --git a/acl/grpc/types.go b/acl/grpc/types.go
@@ -79,6 +79,11 @@ func (m *BearerToken_Body) SetOwnerId(v *refs.OwnerID) {
 	m.OwnerId = v
 }
 
+// SetIssuer sets identifier of the bearer token issuer.
+func (m *BearerToken_Body) SetIssuer(v *refs.OwnerID) {
+	m.Issuer = v
+}
+
 // SetLifetime sets lifetime of the bearer token.
 func (m *BearerToken_Body) SetLifetime(v *BearerToken_Body_TokenLifetime) {
 	m.Lifetime = v

diff --git a/acl/grpc/types.pb.go b/acl/grpc/types.pb.go
diff --git a/acl/marshal.go b/acl/marshal.go
@@ -31,6 +31,7 @@ const (
 	bearerTokenBodyACLField      = 1
 	bearerTokenBodyOwnerField    = 2
 	bearerTokenBodyLifetimeField = 3
+	bearerTokenBodyIssuerField   = 4
 
 	bearerTokenBodyField      = 1
 	bearerTokenSignatureField = 2
@@ -251,7 +252,8 @@ func (bt *BearerTokenBody) StableMarshal(buf []byte) []byte {
 
 	offset += protoutil.NestedStructureMarshal(bearerTokenBodyACLField, buf[offset:], bt.eacl)
 	offset += protoutil.NestedStructureMarshal(bearerTokenBodyOwnerField, buf[offset:], bt.ownerID)
-	protoutil.NestedStructureMarshal(bearerTokenBodyLifetimeField, buf[offset:], bt.lifetime)
+	offset += protoutil.NestedStructureMarshal(bearerTokenBodyLifetimeField, buf[offset:], bt.lifetime)
+	protoutil.NestedStructureMarshal(bearerTokenBodyIssuerField, buf[offset:], bt.issuer)
 
 	return buf
 }
@@ -264,6 +266,7 @@ func (bt *BearerTokenBody) StableSize() (size int) {
 	size += protoutil.NestedStructureSize(bearerTokenBodyACLField, bt.eacl)
 	size += protoutil.NestedStructureSize(bearerTokenBodyOwnerField, bt.ownerID)
 	size += protoutil.NestedStructureSize(bearerTokenBodyLifetimeField, bt.lifetime)
+	size += protoutil.NestedStructureSize(bearerTokenBodyIssuerField, bt.issuer)
 
 	return size
 }

diff --git a/acl/test/generate.go b/acl/test/generate.go
@@ -22,6 +22,7 @@ func GenerateBearerTokenBody(empty bool) *acl.BearerTokenBody {
 
 	if !empty {
 		m.SetOwnerID(accountingtest.GenerateOwnerID(false))
+		m.SetIssuer(accountingtest.GenerateOwnerID(false))
 		m.SetEACL(GenerateTable(false))
 		m.SetLifetime(GenerateTokenLifetime(false))
 	}

diff --git a/acl/types.go b/acl/types.go
@@ -49,7 +49,7 @@ type TokenLifetime struct {
 type BearerTokenBody struct {
 	eacl *Table
 
-	ownerID *refs.OwnerID
+	ownerID, issuer *refs.OwnerID
 
 	lifetime *TokenLifetime
 }
@@ -334,6 +334,18 @@ func (bt *BearerTokenBody) SetOwnerID(v *refs.OwnerID) {
 	bt.ownerID = v
 }
 
+func (bt *BearerTokenBody) GetIssuer() *refs.OwnerID {
+	if bt != nil {
+		return bt.issuer
+	}
+
+	return nil
+}
+
+func (bt *BearerTokenBody) SetIssuer(v *refs.OwnerID) {
+	bt.issuer = v
+}
+
 func (bt *BearerTokenBody) GetLifetime() *TokenLifetime {
 	if bt != nil {
 		return bt.lifetime

diff --git a/audit/grpc/types.pb.go b/audit/grpc/types.pb.go
diff --git a/container/grpc/service.pb.go b/container/grpc/service.pb.go
diff --git a/container/grpc/types.pb.go b/container/grpc/types.pb.go
diff --git a/link/grpc/types.pb.go b/link/grpc/types.pb.go
diff --git a/lock/grpc/types.pb.go b/lock/grpc/types.pb.go
diff --git a/netmap/grpc/service.pb.go b/netmap/grpc/service.pb.go
diff --git a/netmap/grpc/types.pb.go b/netmap/grpc/types.pb.go
diff --git a/object/grpc/service.pb.go b/object/grpc/service.pb.go