diff --git a/src/freedombone-sec b/src/freedombone-sec index 5521bb0dc03edda388a19b99871e786052f529ac..e23356e8a61511be2097b4001d96f66f8a496da3 100755 --- a/src/freedombone-sec +++ b/src/freedombone-sec @@ -528,49 +528,32 @@ function create_letsencrypt { } function update_ciphersuite { - project_filename=/usr/local/bin/${PROJECT_NAME} - if [ ! -f $project_filename ]; then - project_filename=/usr/bin/${PROJECT_NAME} - fi - SSH_FILENAME=${project_filename}-utils-ssh - SSL_FILENAME=${project_filename}-utils-web + read_config_param SSL_CIPHERS + read_config_param SSL_PROTOCOLS + read_config_param SSH_CIPHERS + read_config_param SSH_MACS - RECOMMENDED_SSL_CIPHERS=$(cat $SSL_FILENAME | grep 'SSL_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}') - if [ ! "$RECOMMENDED_SSL_CIPHERS" ]; then - return - fi + RECOMMENDED_SSL_CIPHERS="$SSL_CIPHERS" if [ ${#RECOMMENDED_SSL_CIPHERS} -lt 5 ]; then return fi - RECOMMENDED_SSL_PROTOCOLS=$(cat $SSL_FILENAME | grep 'SSL_PROTOCOLS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}') - if [ ! "$RECOMMENDED_SSL_PROTOCOLS" ]; then - return - fi + RECOMMENDED_SSL_PROTOCOLS="$SSL_PROTOCOLS" if [ ${#RECOMMENDED_SSL_PROTOCOLS} -lt 5 ]; then return fi - RECOMMENDED_SSH_CIPHERS=$(cat $SSH_FILENAME | grep 'SSH_CIPHERS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}') - if [ ! "$RECOMMENDED_SSH_CIPHERS" ]; then - return - fi + RECOMMENDED_SSH_CIPHERS="$SSH_CIPHERS" if [ ${#RECOMMENDED_SSH_CIPHERS} -lt 5 ]; then return fi - RECOMMENDED_SSH_MACS=$(cat $SSH_FILENAME | grep 'SSH_MACS=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}') - if [ ! "$RECOMMENDED_SSH_MACS" ]; then - return - fi + RECOMMENDED_SSH_MACS="$SSH_MACS" if [ ${#RECOMMENDED_SSH_MACS} -lt 5 ]; then return fi - RECOMMENDED_SSH_KEX=$(cat $SSH_FILENAME | grep 'SSH_KEX=' | head -n 1 | awk -F '=' '{print $2}' | awk -F '"' '{print $2}') - if [ ! "$RECOMMENDED_SSH_KEX" ]; then - return - fi + RECOMMENDED_SSH_KEX="$SSH_KEX" if [ ${#RECOMMENDED_SSH_KEX} -lt 5 ]; then return fi @@ -581,12 +564,18 @@ function update_ciphersuite { sed -i "s|ssl_ciphers .*|ssl_ciphers '$RECOMMENDED_SSL_CIPHERS';|g" $WEBSITES_DIRECTORY/$file done systemctl restart nginx + write_config_param "SSL_PROTOCOLS" "$RECOMMENDED_SSL_PROTOCOLS" + write_config_param "SSL_CIPHERS" "$RECOMMENDED_SSL_CIPHERS" sed -i "s|Ciphers .*|Ciphers $RECOMMENDED_SSH_CIPHERS|g" $SSH_CONFIG sed -i "s|MACs .*|MACs $RECOMMENDED_SSH_MACS|g" $SSH_CONFIG sed -i "s|KexAlgorithms .*|KexAlgorithms $RECOMMENDED_SSH_KEX|g" $SSH_CONFIG systemctl restart ssh + write_config_param "SSH_CIPHERS" "$RECOMMENDED_SSH_CIPHERS" + write_config_param "SSH_MACS" "$RECOMMENDED_SSH_MACS" + write_config_param "SSH_KEX" "$RECOMMENDED_SSH_KEX" + dialog --title $"Update ciphersuite" \ --msgbox $"The ciphersuite has been updated to recommended versions" 6 40 exit 0