Skip to content

profile.bashrc: Fix SSH by not allowing *opts helper values to leak #4338

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

Merged
chewi merged 2 commits into from
Oct 26, 2026
Merged

profile.bashrc: Fix SSH by not allowing *opts helper values to leak #4338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6cbb72
profile.bashrc: Fix SSH by not allowing *opts (and *into) values to leak
chewi Oct 26, 2026
c8717d8
net-misc/openssh: Tighten permissions on 50-flatcar-sshd.conf
chewi Oct 26, 2026
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
1 change: 1 addition & 0 deletions changelog/bugfixes/2026-10-26-ssh-perms.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Alpha and Beta only: Fixed SSH client that was broken by a configuration file with bad permissions being unreadable. ([scripts#4338](https://github.com/flatcar/scripts/pull/4338))
16 changes: 8 additions & 8 deletions sdk_container/src/third_party/coreos-overlay/coreos/config/env/net-misc/openssh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ cros_post_src_install_flatcar_modifications() {
vendorize_pam_files

if [[ $(flatcar_target) != 'sdk' ]] ; then
insopts -m 0644
dosym -r /usr/share/flatcar/etc/ssh/ssh_config.d/50-flatcar-ssh.conf /usr/share/ssh/ssh_config
insinto /usr/share/flatcar/etc/ssh/ssh_config.d/
newins - 50-flatcar-ssh.conf
Expand All @@ -18,6 +19,7 @@ cros_post_src_install_flatcar_modifications() {
# Use defaults for ssh client system-wide configuration.
EOF

insopts -m 0600
dosym -r /usr/share/flatcar/etc/ssh/sshd_config.d/50-flatcar-sshd.conf /usr/share/ssh/sshd_config
insinto /usr/share/flatcar/etc/ssh/sshd_config.d/
newins - 50-flatcar-sshd.conf
Expand Down Expand Up @@ -46,18 +48,16 @@ PrintMotd no
HostkeyAlgorithms +ssh-rsa
PubkeyAcceptedAlgorithms +ssh-rsa
EOF

# Install our socket drop-in file that disables the rate
# limiting on the sshd socket.
(
insopts -m 0644
unit_dir=$(systemd_get_systemunitdir)
insinto "${unit_dir}/sshd.socket.d"
newins - no-trigger-limit-burst.conf <<'EOF'
insopts -m 0644
insinto "$(systemd_get_systemunitdir)/sshd.socket.d"
newins - no-trigger-limit-burst.conf <<'EOF'
[Socket]
TriggerLimitBurst=0
EOF
# Enable some sockets that aren't enabled by their own ebuilds.
systemd_enable_service sockets.target sshd.socket
)
# Enable some sockets that aren't enabled by their own ebuilds.
systemd_enable_service sockets.target sshd.socket
fi
}
8 changes: 8 additions & 0 deletions sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,14 @@ cros_stack_hooks() {
einfo "Running stacked hooks for ${phase}"
header=false
fi

# Don't allow *into or *opts helper values to leak between ebuilds and
# hook functions. They normally leak between ebuild phases, but leaking
# them to and from other scripts maintained by other people is
# hazardous. These default values come from Portage's phase-helpers.sh.
local -x __E_DESTTREE="/usr" __E_INSDESTTREE= __E_EXEDESTTREE= __E_DOCDESTTREE=
local -x INSOPTIONS="-m0644" EXEOPTIONS="-m0755" LIBOPTIONS="-m0644" DIROPTIONS="-m0755"

ebegin " ${func#cros_${phase}_}"
${func}
eend $?
Expand Down
Loading