Obtain key to sign if needed
This commit is contained in:
parent
57ab59f08f
commit
93aac9a07d
|
@ -5414,8 +5414,6 @@ function install_monkeysphere {
|
||||||
fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
|
fpr=$(gpg --with-colons --fingerprint $MY_GPG_PUBLIC_KEY_ID | grep fpr | head -n 1 | awk -F ':' '{print $10}')
|
||||||
monkeysphere-authentication add-identity-certifier $fpr
|
monkeysphere-authentication add-identity-certifier $fpr
|
||||||
|
|
||||||
#monkeysphere-host publish-key --all
|
|
||||||
|
|
||||||
echo 'install_monkeysphere' >> $COMPLETION_FILE
|
echo 'install_monkeysphere' >> $COMPLETION_FILE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -702,6 +702,12 @@ function sign_gpg_key {
|
||||||
if [ ${#IMAGE_URL} -gt 2 ]; then
|
if [ ${#IMAGE_URL} -gt 2 ]; then
|
||||||
clear
|
clear
|
||||||
fpr=$(gpg --with-colons --fingerprint $SIGN_ADDRESS | grep fpr | head -n 1 | awk -F ':' '{print $10}')
|
fpr=$(gpg --with-colons --fingerprint $SIGN_ADDRESS | grep fpr | head -n 1 | awk -F ':' '{print $10}')
|
||||||
|
if [[ $fpr == *"error"* ]]; then
|
||||||
|
gpg --search "$SIGN_ADDRESS"
|
||||||
|
fpr=$(gpg --with-colons --fingerprint $SIGN_ADDRESS | grep fpr | head -n 1 | awk -F ':' '{print $10}')
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $fpr != *"error"* ]]; then
|
||||||
if [ ${#fpr} -gt 2 ]; then
|
if [ ${#fpr} -gt 2 ]; then
|
||||||
gpg --sign-key $fpr
|
gpg --sign-key $fpr
|
||||||
if [ "$?" = "0" ]; then
|
if [ "$?" = "0" ]; then
|
||||||
|
@ -712,6 +718,7 @@ function sign_gpg_key {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
|
@ -636,6 +636,51 @@ function enable_monkeysphere {
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function register_website {
|
||||||
|
domain="$1"
|
||||||
|
|
||||||
|
if [[ ${domain} == *".local" ]]; then
|
||||||
|
echo $"Can't register local domains"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f /etc/ssl/private/${domain}.key ]; then
|
||||||
|
echo $"No SSL/TLS private key found for ${domain}"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f /etc/nginx/sites-available/${domain} ]; then
|
||||||
|
echo $"No virtual host found for ${domain}"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
monkeysphere-host import-key /etc/ssl/private/${domain}.key https://${domain}
|
||||||
|
monkeysphere-host publish-key
|
||||||
|
echo "0"
|
||||||
|
}
|
||||||
|
|
||||||
|
function register_website_interactive {
|
||||||
|
data=$(tempfile 2>/dev/null)
|
||||||
|
trap "rm -f $data" 0 1 2 5 15
|
||||||
|
dialog --title $"Register a website with monkeysphere" \
|
||||||
|
--backtitle $"Freedombone Security Settings" \
|
||||||
|
--inputbox $"Enter the website domain name (without https://)" 8 60 2>$data
|
||||||
|
sel=$?
|
||||||
|
case $sel in
|
||||||
|
0)
|
||||||
|
domain=$(<$data)
|
||||||
|
register_website "$domain"
|
||||||
|
if [ ! "$?" = "0" ]; then
|
||||||
|
dialog --title $"Register a website with monkeysphere" \
|
||||||
|
--msgbox "$?" 6 40
|
||||||
|
else
|
||||||
|
dialog --title $"Register a website with monkeysphere" \
|
||||||
|
--msgbox $"$domain has been registered" 6 40
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
function housekeeping {
|
function housekeeping {
|
||||||
cmd=(dialog --separate-output \
|
cmd=(dialog --separate-output \
|
||||||
--backtitle "Freedombone Security Configuration" \
|
--backtitle "Freedombone Security Configuration" \
|
||||||
|
@ -647,7 +692,8 @@ function housekeeping {
|
||||||
4 "Update cipersuite" off
|
4 "Update cipersuite" off
|
||||||
5 "Create a new Let's Encrypt certificate" off
|
5 "Create a new Let's Encrypt certificate" off
|
||||||
6 "Renew Let's Encrypt certificate" off
|
6 "Renew Let's Encrypt certificate" off
|
||||||
7 "Enable GPG based authentication (monkeysphere)" off)
|
7 "Enable GPG based authentication (monkeysphere)" off
|
||||||
|
8 "Register a website with monkeysphere" off)
|
||||||
choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
|
choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
|
||||||
clear
|
clear
|
||||||
for choice in $choices
|
for choice in $choices
|
||||||
|
@ -674,6 +720,9 @@ function housekeeping {
|
||||||
7)
|
7)
|
||||||
enable_monkeysphere
|
enable_monkeysphere
|
||||||
;;
|
;;
|
||||||
|
8)
|
||||||
|
register_website
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
@ -862,25 +911,6 @@ function refresh_gpg_keys {
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
function register_website {
|
|
||||||
domain="$1"
|
|
||||||
if [[ ${domain} == *".local" ]]; then
|
|
||||||
echo $"Can't register local domains"
|
|
||||||
exit 82438
|
|
||||||
fi
|
|
||||||
if [ ! -f /etc/ssl/private/${domain}.key ]; then
|
|
||||||
echo $"No SSL/TLS private key found for ${domain}"
|
|
||||||
exit 62852
|
|
||||||
fi
|
|
||||||
if [ ! -f /etc/nginx/sites-available/${domain} ]; then
|
|
||||||
echo $"No virtual host found for ${domain}"
|
|
||||||
exit 25625
|
|
||||||
fi
|
|
||||||
monkeysphere-host import-key /etc/ssl/private/${domain}.key https://${domain}
|
|
||||||
monkeysphere-host publish-key
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
function show_help {
|
function show_help {
|
||||||
echo ''
|
echo ''
|
||||||
echo "${PROJECT_NAME}-sec"
|
echo "${PROJECT_NAME}-sec"
|
||||||
|
|
Loading…
Reference in New Issue