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

Revert "update file permissions to read/write (#751)" #755

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Revert "update file permissions to read/write (#751)" #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47627e7
Revert "update file permissions to read/write (#751)"
chrnorm Sep 24, 2024
9414ad1
fix sso token execute permission
chrnorm Sep 24, 2024
4643f81
Add coauthor
chrnorm Sep 24, 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
9 changes: 2 additions & 7 deletions pkg/accessrequest/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ import (
"github.com/common-fate/granted/pkg/config"
)

const (
// permission for user to read/write.
USER_READ_WRITE_PERM = 0644
)

type Role struct {
Account string `json:"account"`
Role string `json:"role"`
Expand Down Expand Up @@ -51,7 +46,7 @@ func (r Role) Save() error {
}

file := filepath.Join(configFolder, "latest-role")
return os.WriteFile(file, roleBytes, USER_READ_WRITE_PERM)
return os.WriteFile(file, roleBytes, 0644)
}

func LatestRole() (*Role, error) {
Expand Down Expand Up @@ -96,7 +91,7 @@ func (p Profile) Save() error {
}

file := filepath.Join(configFolder, "latest-profile")
return os.WriteFile(file, profileBytes, USER_READ_WRITE_PERM)
return os.WriteFile(file, profileBytes, 0644)
}

func LatestProfile() (*Profile, error) {
Expand Down
9 changes: 2 additions & 7 deletions pkg/cfaws/ssotoken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ import (
"github.com/common-fate/granted/pkg/securestorage"
)

const (
// permission for user to read/write.
USER_READ_WRITE_PERM = 0644
)

type SSOPlainTextOut struct {
AccessToken string `json:"accessToken"`
ExpiresAt string `json:"expiresAt"`
Expand Down Expand Up @@ -93,13 +88,13 @@ func dumpTokenFile(jsonToken []byte, key string) error {
}

if _, err := os.Stat(path); os.IsNotExist(err) {
err := os.MkdirAll(path, USER_READ_WRITE_PERM)
err := os.MkdirAll(path, 0700)
if err != nil {
return fmt.Errorf("unable to create sso cache directory with err: %s", err)
}
}

err = os.WriteFile(filepath.Join(path, key), jsonToken, USER_READ_WRITE_PERM)
err = os.WriteFile(filepath.Join(path, key), jsonToken, 0600)
if err != nil {
return err
}
Expand Down
24 changes: 7 additions & 17 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ import (
"github.com/common-fate/granted/internal/build"
)

const (
// permission for user to read/write.
USER_READ_WRITE_PERM = 0644
)

const (
// permission for user to read/write.
USER_READ_WRITE_EXECUTE_PERM = 0700
)

type BrowserLaunchTemplate struct {
// UseForkProcess specifies whether to use forkprocess to launch the browser.
//
Expand Down Expand Up @@ -152,7 +142,7 @@ func SetupConfigFolder() error {
return err
}
if _, err := os.Stat(grantedFolder); os.IsNotExist(err) {
err := os.Mkdir(grantedFolder, USER_READ_WRITE_PERM)
err := os.Mkdir(grantedFolder, 0700)
if err != nil {
return err
}
Expand All @@ -168,14 +158,14 @@ func SetupZSHAutoCompleteFolderAssume() (string, error) {
}
zshPath := path.Join(grantedFolder, "zsh_autocomplete")
if _, err := os.Stat(zshPath); os.IsNotExist(err) {
err := os.Mkdir(zshPath, USER_READ_WRITE_EXECUTE_PERM)
err := os.Mkdir(zshPath, 0700)
if err != nil {
return "", err
}
}
zshPath = path.Join(zshPath, build.AssumeScriptName())
if _, err := os.Stat(zshPath); os.IsNotExist(err) {
err := os.Mkdir(zshPath, USER_READ_WRITE_EXECUTE_PERM)
err := os.Mkdir(zshPath, 0700)
if err != nil {
return "", err
}
Expand All @@ -191,14 +181,14 @@ func SetupZSHAutoCompleteFolderGranted() (string, error) {
}
zshPath := path.Join(grantedFolder, "zsh_autocomplete")
if _, err := os.Stat(zshPath); os.IsNotExist(err) {
err := os.Mkdir(zshPath, USER_READ_WRITE_EXECUTE_PERM)
err := os.Mkdir(zshPath, 0700)
if err != nil {
return "", err
}
}
zshPath = path.Join(zshPath, build.GrantedBinaryName())
if _, err := os.Stat(zshPath); os.IsNotExist(err) {
err := os.Mkdir(zshPath, USER_READ_WRITE_EXECUTE_PERM)
err := os.Mkdir(zshPath, 0700)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -284,7 +274,7 @@ func Load() (*Config, error) {
return nil, err
}

file, err := os.OpenFile(configFilePath, os.O_RDWR|os.O_CREATE, USER_READ_WRITE_PERM)
file, err := os.OpenFile(configFilePath, os.O_RDWR|os.O_CREATE, 0600)
if err != nil {
return nil, err
}
Expand All @@ -306,7 +296,7 @@ func (c *Config) Save() error {
return err
}

file, err := os.OpenFile(configFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, USER_READ_WRITE_PERM)
file, err := os.OpenFile(configFilePath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
if err != nil {
return err
}
Expand Down
11 changes: 3 additions & 8 deletions pkg/frecency/frecency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ import (
"github.com/common-fate/granted/pkg/config"
)

const (
// permission for user to read/write.
USER_READ_WRITE_PERM = 0644
)

// change these to play with the weights
// values between 0 and 1
// 0 will exclude the metric all together from the ordering
Expand Down Expand Up @@ -75,14 +70,14 @@ func Load(fecencyStoreKey string) (*FrecencyStore, error) {

// check if the providers file exists
if _, err = os.Stat(c.path); os.IsNotExist(err) {
err := os.MkdirAll(configFolder, USER_READ_WRITE_PERM)
err := os.MkdirAll(configFolder, 0700)
if err != nil {
return nil, err
}
return &c, nil
}

file, err := os.OpenFile(c.path, os.O_RDWR|os.O_CREATE, USER_READ_WRITE_PERM)
file, err := os.OpenFile(c.path, os.O_RDWR|os.O_CREATE, 0600)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -191,7 +186,7 @@ func (store *FrecencyStore) save() error {
// store.Entries = store.Entries[0 : len(store.Entries)-1]
// }

file, err := os.OpenFile(store.path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, USER_READ_WRITE_PERM)
file, err := os.OpenFile(store.path, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
if err != nil {
return err
}
Expand Down
7 changes: 1 addition & 6 deletions pkg/granted/exp/request/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ import (
"gopkg.in/ini.v1"
)

const (
// permission for user to read/write.
USER_READ_WRITE_PERM = 0644
)

var Command = cli.Command{
Name: "request",
Usage: "Request access to a role",
Expand Down Expand Up @@ -731,7 +726,7 @@ func updateCachedAccessRule(ctx context.Context, opts updateCacheOpts) error {
return err
}

err = os.WriteFile(filename, ruleBytes, USER_READ_WRITE_PERM)
err = os.WriteFile(filename, ruleBytes, 0644)
if err != nil {
return err
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/granted/registry/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ import (
"github.com/urfave/cli/v2"
)

const (
// permission for user to read/write/execute.
USER_READ_WRITE_PERM = 0700
)

var AddCommand = cli.Command{
Name: "add",
Description: "Add a Profile Registry that you want to sync with aws config file",
Expand Down
5 changes: 0 additions & 5 deletions pkg/granted/registry/ini.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ import (
"gopkg.in/ini.v1"
)

const (
// permission for user to read/write.
USER_READ_WRITE_PERM = 0644
)

// Find the ~/.aws/config absolute path based on OS.
func getDefaultAWSConfigLocation() (string, error) {
h, err := os.UserHomeDir()
Expand Down
9 changes: 2 additions & 7 deletions pkg/shells/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ import (
"strings"
)

const (
// permission for user to read/write.
USER_READ_WRITE_PERM = 0644
)

// AppendLine writes a line to a file if it does not already exist
func AppendLine(file string, line string) error {
b, err := os.ReadFile(file)
Expand All @@ -24,7 +19,7 @@ func AppendLine(file string, line string) error {
}

// open the file for writing
out, err := os.OpenFile(file, os.O_APPEND|os.O_WRONLY, USER_READ_WRITE_PERM)
out, err := os.OpenFile(file, os.O_APPEND|os.O_WRONLY, 0644)
if err != nil {
return err
}
Expand Down Expand Up @@ -78,7 +73,7 @@ func RemoveLine(file string, lineToRemove string) error {
}

output := strings.Join(ignored, "\n")
err = os.WriteFile(file, []byte(output), USER_READ_WRITE_PERM)
err = os.WriteFile(file, []byte(output), 0644)
if err != nil {
return err
}
Expand Down
Loading