Redesign.
This commit is contained in:
@@ -1,17 +1,39 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
script_dir="$(dirname $(realpath $0))"
|
||||
conf_file=${script_dir}/conf/install_openvpn.conf
|
||||
|
||||
log_file="$(mktemp)"
|
||||
_date="$(date +%Y-%m-%d-%H%M)"
|
||||
|
||||
key_names_reserverd="ta ca server"
|
||||
|
||||
#---------------------------------------
|
||||
#-----------------------------
|
||||
# Base Function(s)
|
||||
# Some functions
|
||||
#-----------------------------
|
||||
#---------------------------------------
|
||||
|
||||
clean_up() {
|
||||
|
||||
# Perform program exit housekeeping
|
||||
rm $log_file
|
||||
exit $1
|
||||
}
|
||||
|
||||
is_number() {
|
||||
|
||||
return $(test ! -z "${1##*[!0-9]*}" > /dev/null 2>&1);
|
||||
|
||||
# - also possible
|
||||
# -
|
||||
#[[ ! -z "${1##*[!0-9]*}" ]] && return 0 || return 1
|
||||
#return $([[ ! -z "${1##*[!0-9]*}" ]])
|
||||
}
|
||||
|
||||
is_int() {
|
||||
return $(test "$@" -eq "$@" > /dev/null 2>&1);
|
||||
}
|
||||
|
||||
echononl(){
|
||||
echo X\\c > /tmp/shprompt$$
|
||||
if [ `wc -c /tmp/shprompt$$ | awk '{print $1}'` -eq 1 ]; then
|
||||
@@ -22,19 +44,19 @@ echononl(){
|
||||
rm /tmp/shprompt$$
|
||||
}
|
||||
|
||||
error(){
|
||||
echo ""
|
||||
echo -e "\t[ \033[31m\033[1mError\033[m ]: $*"
|
||||
echo ""
|
||||
}
|
||||
|
||||
fatal(){
|
||||
echo ""
|
||||
echo -e "\t[ \033[31m\033[1mFatal\033[m ]: $*"
|
||||
echo ""
|
||||
echo -e "\t\033[37m\033[1mInstalllation will be interrupted\033[m\033[m"
|
||||
echo ""
|
||||
exit 1
|
||||
}
|
||||
|
||||
error(){
|
||||
echo ""
|
||||
echo -e "\t[ \033[31m\033[1mError\033[m ]: $*"
|
||||
echo ""
|
||||
clean_up 1
|
||||
}
|
||||
|
||||
warn (){
|
||||
@@ -48,7 +70,6 @@ info (){
|
||||
echo -e "\t[ \033[32m\033[1mInfo\033[m ]: $*"
|
||||
echo ""
|
||||
}
|
||||
|
||||
echo_done() {
|
||||
echo -e "\033[80G[ \033[32mdone\033[m ]"
|
||||
}
|
||||
@@ -65,7 +86,98 @@ echo_skipped() {
|
||||
echo -e "\033[80G[ \033[37mskipped\033[m ]"
|
||||
}
|
||||
|
||||
trap clean_up SIGHUP SIGINT SIGTERM
|
||||
|
||||
|
||||
clear
|
||||
echo ""
|
||||
echo -e "\033[21G\033[32mCreate OpenVPN user certificate/key.. \033[m"
|
||||
echo ""
|
||||
echo ""
|
||||
|
||||
declare -a conf_file_arr=()
|
||||
declare -a conf_name_arr=()
|
||||
for _conf_file in `ls ${script_dir}/conf/server-*.conf 2>/dev/null` ; do
|
||||
conf_file_arr+=("${_conf_file}")
|
||||
_basename=$(basename $_conf_file)
|
||||
_tmp_name=${_basename%%.*}
|
||||
_tmp_name=${_tmp_name#*-}
|
||||
conf_name_arr+=("$_tmp_name")
|
||||
done
|
||||
|
||||
if [[ ${#conf_file_arr[@]} -lt 1 ]] ; then
|
||||
fatal "NO Configuration found!"
|
||||
fi
|
||||
|
||||
|
||||
echo ""
|
||||
|
||||
declare -i i=0
|
||||
|
||||
if [[ ${#conf_file_arr[@]} -gt 1 ]] ; then
|
||||
echo ""
|
||||
echo "Which Configuration should be loaded?"
|
||||
echo ""
|
||||
for _conf_file in ${conf_file_arr[@]} ; do
|
||||
echo " [${i}] ${conf_name_arr[${i}]}"
|
||||
(( i++ ))
|
||||
done
|
||||
_OK=false
|
||||
echo
|
||||
echononl "Eingabe: "
|
||||
while ! $_OK ; do
|
||||
read _IN
|
||||
if is_number "$_IN" && [[ -n ${conf_file_arr[$_IN]} ]]; then
|
||||
conf_file=${conf_file_arr[$_IN]}
|
||||
_OK=true
|
||||
else
|
||||
echo ""
|
||||
echo -e "\tFalsche Eingabe !"
|
||||
echo ""
|
||||
echononl "Eingabe: "
|
||||
fi
|
||||
done
|
||||
|
||||
else
|
||||
conf_file=${conf_file_arr[0]}
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo -e "\033[32m--\033[m"
|
||||
echo ""
|
||||
|
||||
|
||||
#---------------------------------------
|
||||
#-----------------------------
|
||||
# Read Configurations from $conf_file
|
||||
#-----------------------------
|
||||
#---------------------------------------
|
||||
|
||||
echononl " Load Configuration File $(basename ${conf_file}).."
|
||||
if [[ ! -f "$conf_file" ]]; then
|
||||
echo_failed
|
||||
fatal "Configuration file \033[37m\033[1m$(basename ${conf_file})\033[m not found!"
|
||||
else
|
||||
source "${conf_file}" > $log_file 2>&1
|
||||
if [[ $? -eq 0 ]]; then
|
||||
echo_ok
|
||||
else
|
||||
echo_failed
|
||||
fatal "$(cat $log_file)"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
[[ -n "$OPENVPN_SERVER" ]] || fatal "OpenVPN Server (parameter OPENVPN_SERVER ) not present!"
|
||||
[[ -n "$SERVER_PORT" ]] || fatal "Server Port (parameter SERVER_PORT ) not present!"
|
||||
|
||||
EASY_RSA_DIR="${OPENVPN_BASE_DIR}/easy-rsa"
|
||||
OPENVPN_CCD_DIR="${OPENVPN_BASE_DIR}/ccd/server-${OPENVPN_NAME}"
|
||||
|
||||
EMAIL_PREFIX="$(echo $KEY_EMAIL | cut -d '\' -f1)"
|
||||
EMAIL_DOMAIN="$(echo $KEY_EMAIL | cut -d '@' -f2)"
|
||||
|
||||
|
||||
echo ""
|
||||
echo -e "\033[32m--\033[m"
|
||||
echo ""
|
||||
@@ -83,6 +195,10 @@ if [ -z "$NEW_KEY_NAME" ]; then
|
||||
done
|
||||
fi
|
||||
|
||||
for _name in $key_names_reserverd ; do
|
||||
[[ "$_name" = "$NEW_KEY_NAME" ]] && fatal "Name '$NEW_KEY_NAME' cannot be used - its a reserved name!"
|
||||
done
|
||||
|
||||
echo ""
|
||||
echo -e "\033[32m--\033[m"
|
||||
echo ""
|
||||
@@ -109,6 +225,19 @@ do
|
||||
fi
|
||||
done
|
||||
|
||||
echo ""
|
||||
echo -e "\033[32m--\033[m"
|
||||
echo ""
|
||||
echo "OpenVPN name............: $OPENVPN_NAME"
|
||||
echo ""
|
||||
echo "OpenVPN Server..........: $OPENVPN_SERVER"
|
||||
echo ""
|
||||
echo "OpenVPN Base directory..: $OPENVPN_BASE_DIR"
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Key Name................: $NEW_KEY_NAME"
|
||||
echo "Key Password............: $KEY_PW"
|
||||
|
||||
info "Going to create key \033[37m\033[1m${NEW_KEY_NAME}.key\033[m.."
|
||||
echo -n "To continue type uppercase 'YES': "
|
||||
read OK
|
||||
@@ -119,26 +248,6 @@ fi
|
||||
|
||||
|
||||
|
||||
#---------------------------------------
|
||||
#-----------------------------
|
||||
# Read Configurations from $conf_file
|
||||
#-----------------------------
|
||||
#---------------------------------------
|
||||
|
||||
echononl " Load configuration file.."
|
||||
if [[ ! -f "$conf_file" ]]; then
|
||||
echo_failed
|
||||
fatal "Configuration file \033[37m\033[1m$(basename ${conf_file})\033[m not found!"
|
||||
else
|
||||
source "${conf_file}"
|
||||
if [[ $? -eq 0 ]]; then
|
||||
echo_ok
|
||||
else
|
||||
echo_failed
|
||||
fatal "$(cat $log_file)"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
#---------------------------------------
|
||||
#-----------------------------
|
||||
@@ -208,6 +317,199 @@ else
|
||||
error "$(cat $log_file)"
|
||||
fi
|
||||
|
||||
_client_conf_file="${OPENVPN_BASE_DIR}/${NEW_KEY_NAME}.conf.sample"
|
||||
echononl " Create sample client configuration ${_client_conf_file}.."
|
||||
cat << EOF > "$_client_conf_file" 2> $log_file
|
||||
##############################################
|
||||
# Sample client-side OpenVPN 2.0 config file #
|
||||
# for connecting to multi-client server. #
|
||||
# #
|
||||
# This configuration can be used by multiple #
|
||||
# clients, however each client should have #
|
||||
# its own cert and key files. #
|
||||
# #
|
||||
# On Windows, you might want to rename this #
|
||||
# file so it has a .ovpn extension #
|
||||
##############################################
|
||||
|
||||
# Specify that we are a client and that we
|
||||
# will be pulling certain config file directives
|
||||
# from the server.
|
||||
client
|
||||
|
||||
# Use the same setting as you are using on
|
||||
# the server.
|
||||
# On most systems, the VPN will not function
|
||||
# unless you partially or fully disable
|
||||
# the firewall for the TUN/TAP interface.
|
||||
;dev tap
|
||||
dev tun
|
||||
|
||||
# Are we connecting to a TCP or
|
||||
# UDP server? Use the same setting as
|
||||
# on the server
|
||||
proto udp
|
||||
|
||||
# The hostname/IP and port of the server.
|
||||
# You can have multiple remote entries
|
||||
# to load balance between the servers.
|
||||
remote $OPENVPN_SERVER $SERVER_PORT
|
||||
|
||||
topology subnet
|
||||
|
||||
# Keep trying indefinitely to resolve the
|
||||
# host name of the OpenVPN server. Very useful
|
||||
# on machines which are not permanently connected
|
||||
# to the internet such as laptops.
|
||||
resolv-retry infinite
|
||||
|
||||
# Most clients don't need to bind to
|
||||
# a specific local port number.
|
||||
nobind
|
||||
|
||||
# Try to preserve some state across restarts.
|
||||
persist-key
|
||||
persist-tun
|
||||
|
||||
# Server CA
|
||||
<ca>
|
||||
EOF
|
||||
|
||||
_file="${OPENVPN_BASE_DIR}/keys/ca.crt"
|
||||
_found=false
|
||||
while IFS='' read -r line || [[ -n $line ]]; do
|
||||
if [[ "$line" =~ "-----BEGIN" ]] ; then
|
||||
_found=true
|
||||
fi
|
||||
if $_found ; then
|
||||
echo "$line" >> "$_client_conf_file"
|
||||
fi
|
||||
if [[ "$line" =~ "-----END" ]]; then
|
||||
_found=false
|
||||
fi
|
||||
done < $_file
|
||||
|
||||
cat << EOF >> "$_client_conf_file" 2> $log_file
|
||||
</ca>
|
||||
|
||||
# Client Certificate
|
||||
<cert>
|
||||
EOF
|
||||
|
||||
_file="${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.crt"
|
||||
_found=false
|
||||
while IFS='' read -r line || [[ -n $line ]]; do
|
||||
if [[ "$line" =~ "-----BEGIN" ]] ; then
|
||||
_found=true
|
||||
fi
|
||||
if $_found ; then
|
||||
echo "$line" >> "$_client_conf_file"
|
||||
fi
|
||||
if [[ "$line" =~ "-----END" ]]; then
|
||||
_found=false
|
||||
fi
|
||||
done < $_file
|
||||
|
||||
cat << EOF >> "$_client_conf_file" 2> $log_file
|
||||
</cert>
|
||||
|
||||
# Client Key
|
||||
<key>
|
||||
EOF
|
||||
|
||||
_file="${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.key"
|
||||
_found=false
|
||||
while IFS='' read -r line || [[ -n $line ]]; do
|
||||
if [[ "$line" =~ "-----BEGIN" ]] ; then
|
||||
_found=true
|
||||
fi
|
||||
if $_found ; then
|
||||
echo "$line" >> "$_client_conf_file"
|
||||
fi
|
||||
if [[ "$line" =~ "-----END" ]]; then
|
||||
_found=false
|
||||
fi
|
||||
done < $_file
|
||||
|
||||
cat << EOF >> "$_client_conf_file" 2> $log_file
|
||||
</key>
|
||||
|
||||
# Verify server certificate by checking
|
||||
# that the certicate has the nsCertType
|
||||
# field set to "server". This is an
|
||||
# important precaution to protect against
|
||||
# a potential attack discussed here:
|
||||
# http://openvpn.net/howto.html#mitm
|
||||
#
|
||||
# To use this feature, you will need to generate
|
||||
# your server certificates with the nsCertType
|
||||
# field set to "server". The build-key-serve
|
||||
ns-cert-type server
|
||||
|
||||
# If a tls-auth key is used on the server
|
||||
# then every client must also have the key.
|
||||
#
|
||||
# Don't forget to set the 'key-direction' Parameter if using
|
||||
# Inline Key. Usualy , sever has key direction '0', while client
|
||||
# has ke direction '1'.
|
||||
#
|
||||
key-direction 1
|
||||
<tls-auth>
|
||||
EOF
|
||||
|
||||
_file="${OPENVPN_BASE_DIR}/keys/ta.key"
|
||||
_found=false
|
||||
while IFS='' read -r line || [[ -n $line ]]; do
|
||||
if [[ "$line" =~ "-----BEGIN" ]] ; then
|
||||
_found=true
|
||||
fi
|
||||
if $_found ; then
|
||||
echo "$line" >> "$_client_conf_file"
|
||||
fi
|
||||
if [[ "$line" =~ "-----END" ]]; then
|
||||
_found=false
|
||||
fi
|
||||
done < $_file
|
||||
|
||||
cat << EOF >> "$_client_conf_file" 2> $log_file
|
||||
</tls-auth>
|
||||
|
||||
# Select a cryptographic cipher.
|
||||
# If the cipher option is used on the server
|
||||
# then you must also specify it here.
|
||||
EOF
|
||||
|
||||
if [[ -n "$SERVER_CIPHER" ]]; then
|
||||
cat <<EOF >> "$_client_conf_file" 2>> "$log_file"
|
||||
cipher AES-256-CBC
|
||||
EOF
|
||||
fi
|
||||
|
||||
cat <<EOF >> "$_client_conf_file" 2>> "$log_file"
|
||||
|
||||
# Enable compression on the VPN link.
|
||||
# Don't enable this unless it is also
|
||||
# enabled in the server config file.
|
||||
comp-lzo
|
||||
|
||||
# Verbosity level.
|
||||
# 0 -- quiet except for fatal errors.
|
||||
# 1 -- mostly quiet, but display non-fatal network errors.
|
||||
# 3 -- medium output, good for normal operation.
|
||||
# 9 -- verbose, good for troubleshooting
|
||||
verb 1
|
||||
|
||||
# Setting 'pull' on the client takes care to get the 'push' durectives
|
||||
# from the server
|
||||
pull
|
||||
EOF
|
||||
if [[ $? -eq 0 ]] ; then
|
||||
echo_ok
|
||||
else
|
||||
echo_failed
|
||||
#error "$(cat $log_file)"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
echo ""
|
||||
@@ -260,19 +562,23 @@ if $_copy_to_user_home_dir ; then
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
_failed=true
|
||||
fi
|
||||
cp -a ${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.key "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
cp -a "${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.key" "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
_failed=true
|
||||
fi
|
||||
cp -a -a ${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.crt "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
cp -a "$_client_conf_file" "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}/client-$(basename $_client_conf_file)"
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
_failed=true
|
||||
fi
|
||||
cp -a -a ${OPENVPN_BASE_DIR}/keys/ca.crt "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
cp -a "${OPENVPN_BASE_DIR}/keys/${NEW_KEY_NAME}.crt" "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
_failed=true
|
||||
fi
|
||||
cp -a -a ${OPENVPN_BASE_DIR}/keys/ta.key "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
cp -a "${OPENVPN_BASE_DIR}/keys/ca.crt" "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
_failed=true
|
||||
fi
|
||||
cp -a "${OPENVPN_BASE_DIR}/keys/ta.key" "${_home_dir}/VPN/${KEY_CN}-${NEW_KEY_NAME}" >> $log_file 2>&1
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
_failed=true
|
||||
fi
|
||||
@@ -297,7 +603,5 @@ EOF
|
||||
fi
|
||||
|
||||
|
||||
|
||||
rm -f $log_file
|
||||
echo ""
|
||||
exit 0
|
||||
clean_up 0
|
||||
|
||||
Reference in New Issue
Block a user