Compare commits
4 Commits
570f56adde
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 774dd8ae40 | |||
| a98b4207e6 | |||
| 9a568b3597 | |||
| da7bf7107a |
@@ -313,6 +313,29 @@ elif getent group wheel >/dev/null 2>&1; then
|
||||
usermod -aG wheel "${DEPLOY_USER}"
|
||||
fi
|
||||
|
||||
# useradd leaves the password field as "!" (locked). With UsePAM no (set during
|
||||
# hardening) sshd then rejects even key logins: "account is locked".
|
||||
# "*" = no password but not locked.
|
||||
if [[ "$(getent shadow "${DEPLOY_USER}" | cut -d: -f2)" =~ ^!+\*?$ ]]; then
|
||||
usermod -p '*' "${DEPLOY_USER}"
|
||||
fi
|
||||
|
||||
# Key-only user has no password to type, so sudo must not ask for one.
|
||||
if [[ "${DEPLOY_USER}" != "root" ]]; then
|
||||
if ! command -v sudo >/dev/null 2>&1 && command -v apt-get >/dev/null 2>&1; then
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y -qq sudo >/dev/null
|
||||
fi
|
||||
SUDOERS="/etc/sudoers.d/90-rubix-${DEPLOY_USER}"
|
||||
echo "${DEPLOY_USER} ALL=(ALL) NOPASSWD:ALL" > "${SUDOERS}.tmp"
|
||||
chmod 440 "${SUDOERS}.tmp"
|
||||
if visudo -cf "${SUDOERS}.tmp" >/dev/null; then
|
||||
mv "${SUDOERS}.tmp" "${SUDOERS}"
|
||||
else
|
||||
rm -f "${SUDOERS}.tmp"
|
||||
echo "WARN: sudoers check failed, ${DEPLOY_USER} has no passwordless sudo" >&2
|
||||
fi
|
||||
fi
|
||||
|
||||
install_key_for_user() {
|
||||
local u="$1"
|
||||
local home_dir
|
||||
@@ -362,6 +385,11 @@ set_sshd_option ChallengeResponseAuthentication no
|
||||
set_sshd_option PubkeyAuthentication yes
|
||||
set_sshd_option UsePAM no
|
||||
|
||||
# Debian accepts LANG/LC_* from the client; a PC locale that is not generated
|
||||
# here (e.g. en_GB.UTF-8) gives setlocale warnings on every login. The server
|
||||
# uses its own en_US.UTF-8 (generated below) instead.
|
||||
sed -i 's/^[[:space:]]*AcceptEnv[[:space:]]/#&/' "${SSHD}"
|
||||
|
||||
if [[ "${KEEP_ROOT}" == "yes" ]]; then
|
||||
set_sshd_option PermitRootLogin prohibit-password
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user