toolshed/abra
4
2
Fork 18
Code Issues 20 Pull Requests 2 Packages Releases 40 Activity

fix: ensure $ABRA_DIR/servers is 0600 #592

Merged
decentral1se merged 1 commits from fix/580 into main 2025-08-17 09:17:01 +00:00
Conversation 1 Commits 1 Files Changed 2 +16 -15
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cli/run.go
View File

@ -31,21 +31,21 @@ func Run(version, commit string) {
"upgrade", "upgrade",
}, },
PersistentPreRun: func(cmd *cobra.Command, args []string) { PersistentPreRun: func(cmd *cobra.Command, args []string) {
paths := []string{ dirs := []map[string]os.FileMode{
config.ABRA_DIR, {config.ABRA_DIR: 0764},
config.SERVERS_DIR, {config.SERVERS_DIR: 0600},
config.RECIPES_DIR, {config.RECIPES_DIR: 0764},
config.LOGS_DIR, {config.LOGS_DIR: 0764},
config.VENDOR_DIR, // TODO(d1): remove > 0.9.x
config.BACKUP_DIR, // TODO(d1): remove > 0.9.x
} }
for _, path := range paths { for _, dir := range dirs {
if err := os.Mkdir(path, 0764); err != nil { for path, perm := range dir {
if !os.IsExist(err) { if err := os.Mkdir(path, perm); err != nil {
log.Fatal(err) if !os.IsExist(err) {
log.Fatal(err)
}
continue
} }
continue
} }
} }

7
tests/integration/dirs.bats
View File

@ -24,7 +24,7 @@ setup(){
assert_success assert_success
} }
@test "abra directory is created" { @test "abra directories are created" {
run $ABRA app ls run $ABRA app ls
# NOTE(d1): no servers yet, so will fail. however, it will run the required # NOTE(d1): no servers yet, so will fail. however, it will run the required
@ -35,8 +35,9 @@ setup(){
assert_exists "$ABRA_DIR" assert_exists "$ABRA_DIR"
assert_exists "$ABRA_DIR/servers" assert_exists "$ABRA_DIR/servers"
assert_exists "$ABRA_DIR/recipes" assert_exists "$ABRA_DIR/recipes"
assert_exists "$ABRA_DIR/backups"
assert_exists "$ABRA_DIR/vendor"
assert_not_exists "$ABRA_DIR/catalogue" assert_not_exists "$ABRA_DIR/catalogue"
server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers")
assert_equal $server_dir_perms "600"
} }