启用SSH公钥认证并校验服务重载
This commit is contained in:
parent
7f0824d1f0
commit
01d24fb44d
@ -371,6 +371,50 @@ chmod 600 "$HOME/.ssh/authorized_keys"
|
|||||||
decoded="$(printf '%%s' '%s' | base64 -d)"
|
decoded="$(printf '%%s' '%s' | base64 -d)"
|
||||||
if ! grep -Fqx -- "$decoded" "$HOME/.ssh/authorized_keys"; then
|
if ! grep -Fqx -- "$decoded" "$HOME/.ssh/authorized_keys"; then
|
||||||
printf '%%s\n' "$decoded" >> "$HOME/.ssh/authorized_keys"
|
printf '%%s\n' "$decoded" >> "$HOME/.ssh/authorized_keys"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$(id -u)" -eq 0 ] && command -v sshd >/dev/null 2>&1; then
|
||||||
|
sshd_config_dir="/etc/ssh/sshd_config.d"
|
||||||
|
sshd_dropin="$sshd_config_dir/99-scert-pubkey.conf"
|
||||||
|
install -d -m 755 "$sshd_config_dir"
|
||||||
|
had_existing=0
|
||||||
|
old_config=""
|
||||||
|
if [ -f "$sshd_dropin" ]; then
|
||||||
|
had_existing=1
|
||||||
|
old_config="$(cat "$sshd_dropin")"
|
||||||
|
fi
|
||||||
|
temp_config="$(mktemp "$sshd_config_dir/.scert-pubkey.XXXXXX")"
|
||||||
|
restore_sshd_config() {
|
||||||
|
if [ "$had_existing" -eq 1 ]; then
|
||||||
|
printf '%%s\n' "$old_config" > "$sshd_dropin"
|
||||||
|
chmod 644 "$sshd_dropin"
|
||||||
|
else
|
||||||
|
rm -f "$sshd_dropin"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
printf '%%s\n' 'PubkeyAuthentication yes' 'AuthorizedKeysFile .ssh/authorized_keys' > "$temp_config"
|
||||||
|
chmod 644 "$temp_config"
|
||||||
|
mv -f "$temp_config" "$sshd_dropin"
|
||||||
|
if ! sshd -t; then
|
||||||
|
restore_sshd_config
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if command -v systemctl >/dev/null 2>&1; then
|
||||||
|
if ! systemctl reload ssh 2>/dev/null && ! systemctl reload sshd 2>/dev/null; then
|
||||||
|
restore_sshd_config
|
||||||
|
! systemctl reload ssh 2>/dev/null && ! systemctl reload sshd 2>/dev/null
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
elif command -v service >/dev/null 2>&1; then
|
||||||
|
if ! service ssh reload 2>/dev/null && ! service sshd reload 2>/dev/null; then
|
||||||
|
restore_sshd_config
|
||||||
|
! service ssh reload 2>/dev/null && ! service sshd reload 2>/dev/null
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
restore_sshd_config
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi`, encoded)
|
fi`, encoded)
|
||||||
}
|
}
|
||||||
func (c *sshClientAdapter) Run(ctx context.Context, command []string) (CommandResult, error) {
|
func (c *sshClientAdapter) Run(ctx context.Context, command []string) (CommandResult, error) {
|
||||||
|
|||||||
@ -86,3 +86,16 @@ func TestAuthorizedKeyInstallScriptUsesRealNewline(t *testing.T) {
|
|||||||
t.Fatalf("authorized key script still writes a literal backslash-n: %s", script)
|
t.Fatalf("authorized key script still writes a literal backslash-n: %s", script)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
func TestAuthorizedKeyInstallScriptEnablesRootPublicKeyAuthentication(t *testing.T) {
|
||||||
|
script := authorizedKeyInstallScript("encoded-public-key")
|
||||||
|
for _, required := range []string{
|
||||||
|
"PubkeyAuthentication yes",
|
||||||
|
"AuthorizedKeysFile .ssh/authorized_keys",
|
||||||
|
"sshd -t",
|
||||||
|
"systemctl reload ssh",
|
||||||
|
} {
|
||||||
|
if !strings.Contains(script, required) {
|
||||||
|
t.Fatalf("authorized key script is missing %q: %s", required, script)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user