TrueCloudLab/frostfs-node
21
1
Fork 27
Code Issues 108 Pull requests 3 Projects Releases 1 Activity Actions

Validate container owner namespace when putting container #819

Merged
fyrchik merged 2 commits from dstepanov-yadro/frostfs-node:feat/ir_validate_namespace into master 2024-09-04 19:51:04 +00:00
Conversation 1 Commits 2 Files changed 20 +189 -819
dstepanov-yadro commented 2023-11-20 14:10:31 +00:00
Member
Copy link

  • Dropped old FrostFSID contract client and event handlers (unused)

  • Created new FrostfsID contract client

  • Added container owner namespace validation in container put handler

Closes #755

* Dropped old FrostFSID contract client and event handlers (unused) * Created new FrostfsID contract client * Added container owner namespace validation in `container put` handler Closes #755
dstepanov-yadro requested review from storage-core-committers 2023-11-20 14:41:38 +00:00
dstepanov-yadro requested review from storage-core-developers 2023-11-20 14:41:38 +00:00
dstepanov-yadro force-pushed feat/ir_validate_namespace from 51a2c0a67c to eeb695e1a1 2023-11-20 15:10:37 +00:00 Compare
aarifullin approved these changes 2023-11-21 11:22:10 +00:00
dstepanov-yadro force-pushed feat/ir_validate_namespace from eeb695e1a1 to a302dd6ea9 2023-11-27 07:05:57 +00:00 Compare
aarifullin reviewed 2023-11-27 08:09:09 +00:00
pkg/morph/client/frostfsid/subject.go Outdated
@ -0,0 +17,4 @@
func (c *Client) GetSubject(addr util.Uint160) (*frostfsidclient.Subject, error) {
prm := client.TestInvokePrm{}
prm.SetMethod("getSubject")
aarifullin commented 2023-11-27 08:09:09 +00:00
Member
Copy link

prm.SetMethod("getSubject") -> prm.SetMethod(methodGetSubject) ? :)

`prm.SetMethod("getSubject")` -> `prm.SetMethod(methodGetSubject)` ? :)
dstepanov-yadro commented 2023-11-27 14:33:35 +00:00
Author
Member
Copy link

fixed

fixed
aarifullin marked this conversation as resolved
aarifullin reviewed 2023-11-27 08:15:23 +00:00
pkg/morph/client/frostfsid/subject.go Outdated
@ -0,0 +87,4 @@
func parseMap(item stackitem.Item) (map[string]string, error) {
if item.Equals(stackitem.Null{}) {
return nil, nil
aarifullin commented 2023-11-27 08:15:23 +00:00
Member
Copy link

Would not be better to return empty map?

return map[string]string{}, nil

Invoking side may try to get a key from the map if it detects the error is nil

Would not be better to return empty map? ```go return map[string]string{}, nil ``` Invoking side may try to get a key from the map if it detects the error is `nil`
dstepanov-yadro commented 2023-11-27 14:28:40 +00:00
Author
Member
Copy link

There is the same logic already for arrays:

Line 75 in 5521737
case stackitem.AnyT:

There is the same logic already for arrays: https://git.frostfs.info/TrueCloudLab/frostfs-node/src/commit/5521737f0b4cf5bb1ae22bfcfb3e7539617e8fd0/pkg/morph/client/util.go#L75
aarifullin marked this conversation as resolved
aarifullin reviewed 2023-11-27 08:18:51 +00:00
pkg/morph/client/frostfsid/subject.go Outdated
@ -0,0 +63,4 @@
}
}
if !structArr[2].Equals(stackitem.Null{}) {
aarifullin commented 2023-11-27 08:18:51 +00:00
Member
Copy link

structArr[2] has been already parsed above. Probably, you mean structArr[3]?

`structArr[2]` has been already parsed above. Probably, you mean `structArr[3]`?
dstepanov-yadro commented 2023-11-27 14:33:43 +00:00
Author
Member
Copy link

fixed

fixed
aarifullin marked this conversation as resolved
dstepanov-yadro force-pushed feat/ir_validate_namespace from a302dd6ea9 to dfc4b6688c 2023-11-27 14:33:30 +00:00 Compare
fyrchik requested changes 2023-11-27 17:17:42 +00:00
pkg/innerring/initialization.go Outdated
@ -263,3 +261,3 @@
MorphClient: cnrClient.Morph(),
FrostFSIDClient: frostfsIDClient,
NetworkState: s.netmapClient,
FrostFSIDClient: frostfsIDClient,
fyrchik commented 2023-11-27 17:08:27 +00:00
Owner
Copy link

Why this change?

Why this change?
dstepanov-yadro commented 2023-11-28 06:54:13 +00:00
Author
Member
Copy link

Fixed. I first completely deleted the old client, then made a new one.

Fixed. I first completely deleted the old client, then made a new one.
fyrchik marked this conversation as resolved
pkg/innerring/processors/container/process_container.go Outdated
@ -178,0 +182,4 @@
return nil
}
addr, err := util.Uint160DecodeBytesBE(cnr.Owner().WalletBytes()[:util.Uint160Size])
fyrchik commented 2023-11-27 17:10:13 +00:00
Owner
Copy link

It should be [1:1+util.Uint160Size], see

Line 71 in TrueCloudLab/frostfs-sdk-go@56debcf
copy(x.w[1:], scriptHash.BytesBE())

It should be `[1:1+util.Uint160Size]`, see https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/src/commit/56debcfa569e69c16e4a7be57d24f95ce2e46ffc/user/id.go#L71
dstepanov-yadro commented 2023-11-28 06:53:29 +00:00
Author
Member
Copy link

fixed

fixed
fyrchik marked this conversation as resolved
pkg/innerring/processors/container/process_container.go Outdated
@ -178,0 +193,4 @@
}
if subject.Namespace != namespace {
return fmt.Errorf("container owner doesn't match namespace")
fyrchik commented 2023-11-27 17:17:39 +00:00
Owner
Copy link

Maybe container and owner namespaces do not match?

Maybe `container and owner namespaces do not match`?
dstepanov-yadro commented 2023-11-28 06:53:14 +00:00
Author
Member
Copy link

fixed

fixed
fyrchik marked this conversation as resolved
pkg/morph/client/frostfs/bind.go Outdated
@ -6,4 +0,0 @@
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
)
type commonBindArgs struct {
fyrchik commented 2023-11-27 17:10:51 +00:00
Owner
Copy link

It is frostfs contract (no id), why is it removed here?

It is `frostfs` contract (no `id`), why is it removed here?
dstepanov-yadro commented 2023-11-28 06:45:25 +00:00
Author
Member
Copy link

There is no usages found.

There is no usages found.
fyrchik marked this conversation as resolved
pkg/morph/client/frostfsid/subject.go Outdated
@ -0,0 +78,4 @@
return &subj, nil
}
func makeValidRes(item stackitem.Item) (*result.Invoke, error) {
fyrchik commented 2023-11-27 17:15:05 +00:00
Owner
Copy link

I am not sure wrapping item in result for the sake of parsing is a good approach.
pkg/morph/client/util.go has some helpers, which could be of use here.

I am not sure wrapping item in `result` for the sake of parsing is a good approach. `pkg/morph/client/util.go` has some helpers, which could be of use here.
dstepanov-yadro commented 2023-11-28 06:50:44 +00:00
Author
Member
Copy link

I think it is ok, because wrapping allows to use native neo-go's methods.

I think it is ok, because wrapping allows to use native neo-go's methods.
fyrchik marked this conversation as resolved
dstepanov-yadro force-pushed feat/ir_validate_namespace from dfc4b6688c to 88aee2d724 2023-11-28 06:51:19 +00:00 Compare
dstepanov-yadro requested review from fyrchik 2023-11-28 06:54:35 +00:00
acid-ant approved these changes 2023-11-29 14:37:26 +00:00
aarifullin approved these changes 2023-11-29 14:41:07 +00:00
dstepanov-yadro force-pushed feat/ir_validate_namespace from 88aee2d724 to 9b49908404 2023-11-30 14:02:44 +00:00 Compare
fyrchik commented 2023-12-11 13:16:06 +00:00
Owner
Copy link

Ready to merge, please fix the conflicts.

Ready to merge, please fix the conflicts.
fyrchik approved these changes 2023-12-11 13:16:15 +00:00
dstepanov-yadro force-pushed feat/ir_validate_namespace from 9b49908404 to 7cfbad99a5 2023-12-11 13:20:10 +00:00 Compare
dstepanov-yadro force-pushed feat/ir_validate_namespace from 7cfbad99a5 to a3ef7b58b4 2023-12-12 09:36:58 +00:00 Compare
fyrchik merged commit a3ef7b58b4 into master 2023-12-12 09:37:56 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
acid-ant
aarifullin
fyrchik
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
badger

Badger DB related issues

  
frostfs-adm

   
frostfs-cli

   
frostfs-ir

   
frostfs-lens

   
frostfs-node

   
good first issue

Good for newcomers

  
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#819
No description provided.
Delete branch "dstepanov-yadro/frostfs-node:feat/ir_validate_namespace"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?