mirror of
https://github.com/marcogll/omarchy_setup.git
synced 2026-01-13 13:25:16 +00:00
feat: Add SSH keyring synchronization module for GNOME Keyring integration
This commit is contained in:
129
modules/ssh-keyring.sh
Executable file
129
modules/ssh-keyring.sh
Executable file
@@ -0,0 +1,129 @@
|
||||
#!/usr/bin/env bash
|
||||
# ===============================================================
|
||||
# ssh-keyring.sh - Sincronizar claves SSH con GNOME Keyring
|
||||
# ===============================================================
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "${SCRIPT_DIR}/common.sh"
|
||||
|
||||
_derive_fingerprint() {
|
||||
local key_path="$1"
|
||||
local pub_path="${key_path}.pub"
|
||||
local fingerprint=""
|
||||
|
||||
if [[ -f "$pub_path" ]]; then
|
||||
fingerprint="$(ssh-keygen -lf "$pub_path" 2>/dev/null | awk '{print $2}')"
|
||||
else
|
||||
fingerprint="$(ssh-keygen -lf <(ssh-keygen -y -f "$key_path" 2>/dev/null) 2>/dev/null | awk '{print $2}')"
|
||||
fi
|
||||
echo "$fingerprint"
|
||||
}
|
||||
|
||||
sync_ssh_keyring() {
|
||||
log_step "Sincronizar claves SSH con GNOME Keyring"
|
||||
|
||||
if ! command_exists gnome-keyring-daemon; then
|
||||
log_error "gnome-keyring-daemon no está instalado. Ejecuta primero el módulo de aplicaciones."
|
||||
return 1
|
||||
fi
|
||||
|
||||
if ! command_exists ssh-add; then
|
||||
log_error "ssh-add no está disponible (openssh). Instala el módulo de aplicaciones antes."
|
||||
return 1
|
||||
fi
|
||||
|
||||
mkdir -p "${HOME}/.config/environment.d"
|
||||
cat <<'EOF' > "${HOME}/.config/environment.d/10-gnome-keyring.conf"
|
||||
SSH_AUTH_SOCK=/run/user/$UID/keyring/ssh
|
||||
EOF
|
||||
|
||||
local keyring_eval=""
|
||||
if keyring_eval="$(gnome-keyring-daemon --start --components=ssh,secrets 2>/dev/null)"; then
|
||||
eval "$keyring_eval"
|
||||
log_success "GNOME Keyring iniciado."
|
||||
else
|
||||
log_info "GNOME Keyring ya estaba en ejecución."
|
||||
fi
|
||||
|
||||
local keyring_socket="${SSH_AUTH_SOCK:-/run/user/$UID/keyring/ssh}"
|
||||
if [[ ! -S "$keyring_socket" ]]; then
|
||||
log_warning "No se encontró el socket de GNOME Keyring en ${keyring_socket}."
|
||||
if [[ -S "/run/user/$UID/keyring/ssh" ]]; then
|
||||
keyring_socket="/run/user/$UID/keyring/ssh"
|
||||
else
|
||||
log_error "GNOME Keyring no expone el componente SSH. Revisa tu sesión."
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
export SSH_AUTH_SOCK="$keyring_socket"
|
||||
|
||||
local ssh_dir="${HOME}/.ssh"
|
||||
if [[ ! -d "$ssh_dir" ]]; then
|
||||
log_warning "No existe el directorio ${ssh_dir}. No hay claves para agregar."
|
||||
return 0
|
||||
fi
|
||||
|
||||
mapfile -t ssh_private_keys < <(
|
||||
find "$ssh_dir" -maxdepth 1 -type f -perm -u=r \
|
||||
! -name "*.pub" \
|
||||
! -name "*-cert.pub" \
|
||||
! -name "known_hosts" \
|
||||
! -name "known_hosts.*" \
|
||||
! -name "authorized_keys" \
|
||||
! -name "config" \
|
||||
! -name "*.old" \
|
||||
! -name "agent" \
|
||||
! -name "*.bak" \
|
||||
2>/dev/null | sort
|
||||
)
|
||||
if [[ ${#ssh_private_keys[@]} -eq 0 ]]; then
|
||||
log_warning "No se encontraron claves privadas SSH en ${ssh_dir}."
|
||||
return 0
|
||||
fi
|
||||
|
||||
local existing_fingerprints=""
|
||||
if output=$(SSH_AUTH_SOCK="$SSH_AUTH_SOCK" ssh-add -l 2>/dev/null); then
|
||||
existing_fingerprints="$(awk '{print $2}' <<<"$output")"
|
||||
else
|
||||
existing_fingerprints=""
|
||||
fi
|
||||
|
||||
local added=0
|
||||
for key_path in "${ssh_private_keys[@]}"; do
|
||||
local fingerprint
|
||||
fingerprint="$(_derive_fingerprint "$key_path")"
|
||||
if [[ -z "$fingerprint" ]] && ! ssh-keygen -y -f "$key_path" >/dev/null 2>&1; then
|
||||
log_warning "El archivo $(basename "$key_path") no parece una clave privada válida. Se omite."
|
||||
continue
|
||||
fi
|
||||
|
||||
if [[ -n "$fingerprint" ]] && grep -Fq "$fingerprint" <<<"$existing_fingerprints"; then
|
||||
log_info "Clave $(basename "$key_path") ya está registrada en el keyring."
|
||||
continue
|
||||
fi
|
||||
|
||||
log_info "Añadiendo clave $(basename "$key_path") al keyring..."
|
||||
if SSH_AUTH_SOCK="$SSH_AUTH_SOCK" ssh-add "$key_path"; then
|
||||
log_success "Clave $(basename "$key_path") añadida correctamente."
|
||||
added=$((added + 1))
|
||||
if [[ -n "$fingerprint" ]]; then
|
||||
existing_fingerprints+=$'\n'"$fingerprint"
|
||||
fi
|
||||
else
|
||||
log_warning "No se pudo añadir la clave $(basename "$key_path")."
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ $added -gt 0 ]]; then
|
||||
log_success "Claves SSH sincronizadas con GNOME Keyring."
|
||||
else
|
||||
log_info "No se añadieron nuevas claves SSH."
|
||||
fi
|
||||
|
||||
log_info "Para verificar, ejecuta: ssh-add -l"
|
||||
return 0
|
||||
}
|
||||
|
||||
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
||||
sync_ssh_keyring "$@"
|
||||
fi
|
||||
Reference in New Issue
Block a user