Skip to content

Fix default config permissions #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Fix default config permissions #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cf0a75
Prevent openrc service from generating a config readable by everyone
mirefly42 May 2, 2025
d372b03
Prevent systemd service from generating a config readable by everyone
mirefly42 May 2, 2025
3c226e2
Prevent busybox-init service from generating a config readable by eve…
mirefly42 May 2, 2025
e7c0bd2
Prevent freebsd service from generating a config readable by everyone
mirefly42 May 2, 2025
ed0dc0d
Prevent deb package postinst script from generating a config readable…
mirefly42 May 2, 2025
39711d4
Prevent contrib/docker/entrypoint.sh script from generating a config …
mirefly42 May 2, 2025
eebee5f
Prevent contrib/macos/create-pkg.sh script from generating a config r…
mirefly42 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/busybox-init/S42yggdrasil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CONFFILE="/etc/yggdrasil.conf"

genconf() {
/usr/bin/yggdrasil -genconf > "$1"
(umask 037 && /usr/bin/yggdrasil -genconf > "$1")
return $?
}

Expand Down
2 changes: 1 addition & 1 deletion contrib/deb/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ then
chmod 640 /etc/yggdrasil/yggdrasil.conf
else
echo "Generating initial configuration file /etc/yggdrasil/yggdrasil.conf"
/usr/bin/yggdrasil -genconf > /etc/yggdrasil/yggdrasil.conf
(umask 037 && /usr/bin/yggdrasil -genconf > /etc/yggdrasil/yggdrasil.conf)

chown root:yggdrasil /etc/yggdrasil/yggdrasil.conf
chmod 640 /etc/yggdrasil/yggdrasil.conf
Expand Down
2 changes: 1 addition & 1 deletion contrib/docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CONF_DIR="/etc/yggdrasil-network"

if [ ! -f "$CONF_DIR/config.conf" ]; then
echo "generate $CONF_DIR/config.conf"
yggdrasil --genconf > "$CONF_DIR/config.conf"
(umask 037 && yggdrasil --genconf > "$CONF_DIR/config.conf")
fi

yggdrasil --useconf < "$CONF_DIR/config.conf"
Expand Down
2 changes: 1 addition & 1 deletion contrib/freebsd/yggdrasil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ yggdrasil_start()

test ! -f /etc/yggdrasil.conf && (
logger -s -t yggdrasil "Generating new configuration file into /etc/yggdrasil.conf"
/usr/local/bin/yggdrasil -genconf > /etc/yggdrasil.conf
(umask 037 && /usr/local/bin/yggdrasil -genconf > /etc/yggdrasil.conf)
)

tap_path="$(cat /etc/yggdrasil.conf | egrep -o '/dev/tap[0-9]{1,2}$')"
Expand Down
2 changes: 1 addition & 1 deletion contrib/macos/create-pkg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ then
echo "Normalising /etc/yggdrasil.conf"
/usr/local/bin/yggdrasil -useconffile /Library/Preferences/Yggdrasil/yggdrasil.conf.`date +%Y%m%d` -normaliseconf > /etc/yggdrasil.conf
else
/usr/local/bin/yggdrasil -genconf > /etc/yggdrasil.conf
(umask 037 && /usr/local/bin/yggdrasil -genconf > /etc/yggdrasil.conf)
fi

# Unload existing Yggdrasil launchd service, if possible
Expand Down
2 changes: 1 addition & 1 deletion contrib/openrc/yggdrasil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ depend() {
start_pre() {
if [ ! -f "${CONFFILE}" ]; then
ebegin "Generating new configuration file into ${CONFFILE}"
if ! eval ${command} -genconf > ${CONFFILE}; then
if ! (umask 037 && eval ${command} -genconf > ${CONFFILE}); then
eerror "Failed to generate configuration file"
exit 1
fi
Expand Down
1 change: 1 addition & 0 deletions contrib/systemd/yggdrasil-default-config.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ After=local-fs.target
[Service]
Type=oneshot
Group=yggdrasil
UMask=037
StandardOutput=file:/etc/yggdrasil.conf
ExecStart=/usr/bin/yggdrasil -genconf
ExecStartPost=/usr/bin/chmod 0640 /etc/yggdrasil.conf
1 change: 1 addition & 0 deletions contrib/systemd/yggdrasil-default-config.service.debian
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ After=local-fs.target
[Service]
Type=oneshot
Group=yggdrasil
UMask=037
ExecStartPre=/usr/bin/mkdir -p /etc/yggdrasil
ExecStart=/usr/bin/yggdrasil -genconf > /etc/yggdrasil/yggdrasil.conf
ExecStartPost=/usr/bin/chmod -R 0640 /etc/yggdrasil
Loading