1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #12568 from duglin/TweakConfigPerms

Make .docker dir have 0700 perms not 0600
This commit is contained in:
Jessie Frazelle 2015-04-20 16:33:10 -07:00
commit fcacb1793e
2 changed files with 23 additions and 1 deletions

View file

@ -261,7 +261,7 @@ func (configFile *ConfigFile) Save() error {
return err
}
if err := os.MkdirAll(filepath.Dir(configFile.filename), 0600); err != nil {
if err := os.MkdirAll(filepath.Dir(configFile.filename), 0700); err != nil {
return err
}

View file

@ -31,6 +31,28 @@ func TestMissingFile(t *testing.T) {
}
}
func TestSaveFileToDirs(t *testing.T) {
tmpHome, _ := ioutil.TempDir("", "config-test")
tmpHome += "/.docker"
config, err := LoadConfig(tmpHome)
if err != nil {
t.Fatalf("Failed loading on missing file: %q", err)
}
// Now save it and make sure it shows up in new form
err = config.Save()
if err != nil {
t.Fatalf("Failed to save: %q", err)
}
buf, err := ioutil.ReadFile(filepath.Join(tmpHome, CONFIGFILE))
if !strings.Contains(string(buf), `"auths":`) {
t.Fatalf("Should have save in new form: %s", string(buf))
}
}
func TestEmptyFile(t *testing.T) {
tmpHome, _ := ioutil.TempDir("", "config-test")
fn := filepath.Join(tmpHome, CONFIGFILE)