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

set-json to fail on custom policies without .json #4745

Merged
merged 8 commits into from
Nov 27, 2023
Merged

set-json to fail on custom policies without .json #4745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d15563
set-json to fail on custom policies without .json
r-scheele Nov 4, 2023
f25faf5
updates
r-scheele Nov 8, 2023
32a2732
updates
r-scheele Nov 8, 2023
b54045e
updates
r-scheele Nov 8, 2023
96dcfeb
updates
r-scheele Nov 9, 2023
062553f
updates
r-scheele Nov 9, 2023
4d23b6c
Merge branch 'master' into fix/set-json-validation
r-scheele Nov 9, 2023
4a02905
fixed doc for mc anonymous set-json command
r-scheele Nov 15, 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
34 changes: 32 additions & 2 deletions cmd/access-perms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@

package cmd

import "path/filepath"
import (
"os"

json "github.com/minio/colorjson"
"github.com/minio/minio-go/v7/pkg/policy"
)

// isValidAccessPERM - is provided access perm string supported.
func (b accessPerms) isValidAccessPERM() bool {
Expand All @@ -29,7 +34,32 @@ func (b accessPerms) isValidAccessPERM() bool {
}

func (b accessPerms) isValidAccessFile() bool {
return filepath.Ext(string(b)) == ".json"
file, err := os.Open(string(b))
if err != nil {
fatalIf(errDummy().Trace(), "Unable to open access file.")
return false
}
defer file.Close()

var policy policy.BucketAccessPolicy
if json.NewDecoder(file).Decode(&policy) != nil {
fatalIf(errDummy().Trace(), "Unable to parse access file.")
return false
}

if policy.Version != "2012-10-17" {
fatalIf(errDummy().Trace(), "Invalid policy version. Only 2012-10-17 is supported.")
return false
}

for _, statement := range policy.Statements {
if statement.Effect != "Allow" && statement.Effect != "Deny" {
fatalIf(errDummy().Trace(), "Invalid policy effect. Only Allow and Deny are supported.")
return false
}
}
harshavardhana marked this conversation as resolved.
Show resolved Hide resolved

return true
}

// accessPerms - access level.
Expand Down
2 changes: 1 addition & 1 deletion cmd/anonymous-main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var anonymousCmd = cli.Command{

USAGE:
{{.HelpName}} [FLAGS] set PERMISSION TARGET
{{.HelpName}} [FLAGS] set-json TARGET FILE
{{.HelpName}} [FLAGS] set-json FILE TARGET
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you update the example below as well ?

{{.HelpName}} [FLAGS] get TARGET
{{.HelpName}} [FLAGS] get-json TARGET
{{.HelpName}} [FLAGS] list TARGET
Expand Down
Loading