🐛 fix: Odstránenie závislosti na jq — parsovanie JSON cez grep/sed
Proxmox host nemá jq nainštalované. Parsovanie users.json prepísané na grep/sed/awk v ct/ubuntu.sh aj ubuntu-install.sh. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -26,43 +26,97 @@ if [[ -n "${USERS_JSON:-}" && -n "${SELECTED_USERS:-}" ]]; then
|
||||
# Parsovanie SELECTED_USERS (whiptail vracia "user1" "user2" formát)
|
||||
selected_list=$(echo "$SELECTED_USERS" | tr -d '"')
|
||||
|
||||
user_count=$(echo "$USERS_JSON" | jq length)
|
||||
for i in $(seq 0 $((user_count - 1))); do
|
||||
username=$(echo "$USERS_JSON" | jq -r ".[$i].username")
|
||||
has_sudo=$(echo "$USERS_JSON" | jq -r ".[$i].sudo")
|
||||
# Parsovanie users.json bez jq — cez grep/sed/awk
|
||||
# Prechádzame každý blok užívateľa
|
||||
current_user=""
|
||||
current_sudo="false"
|
||||
current_keys=()
|
||||
in_keys=false
|
||||
|
||||
# Kontrola, či bol užívateľ vybraný
|
||||
if ! echo "$selected_list" | grep -qw "$username"; then
|
||||
while IFS= read -r line; do
|
||||
# Detekcia username
|
||||
if echo "$line" | grep -q '"username"'; then
|
||||
# Ak máme predchádzajúceho užívateľa, spracuj ho
|
||||
if [[ -n "$current_user" ]]; then
|
||||
# Kontrola, či bol užívateľ vybraný
|
||||
if echo "$selected_list" | grep -qw "$current_user"; then
|
||||
# Vytvorenie užívateľa s náhodným heslom
|
||||
random_pw=$(openssl rand -base64 16)
|
||||
useradd -m -s /bin/bash "$current_user"
|
||||
echo "${current_user}:${random_pw}" | chpasswd
|
||||
|
||||
# SSH kľúče
|
||||
user_home="/home/${current_user}"
|
||||
mkdir -p "${user_home}/.ssh"
|
||||
chmod 700 "${user_home}/.ssh"
|
||||
for key in "${current_keys[@]}"; do
|
||||
echo "$key" >> "${user_home}/.ssh/authorized_keys"
|
||||
done
|
||||
chmod 600 "${user_home}/.ssh/authorized_keys"
|
||||
chown -R "${current_user}:${current_user}" "${user_home}/.ssh"
|
||||
|
||||
# Sudo bez hesla
|
||||
if [[ "$current_sudo" == "true" ]]; then
|
||||
echo "${current_user} ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/${current_user}"
|
||||
chmod 440 "/etc/sudoers.d/${current_user}"
|
||||
fi
|
||||
|
||||
msg_ok "Užívateľ vytvorený: ${current_user}"
|
||||
fi
|
||||
fi
|
||||
current_user=$(echo "$line" | sed 's/.*"username"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/')
|
||||
current_sudo="false"
|
||||
current_keys=()
|
||||
in_keys=false
|
||||
fi
|
||||
|
||||
# Detekcia sudo
|
||||
if echo "$line" | grep -q '"sudo"'; then
|
||||
if echo "$line" | grep -q 'true'; then
|
||||
current_sudo="true"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Detekcia SSH kľúčov
|
||||
if echo "$line" | grep -q '"ssh_keys"'; then
|
||||
in_keys=true
|
||||
continue
|
||||
fi
|
||||
|
||||
# Vytvorenie užívateľa s náhodným heslom
|
||||
random_pw=$(openssl rand -base64 16)
|
||||
useradd -m -s /bin/bash "$username"
|
||||
echo "${username}:${random_pw}" | chpasswd
|
||||
|
||||
# SSH kľúče
|
||||
user_home="/home/${username}"
|
||||
mkdir -p "${user_home}/.ssh"
|
||||
chmod 700 "${user_home}/.ssh"
|
||||
|
||||
key_count=$(echo "$USERS_JSON" | jq ".[$i].ssh_keys | length")
|
||||
for k in $(seq 0 $((key_count - 1))); do
|
||||
key=$(echo "$USERS_JSON" | jq -r ".[$i].ssh_keys[$k]")
|
||||
echo "$key" >> "${user_home}/.ssh/authorized_keys"
|
||||
done
|
||||
|
||||
chmod 600 "${user_home}/.ssh/authorized_keys"
|
||||
chown -R "${username}:${username}" "${user_home}/.ssh"
|
||||
|
||||
# Sudo bez hesla
|
||||
if [[ "$has_sudo" == "true" ]]; then
|
||||
echo "${username} ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/${username}"
|
||||
chmod 440 "/etc/sudoers.d/${username}"
|
||||
if [[ "$in_keys" == true ]]; then
|
||||
if echo "$line" | grep -q '\]'; then
|
||||
in_keys=false
|
||||
continue
|
||||
fi
|
||||
local key
|
||||
key=$(echo "$line" | sed 's/.*"\(ssh-[^"]*\)".*/\1/')
|
||||
[[ -n "$key" && "$key" != "$line" ]] && current_keys+=("$key")
|
||||
fi
|
||||
done <<< "$USERS_JSON"
|
||||
|
||||
msg_ok "Užívateľ vytvorený: ${username}"
|
||||
done
|
||||
# Spracuj posledného užívateľa
|
||||
if [[ -n "$current_user" ]]; then
|
||||
if echo "$selected_list" | grep -qw "$current_user"; then
|
||||
random_pw=$(openssl rand -base64 16)
|
||||
useradd -m -s /bin/bash "$current_user"
|
||||
echo "${current_user}:${random_pw}" | chpasswd
|
||||
|
||||
user_home="/home/${current_user}"
|
||||
mkdir -p "${user_home}/.ssh"
|
||||
chmod 700 "${user_home}/.ssh"
|
||||
for key in "${current_keys[@]}"; do
|
||||
echo "$key" >> "${user_home}/.ssh/authorized_keys"
|
||||
done
|
||||
chmod 600 "${user_home}/.ssh/authorized_keys"
|
||||
chown -R "${current_user}:${current_user}" "${user_home}/.ssh"
|
||||
|
||||
if [[ "$current_sudo" == "true" ]]; then
|
||||
echo "${current_user} ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/${current_user}"
|
||||
chmod 440 "/etc/sudoers.d/${current_user}"
|
||||
fi
|
||||
|
||||
msg_ok "Užívateľ vytvorený: ${current_user}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# =============================================================================
|
||||
|
||||
Reference in New Issue
Block a user