toolshed/abra
4
2
Fork 18
Code Issues 27 Pull Requests Packages Releases 41 Activity

fix: $ABRA_dir/servers stricter permissions (again) #599

Merged
decentral1se merged 2 commits from fix/580-2 into main 2025-08-17 12:07:09 +00:00
Conversation 0 Commits 2 Files Changed 4 +9 -3
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/run.go
View File

@ -33,7 +33,7 @@ func Run(version, commit string) {
PersistentPreRun: func(cmd *cobra.Command, args []string) { PersistentPreRun: func(cmd *cobra.Command, args []string) {
dirs := []map[string]os.FileMode{ dirs := []map[string]os.FileMode{
{config.ABRA_DIR: 0764}, {config.ABRA_DIR: 0764},
{config.SERVERS_DIR: 0600}, {config.SERVERS_DIR: 0700},
{config.RECIPES_DIR: 0764}, {config.RECIPES_DIR: 0764},
{config.LOGS_DIR: 0764}, {config.LOGS_DIR: 0764},
} }

2
tests/integration/dirs.bats
View File

@ -39,5 +39,5 @@ setup(){
assert_not_exists "$ABRA_DIR/catalogue" assert_not_exists "$ABRA_DIR/catalogue"
server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers") server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers")
assert_equal $server_dir_perms "600" assert_equal $server_dir_perms "700"
} }

2
tests/integration/helpers/docker.bash
View File

@ -2,7 +2,7 @@
_ensure_swarm() { _ensure_swarm() {
if [ "$(docker info | grep Swarm | sed 's/Swarm: //g' | tr -d ' ')" == "inactive" ]; then if [ "$(docker info | grep Swarm | sed 's/Swarm: //g' | tr -d ' ')" == "inactive" ]; then
run docker swarm init run docker swarm init --advertise-addr 127.0.0.1:2377
assert_success assert_success
fi fi

6
tests/integration/server_add.bats
View File

@ -25,6 +25,9 @@ teardown(){
assert_output --partial "$TEST_SERVER" assert_output --partial "$TEST_SERVER"
assert bash -c "docker context ls | grep -q $TEST_SERVER" assert bash -c "docker context ls | grep -q $TEST_SERVER"
server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers/$TEST_SERVER")
assert_equal $server_dir_perms "600"
} }
@test "error if using name and --local together" { @test "error if using name and --local together" {
@ -39,6 +42,9 @@ teardown(){
assert_exists "$ABRA_DIR/servers/default" assert_exists "$ABRA_DIR/servers/default"
assert bash -c "docker context ls | grep -q default" assert bash -c "docker context ls | grep -q default"
assert_output --partial 'local server successfully added' assert_output --partial 'local server successfully added'
server_dir_perms=$(stat -c "%a" "$ABRA_DIR/servers/$TEST_SERVER")
assert_equal $server_dir_perms "600"
} }
@test "create local server fails when no docker swarm" { @test "create local server fails when no docker swarm" {