Compare commits
No commits in common. "main" and "v0.0.3" have entirely different histories.
7 changed files with 83 additions and 149 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,3 +0,0 @@
|
|||
mkinitcpio-dropbear*.tar.zst
|
||||
src/
|
||||
pkg/
|
||||
23
ChangeLog
23
ChangeLog
|
|
@ -1,23 +0,0 @@
|
|||
2024-05-09 Marko Korhonen <marko@korhonen.cc>
|
||||
|
||||
* 0.1.0 :
|
||||
- Add support for ed25519 host keys
|
||||
- Add support for a config file which allows changing the dropbear port
|
||||
|
||||
2015-08-11 Giancarlo Razzolini <grazzolini@gmail.com>
|
||||
|
||||
* 0.0.3 :
|
||||
- Correction of the hook help text.
|
||||
- Changed the root user home directory to /root.
|
||||
- Some other cleanups, specially regarding TMPDIR files juggling.
|
||||
|
||||
2015-07-28 Giancarlo Razzolini <grazzolini@gmail.com>
|
||||
|
||||
* 0.0.2 :
|
||||
- Removed leftovers from the old dropbear_initrd_encrypt which where conflicting with mkinitcpio-utils.
|
||||
|
||||
2015-07-14 Giancarlo Razzolini <grazzolini@gmail.com>
|
||||
|
||||
* 0.0.1 :
|
||||
- Initial release.
|
||||
- Provide the same functionality as in dropbear_initrd_encrypt regarding dropbear.
|
||||
1
LICENSE
1
LICENSE
|
|
@ -1,4 +1,3 @@
|
|||
Copyright (c) 2024, Marko Korhonen
|
||||
Copyright (c) 2015, Giancarlo Razzolini
|
||||
All rights reserved.
|
||||
|
||||
|
|
|
|||
36
PKGBUILD
36
PKGBUILD
|
|
@ -1,36 +0,0 @@
|
|||
# Maintainer: Marko Korhonen <marko@korhonen.cc>
|
||||
# Contributor: Caleb Maclennan <caleb@alerque.com>
|
||||
# Contributor: Giancarlo Razzolini <grazzolini@archlinux.org>
|
||||
|
||||
pkgname=mkinitcpio-dropbear2
|
||||
pkgname_="mkinitcpio-dropbear"
|
||||
conflicts=("$pkgname_")
|
||||
pkgver=0.1.0
|
||||
pkgrel=1
|
||||
pkgdesc='hook to install and enable the dropbear daemon in early userspace'
|
||||
arch=(any)
|
||||
url="https://git.korhonen.cc/FunctionalHacker/$pkgname_"
|
||||
license=(GPL3)
|
||||
depends=(dropbear psmisc)
|
||||
optdepends=(
|
||||
'mkinitcpio-netconf: Network interface configuration'
|
||||
'mkinitcpio-ppp: PPP interface configuration'
|
||||
'openssh: Allows the use of the same host keys used for normal access'
|
||||
)
|
||||
source=(
|
||||
"dropbear_hook"
|
||||
"dropbear_install"
|
||||
"LICENSE"
|
||||
)
|
||||
backup=("etc/dropbear/config")
|
||||
changelog=ChangeLog
|
||||
sha256sums=('9852ab6a3ba4191ed3eabbfebb2876fe7ff1003f62309043ec0b8b9374e3b9ee'
|
||||
'3f6cb2c6edd2a5510e9d2366b68815b0d0f9d7cfc066c26c4b842af44d2024fd'
|
||||
'ac69d63ecc672c698582b0fc260dbfe42d71adcdab707f807c8e1113be11abd8')
|
||||
|
||||
package() {
|
||||
install -Dm0644 dropbear_hook "$pkgdir/usr/lib/initcpio/hooks/dropbear"
|
||||
install -Dm0644 dropbear_install "$pkgdir/usr/lib/initcpio/install/dropbear"
|
||||
install -Dm0644 dropbear_config "$pkgdir/etc/dropbear/config"
|
||||
install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname_/" LICENSE
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
DROPBEAR_PORT=22
|
||||
|
|
@ -1,24 +1,19 @@
|
|||
#!/bin/sh
|
||||
#!/usr/bin/ash
|
||||
|
||||
run_hook() {
|
||||
run_hook ()
|
||||
{
|
||||
[ -d /dev/pts ] || mkdir -p /dev/pts
|
||||
mount -t devpts devpts /dev/pts
|
||||
|
||||
if [ -s /etc/dropbear/config ]; then
|
||||
echo "Found dropbear config file"
|
||||
. /etc/dropbear/config
|
||||
fi
|
||||
|
||||
port=${DROPBEAR_PORT:-22}
|
||||
|
||||
echo "Starting dropbear on port $port"
|
||||
/usr/sbin/dropbear -E -s -j -k -p "$port"
|
||||
echo "Starting dropbear"
|
||||
/usr/sbin/dropbear -E -s -j -k
|
||||
}
|
||||
|
||||
run_cleanuphook() {
|
||||
run_cleanuphook ()
|
||||
{
|
||||
umount /dev/pts
|
||||
rm -R /dev/pts
|
||||
if [ -f /var/run/dropbear.pid ]; then
|
||||
kill "$(cat /var/run/dropbear.pid)"
|
||||
kill `cat /var/run/dropbear.pid`
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,67 +1,75 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
CONFIG_FILE="/etc/dropbear/config"
|
||||
KEY_TYPES="ed25519 ecdsa rsa"
|
||||
#!/bin/bash
|
||||
|
||||
get_fingerprint() {
|
||||
kf="$1"
|
||||
dropbearkey -y -f "${kf}" | sed -n '/^Fingerprint:/ {s/Fingerprint: *//; p}'
|
||||
local keyfile="$1"
|
||||
dropbearkey -y -f "${keyfile}" | sed -n '/^Fingerprint:/ {s/Fingerprint: *//; p}'
|
||||
}
|
||||
|
||||
display_fingerprints() {
|
||||
for kt in $KEY_TYPES; do
|
||||
kf="/etc/dropbear/dropbear_${kt}_host_key"
|
||||
if [ -s "${kf}" ]; then
|
||||
echo "$(basename "${kf}") : $(get_fingerprint "${kf}")"
|
||||
local keyfile
|
||||
|
||||
for keyfile in "/etc/dropbear/dropbear_rsa_host_key" "/etc/dropbear/dropbear_dss_host_key" "/etc/dropbear/dropbear_ecdsa_host_key" ; do
|
||||
if [ -s "${keyfile}" ] ; then
|
||||
echo "$(basename "${keyfile}") : $(get_fingerprint "${keyfile}")"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
copy_openssh_keys() {
|
||||
return_code=1
|
||||
local osshrsa="/etc/ssh/ssh_host_rsa_key"
|
||||
local osshdsa="/etc/ssh/ssh_host_dsa_key"
|
||||
local osshecdsa="/etc/ssh/ssh_host_ecdsa_key"
|
||||
|
||||
for kt in $KEY_TYPES; do
|
||||
osshkey="/etc/ssh/ssh_host_${kt}_key"
|
||||
if [ -s "$osshkey" ]; then
|
||||
dropbearconvert \
|
||||
openssh dropbear \
|
||||
"$osshkey" \
|
||||
"/etc/dropbear/dropbear_${kt}_host_key"
|
||||
local dbpre="/etc/dropbear/dropbear_"
|
||||
|
||||
local return_code=1
|
||||
|
||||
if [ -s "$osshrsa" ]; then
|
||||
dropbearconvert openssh dropbear $osshrsa ${dbpre}rsa_host_key
|
||||
return_code=0
|
||||
fi
|
||||
|
||||
if [ -s "$osshdsa" ]; then
|
||||
dropbearconvert openssh dropbear $osshdsa ${dbpre}dss_host_key
|
||||
return_code=0
|
||||
fi
|
||||
|
||||
if [ -s "$osshecdsa" ]; then
|
||||
dropbearconvert openssh dropbear $osshecdsa ${dbpre}ecdsa_host_key
|
||||
return_code=0
|
||||
fi
|
||||
done
|
||||
|
||||
return $return_code
|
||||
}
|
||||
|
||||
generate_keys() {
|
||||
for kt in $KEY_TYPES; do
|
||||
kf="/etc/dropbear/dropbear_${kt}_host_key"
|
||||
if [ ! -s "$kf" ]; then
|
||||
echo "Generating ${kt} host key for dropbear ..."
|
||||
dropbearkey -t "${kt}" -f "${kf}"
|
||||
local keyfile keytype
|
||||
for keytype in rsa dss ecdsa ; do
|
||||
keyfile="/etc/dropbear/dropbear_${keytype}_host_key"
|
||||
if [ ! -s "$keyfile" ]; then
|
||||
echo "Generating ${keytype} host key for dropbear ..."
|
||||
dropbearkey -t "${keytype}" -f "${keyfile}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
build ()
|
||||
{
|
||||
#
|
||||
# Begin real processing
|
||||
#
|
||||
|
||||
# Are we even needed?
|
||||
if [ ! -r "/etc/dropbear/root_key" ] || [ ! -s "/etc/dropbear/root_key" ]; then
|
||||
if [ ! -r "/etc/dropbear/root_key" -o ! -s "/etc/dropbear/root_key" ]; then
|
||||
echo "There is no root key in /etc/dropbear/root_key existent; exit"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# if TMPDIR is set leave it alone otherwise set
|
||||
[ -z "$TMPDIR" ] && TMPDIR='/tmp/dropbear_initrd_encrypt'
|
||||
[ -z $TMPDIR ] && TMPDIR='/tmp/dropbear_initrd_encrypt'
|
||||
|
||||
# check if TMPDIR exsists if not make it
|
||||
[ -d "$TMPDIR" ] || mkdir -p "$TMPDIR"
|
||||
[ -d $TMPDIR ] || mkdir -p $TMPDIR
|
||||
|
||||
umask 0022
|
||||
|
||||
|
|
@ -76,7 +84,7 @@ build() {
|
|||
add_binary "dropbear"
|
||||
|
||||
add_dir "/root/.ssh"
|
||||
cat /etc/dropbear/root_key >"${BUILDROOT}"/root/.ssh/authorized_keys
|
||||
cat /etc/dropbear/root_key > "${BUILDROOT}"/root/.ssh/authorized_keys
|
||||
|
||||
add_full_dir "/etc/dropbear"
|
||||
add_file "/lib/libnss_files.so.2"
|
||||
|
|
@ -84,17 +92,12 @@ build() {
|
|||
add_dir "/var/log"
|
||||
touch "${BUILDROOT}"/var/log/lastlog
|
||||
|
||||
if [ -s $CONFIG_FILE ]; then
|
||||
echo "Using config file $CONFIG_FILE:"
|
||||
cat $CONFIG_FILE
|
||||
add_file $CONFIG_FILE
|
||||
fi
|
||||
|
||||
add_runscript
|
||||
}
|
||||
|
||||
help() {
|
||||
cat <<HELPEOF
|
||||
help ()
|
||||
{
|
||||
cat<<HELPEOF
|
||||
This hook is meant to be used in conjunction with mkinitcpio-netconf and/or
|
||||
mkinitcpio-ppp. It DOES NOT provide any default shell. It will only install
|
||||
and start dropbear on early userspace. In the package mkinitcpio-utils you
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue