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

Fail loading an ACL config if the provided file is empty and enforceTableACLConfig is true #17274

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+20 −0
Draft

Fail loading an ACL config if the provided file is empty and enforceTableACLConfig is true #17274

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c636acf
fail initializing acl if the provided acl file is empty
garfthoffman Nov 22, 2024
eca5d61
validate instead that file data is not empty
garfthoffman Nov 22, 2024
d79d1c8
clean up unused boolean flag
garfthoffman Nov 22, 2024
d47a37b
add unit test, correct errors package
garfthoffman Nov 22, 2024
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
3 changes: 2 additions & 1 deletion go/vt/vttablet/tabletserver/tabletserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,8 @@ func (tsv *TabletServer) initACL(tableACLConfigFile string, enforceTableACLConfi
tsv.ClearQueryPlanCache()
},
)
if err != nil {
// Log failure if either there was a problem loading the ACL, or if the ACL is empty
if err != nil || tableacl.GetCurrentConfig().String() == "" {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure if this is the correct place to perform this validation. I think a config file containing an empty JSON object should be treated as "valid", but a truncated file seems like a pretty clear configuration mistake. 🤔

Copy link
Author

Choose a reason for hiding this comment

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

Addressed in eca5d61

log.Errorf("Fail to initialize Table ACL: %v", err)
if enforceTableACLConfig {
log.Exit("Need a valid initial Table ACL when enforce-tableacl-config is set, exiting.")
Expand Down