Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: parse failed when object name contains / #369

Merged
merged 2 commits into from
Jul 25, 2023
Merged

fix: parse failed when object name contains / #369

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c4cb3a
fix object name contains /
fynnss Jul 25, 2023
8912cd0
add e2e test
fynnss Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions types/grn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,21 @@ func (r *GRN) ParseFromString(res string, wildcards bool) error {

func (r *GRN) parseBucketAndObjectName(name string) (string, string, error) {
nameArr := strings.Split(name, "/")
if len(nameArr) != 2 {
if len(nameArr) < 2 {
return "", "", gnfderrors.ErrInvalidGRN.Wrapf("expect bucketName/object, actual %s", r.name)
}
err := s3util.CheckValidBucketName(nameArr[0])
bucketName := nameArr[0]
objectName, found := strings.CutPrefix(name, bucketName+"/")
if !found {
return "", "", gnfderrors.ErrInvalidGRN.Wrapf("object name not found, grn: %s", name)
}
err := s3util.CheckValidBucketName(bucketName)
if err != nil {
return "", "", gnfderrors.ErrInvalidGRN.Wrapf("invalid bucketName, err: %s", err)
}
err = s3util.CheckValidObjectName(nameArr[1])
err = s3util.CheckValidObjectName(objectName)
if err != nil {
return "", "", gnfderrors.ErrInvalidGRN.Wrapf("invalid objectName, err: %s", err)
}
return nameArr[0], nameArr[1], nil
return bucketName, objectName, nil
}
11 changes: 11 additions & 0 deletions types/grn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,14 @@ func TestGRNBasicNew(t *testing.T) {
groupGRNString := "grn:g:" + ownerAcc.String() + ":testgroup"
require.Equal(t, groupGRNString, types3.NewGroupGRN(ownerAcc, "testgroup").String())
}

func TestGRNWithSlash(t *testing.T) {
var grn types3.GRN

err := grn.ParseFromString("grn:o::"+"testbucket"+"/"+"test/object", false)
require.NoError(t, err)
require.Equal(t, grn.ResourceType(), resource.RESOURCE_TYPE_OBJECT)
bucketName, objectName := grn.MustGetBucketAndObjectName()
require.Equal(t, bucketName, "testbucket")
require.Equal(t, objectName, "test/object")
}
Loading