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(storage): add object validation case and test #9521

Merged
merged 7 commits into from
Mar 8, 2024
+55 −0
Merged

fix(storage): add object validation case and test #9521

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
573d3ed
fix(storage): add object validation case and test
tritone Mar 7, 2024
9589b2a
Merge branch 'main' into object-validate-fix
tritone Mar 7, 2024
3dfba2a
fix error msg
tritone Mar 7, 2024
19a49c8
use quote in error
tritone Mar 7, 2024
c17aa5d
Merge branch 'main' into object-validate-fix
tritone Mar 7, 2024
86e68e9
Merge branch 'main' into object-validate-fix
tritone Mar 7, 2024
f9d356b
Merge branch 'main' into object-validate-fix
BrennaEpp Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions storage/storage.go
View file
Open in desktop
Expand Up @@ -1096,6 +1096,10 @@ func (o *ObjectHandle) validate() error {
if !utf8.ValidString(o.object) {
return fmt.Errorf("storage: object name %q is not valid UTF-8", o.object)
}
// Names . and .. are not valid; see https://cloud.google.com/storage/docs/objects#naming
if o.object == "." || o.object == ".." {
return fmt.Errorf("Object name %v is not valid", o.object)
tritone marked this conversation as resolved.
Show resolved Hide resolved
}
return nil
}

Expand Down
51 changes: 51 additions & 0 deletions storage/storage_test.go
View file
Open in desktop
Expand Up @@ -2424,6 +2424,57 @@ func TestParseProjectNumber(t *testing.T) {
}
}

func TestObjectValidate(t *testing.T) {
for _, c := range []struct {
name string
bucket string
object string
wantSuccess bool
}{
{
name: "valid object",
bucket: "my-bucket",
object: "my-object",
wantSuccess: true,
},
{
name: "empty bucket name",
bucket: "",
object: "my-object",
wantSuccess: false,
},
{
name: "empty object name",
bucket: "my-bucket",
object: "",
wantSuccess: false,
},
{
name: "invalid utf-8",
bucket: "my-bucket",
object: "\xc3\x28",
wantSuccess: false,
},
{
name: "object name .",
bucket: "my-bucket",
object: ".",
wantSuccess: false,
},
} {
t.Run(c.name, func(r *testing.T) {
b := &BucketHandle{name: c.bucket}
err := b.Object(c.object).validate()
if c.wantSuccess && err != nil {
r.Errorf("want success, got error %v", err)
}
if !c.wantSuccess && err == nil {
r.Errorf("want error, got nil")
}
})
}
}

// isZeroValue reports whether v is the zero value for its type
// It errors if the argument is unknown
func isZeroValue(v reflect.Value) (bool, error) {
Expand Down