Harden config directory creation permissions to 0700
#25
+24
−61
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,8 @@ package config | |
|
|
||
| import ( | ||
| "os" | ||
| "path/filepath" | ||
| "runtime" | ||
| "testing" | ||
|
|
||
| "github.com/BurntSushi/toml" | ||
|
|
@@ -11,7 +12,7 @@ import ( | |
|
|
||
| func TestLoadConfig_ValidConfig(t *testing.T) { | ||
| tempDir := t.TempDir() | ||
| configPath := filepath.Join(tempDir, "config.toml") | ||
| expectedCfg := Config{ | ||
| Main: main{ | ||
| Prompt: "\\u@\\h:\\d> ", | ||
|
|
@@ -36,7 +37,7 @@ func TestLoadConfig_MissingFile(t *testing.T) { | |
|
|
||
| func TestSaveConfig(t *testing.T) { | ||
| tempDir := t.TempDir() | ||
| configPath := filepath.Join(tempDir, "config.toml") | ||
|
|
||
| err := SaveConfig(configPath) | ||
| assert.NoError(t, err) | ||
|
|
@@ -47,6 +48,22 @@ func TestSaveConfig(t *testing.T) { | |
| assert.Equal(t, "default", loadedCfg.Main.HistoryFile) | ||
| } | ||
|
|
||
| func TestSaveConfig_CreatesDirWithRestrictivePermission(t *testing.T) { | ||
| if runtime.GOOS == "windows" { | ||
| t.Skip("directory permission bits are not reliable on Windows") | ||
| } | ||
|
|
||
| tempDir := t.TempDir() | ||
| configPath := filepath.Join(tempDir, "nested", "config.toml") | ||
|
|
||
| err := SaveConfig(configPath) | ||
| assert.NoError(t, err) | ||
|
|
||
| info, err := os.Stat(filepath.Dir(configPath)) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, os.FileMode(0o700), info.Mode().Perm()) | ||
| } | ||
|
Comment on lines
+51
to
+65
There was a problem hiding this comment. This permission assertion will be unreliable on Windows (and some non-POSIX filesystems), where
Owner
There was a problem hiding this comment. @copilot apply changes based on this feedback. skip for the windows
Contributor
Author
There was a problem hiding this comment. Applied. The permission test now skips on Windows using |
||
|
|
||
| func TestMergeConfig(t *testing.T) { | ||
| testCase := []struct { | ||
| name string | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using the import alias
pathfor thepath/filepathpackage (and then callingpath.Join/path.Dir) is easy to confuse with the standard librarypathpackage, especially as this file grows. Consider importingpath/filepathasfilepath(or without an alias) for clarity.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot apply changes based on this feedback
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. I replaced the
path/filepathalias withfilepathand updated usages ininternal/config/config_test.gofor clarity. Commit:7972728.