Consistently create the temporary directory with the correct mode

Fixes #107.
CyberShadow · Jul 29, 2021 · bc81184 · bc81184
1 parent 34f3fbe
commit bc81184
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/common.bash b/src/common.bash
@@ -119,6 +119,9 @@ function AconfCompileOutput() {
 		return
 	fi
 
+	# shellcheck disable=SC2174
+	mkdir --mode=700 --parents "$tmp_dir"
+
 	rm -rf "$output_dir"
 	mkdir --parents "$output_dir"
 	mkdir "$output_dir"/files
@@ -248,6 +251,9 @@ function AconfCompileSystem() {
 		return
 	fi
 
+	# shellcheck disable=SC2174
+	mkdir --mode=700 --parents "$tmp_dir"
+
 	rm -rf "$system_dir"
 	mkdir --parents "$system_dir"
 	mkdir "$system_dir"/files
@@ -276,8 +282,7 @@ function AconfCompileSystem() {
 	AconfCreateFindIgnoreArgs ignore_args "${ignore_paths[@]}"
 
 	LogEnter 'Enumerating owned files...\n'
-	# shellcheck disable=SC2174
-	mkdir -m 700 --parents "$tmp_dir"
+	mkdir --parents "$tmp_dir"
 	( "$PACMAN" --query --list --quiet || true ) | sed 's#\/$##' | sort --unique > "$tmp_dir"/owned-files
 	LogLeave
 
@@ -791,8 +796,7 @@ function AconfAnalyzeFiles() {
 	LogEnter 'Examining files...\n'
 
 	LogEnter 'Loading data...\n'
-	# shellcheck disable=SC2174
-	mkdir -m 700 --parents "$tmp_dir"
+	mkdir --parents "$tmp_dir"
 	( cd "$output_dir"/files && find . -mindepth 1 -print0 ) | cut --zero-terminated -c 2- | sort --zero-terminated > "$tmp_dir"/output-files
 	( cd "$system_dir"/files && find . -mindepth 1 -print0 ) | cut --zero-terminated -c 2- | sort --zero-terminated > "$tmp_dir"/system-files
 	LogLeave

diff --git a/test/t/lib-funcs-common.bash b/test/t/lib-funcs-common.bash
@@ -179,6 +179,17 @@ function TestDone() {
 			| diff /dev/null /dev/stdin
 	) || FatalError 'Unknown stray global variables found!\n'
 
+	# Check that the temporary directory is created with the correct permissions
+	local tmp_dir_mode
+	if [[ -d "$tmp_dir" ]]
+	then
+		tmp_dir_mode=$(stat --format=%a "$tmp_dir")
+		if [[ "$tmp_dir_mode" != 700 ]]
+		then
+			FatalError '%q has mode %s, not 700!\n' "$tmp_dir" "$tmp_dir_mode"
+		fi
+	fi
+
 	LogLeave 'Test %s: %s!\n' "$(Color C "$test_name")" "$(Color G success)"
 	printf '\n' 1>&2 # Leave a blank line between tests
 	Exit 0

diff --git a/test/t/lib.bash b/test/t/lib.bash
@@ -30,6 +30,7 @@ do
 	mkdir -p "$dir"
 done
 unset dir
+rmdir "$tmp_dir"  # Allow AconfCompile... to create it with the correct mode
 
 source ./lib-funcs-common.bash
 if ((${ACONFMGR_INTEGRATION:-0}))