Update sites.inc
This commit is contained in:
265
inc/sites.inc
265
inc/sites.inc
@@ -681,151 +681,152 @@ SITEINFO(){
|
|||||||
read siteid
|
read siteid
|
||||||
echo
|
echo
|
||||||
|
|
||||||
site=${SITELIST[${siteid}]}
|
if [ "${SITELIST[${siteid}]}" != "" ]; then
|
||||||
sitefile=${gosite}/${site}.conf
|
site=${SITELIST[${siteid}]}
|
||||||
|
sitefile=${gosite}/${site}.conf
|
||||||
if [ "$(grep \#ssl_certificate ${sitefile})" != "" ]; then
|
if [ "$(grep \#ssl_certificate ${sitefile})" != "" ]; then
|
||||||
ssl='-'
|
ssl='-'
|
||||||
SUBJECTNAMES=""
|
SUBJECTNAMES=""
|
||||||
else
|
else
|
||||||
ssl='Yes'
|
ssl='Yes'
|
||||||
certpath=$(grep ssl_certificate_key ${sitefile})
|
certpath=$(grep ssl_certificate_key ${sitefile})
|
||||||
certpath=${certpath%/*}
|
certpath=${certpath%/*}
|
||||||
certpath=${certpath#* }
|
certpath=${certpath#* }
|
||||||
SUBJECTNAMES=$(openssl x509 -in ${certpath}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
|
SUBJECTNAMES=$(openssl x509 -in ${certpath}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
|
||||||
CERTEXPIRE=$(date -d "$(: | openssl x509 -in ${certpath}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s');
|
CERTEXPIRE=$(date -d "$(: | openssl x509 -in ${certpath}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s');
|
||||||
SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
|
SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then
|
if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then
|
||||||
type='Proxy'
|
type='Proxy'
|
||||||
server=$(grep 'set $server' ${sitefile})
|
server=$(grep 'set $server' ${sitefile})
|
||||||
server=${server#*\"}; server=${server%\"*}
|
server=${server#*\"}; server=${server%\"*}
|
||||||
|
|
||||||
servernames=$(grep 'server_name' ${sitefile})
|
servernames=$(grep 'server_name' ${sitefile})
|
||||||
servernames=${servernames//;/}
|
servernames=${servernames//;/}
|
||||||
servernames=${servernames#* }
|
servernames=${servernames#* }
|
||||||
servernames=${servernames// /,}
|
servernames=${servernames// /,}
|
||||||
|
|
||||||
scheme=$(grep 'set $forward_scheme' ${sitefile})
|
scheme=$(grep 'set $forward_scheme' ${sitefile})
|
||||||
scheme=${scheme##* }; scheme=${scheme%;*}
|
scheme=${scheme##* }; scheme=${scheme%;*}
|
||||||
port=$(grep 'set $port' ${sitefile})
|
port=$(grep 'set $port' ${sitefile})
|
||||||
port=${port##* }; port=${port%;*}
|
port=${port##* }; port=${port%;*}
|
||||||
|
|
||||||
else
|
|
||||||
type='HTTP'
|
|
||||||
fi
|
|
||||||
[ "$(grep '\#include conf.d/include/hsts-support.conf' ${sitefile})" != "" ] && hsts='-' || hsts='Yes'
|
|
||||||
[ "$(grep '\#include conf.d/include/websocket-support.conf' ${sitefile})" != "" ] && wbskt='-' || wbskt='Yes'
|
|
||||||
[ "$(grep '\#include conf.d/include/block-exploits.conf' ${sitefile})" != "" ] && explt='-' || explt='Yes'
|
|
||||||
# [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" != "" ] && lock='-' || lock='Yes'
|
|
||||||
if [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" == "" ]; then
|
|
||||||
sitefacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn ${site} /mnt/web-data/authelia/config/configuration.yml | sort | tail -n1)
|
|
||||||
sitefacline=${onefacline%%:*}
|
|
||||||
if [ "${sitefacline}" == "" ]; then
|
|
||||||
lock='error'
|
|
||||||
elif [ ${sitefacline} -lt ${onefacline} ]; then
|
|
||||||
lock='1FA'
|
|
||||||
elif [ ${sitefacline} -lt ${twofacline} ]; then
|
|
||||||
lock='2FA'
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
lock='-'
|
|
||||||
fi
|
|
||||||
f=0; edit=0
|
|
||||||
until [ "${edit^}" = "C" ]; do
|
|
||||||
echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${servernames}${idsST[Reset]}"
|
|
||||||
echo -e "\033[K${idsCL[White]}1) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${type}${idsST[Reset]}"
|
|
||||||
echo -en "\033[K${idsCL[White]}2) SSL Secure: ${idsCL[Cyan]}${idsST[Bold]}${ssl}${idsST[Reset]}"
|
|
||||||
[ "${SUBJECTNAMES}" != "" ] && echo -e " ${idsCL[Cyan]}[SSL Names: ${idsCL[Yellow]}${SUBJECTNAMES}${idsCL[Cyan]}; expires ${idsCL[Yellow]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Cyan]}]" || echo
|
|
||||||
echo -e "\033[K${idsCL[White]}3) HSTS Enabled ${idsCL[Cyan]}${idsST[Bold]}${hsts}${idsST[Reset]}"
|
|
||||||
echo -e "\033[K${idsCL[White]}4) Web Sockets: ${idsCL[Cyan]}${idsST[Bold]}${wbskt}${idsST[Reset]}"
|
|
||||||
echo -e "\033[K${idsCL[White]}5) Exploits Block: ${idsCL[Cyan]}${idsST[Bold]}${explt}${idsST[Reset]}"
|
|
||||||
echo -e "\033[K${idsCL[White]}6) Secured Access: ${idsCL[Cyan]}${idsST[Bold]}${lock}${idsST[Reset]}"
|
|
||||||
if [ "${type}" == "Proxy" ]; then
|
|
||||||
echo -e "\033[K${idsCL[White]}7) Proxy Address: ${idsCL[Cyan]}${idsST[Bold]}${server}${idsST[Reset]}"
|
|
||||||
echo -e "\033[K${idsCL[White]}8) Proxy Scheme: ${idsCL[Cyan]}${idsST[Bold]}${scheme}${idsST[Reset]}"
|
|
||||||
echo -e "\033[K${idsCL[White]}9) Proxy Port: ${idsCL[Cyan]}${idsST[Bold]}${port}${idsST[Reset]}"
|
|
||||||
else
|
else
|
||||||
echo -e "\033[K"
|
type='HTTP'
|
||||||
echo -e "\033[K"
|
|
||||||
echo -e "\033[K"
|
|
||||||
fi
|
fi
|
||||||
if [ "${edit}" != "s" ]; then
|
[ "$(grep '\#include conf.d/include/hsts-support.conf' ${sitefile})" != "" ] && hsts='-' || hsts='Yes'
|
||||||
# if [ $f -eq 0 ]; then
|
[ "$(grep '\#include conf.d/include/websocket-support.conf' ${sitefile})" != "" ] && wbskt='-' || wbskt='Yes'
|
||||||
|
[ "$(grep '\#include conf.d/include/block-exploits.conf' ${sitefile})" != "" ] && explt='-' || explt='Yes'
|
||||||
|
# [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" != "" ] && lock='-' || lock='Yes'
|
||||||
|
if [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" == "" ]; then
|
||||||
|
sitefacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn ${site} /mnt/web-data/authelia/config/configuration.yml | sort | tail -n1)
|
||||||
|
sitefacline=${onefacline%%:*}
|
||||||
|
if [ "${sitefacline}" == "" ]; then
|
||||||
|
lock='error'
|
||||||
|
elif [ ${sitefacline} -lt ${onefacline} ]; then
|
||||||
|
lock='1FA'
|
||||||
|
elif [ ${sitefacline} -lt ${twofacline} ]; then
|
||||||
|
lock='2FA'
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
lock='-'
|
||||||
|
fi
|
||||||
|
f=0; edit=0
|
||||||
|
until [ "${edit^}" = "C" ]; do
|
||||||
|
echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${servernames}${idsST[Reset]}"
|
||||||
|
echo -e "\033[K${idsCL[White]}1) Site Type: ${idsCL[Cyan]}${idsST[Bold]}${type}${idsST[Reset]}"
|
||||||
|
echo -en "\033[K${idsCL[White]}2) SSL Secure: ${idsCL[Cyan]}${idsST[Bold]}${ssl}${idsST[Reset]}"
|
||||||
|
[ "${SUBJECTNAMES}" != "" ] && echo -e " ${idsCL[Cyan]}[SSL Names: ${idsCL[Yellow]}${SUBJECTNAMES}${idsCL[Cyan]}; expires ${idsCL[Yellow]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Cyan]}]" || echo
|
||||||
|
echo -e "\033[K${idsCL[White]}3) HSTS Enabled ${idsCL[Cyan]}${idsST[Bold]}${hsts}${idsST[Reset]}"
|
||||||
|
echo -e "\033[K${idsCL[White]}4) Web Sockets: ${idsCL[Cyan]}${idsST[Bold]}${wbskt}${idsST[Reset]}"
|
||||||
|
echo -e "\033[K${idsCL[White]}5) Exploits Block: ${idsCL[Cyan]}${idsST[Bold]}${explt}${idsST[Reset]}"
|
||||||
|
echo -e "\033[K${idsCL[White]}6) Secured Access: ${idsCL[Cyan]}${idsST[Bold]}${lock}${idsST[Reset]}"
|
||||||
|
if [ "${type}" == "Proxy" ]; then
|
||||||
|
echo -e "\033[K${idsCL[White]}7) Proxy Address: ${idsCL[Cyan]}${idsST[Bold]}${server}${idsST[Reset]}"
|
||||||
|
echo -e "\033[K${idsCL[White]}8) Proxy Scheme: ${idsCL[Cyan]}${idsST[Bold]}${scheme}${idsST[Reset]}"
|
||||||
|
echo -e "\033[K${idsCL[White]}9) Proxy Port: ${idsCL[Cyan]}${idsST[Bold]}${port}${idsST[Reset]}"
|
||||||
|
else
|
||||||
echo -e "\033[K"
|
echo -e "\033[K"
|
||||||
echo -e "\033[K"
|
echo -e "\033[K"
|
||||||
echo -e "\033[K"
|
echo -e "\033[K"
|
||||||
echo -e "\033[K (${idsCL[Green]}s${idsCL[Default]})ave, (${idsCL[Red]}c${idsCL[Default]})ancel, (${idsCL[Green]}e${idsCL[Default]})xit"
|
fi
|
||||||
echo -e "\033[K"
|
if [ "${edit}" != "s" ]; then
|
||||||
echo -e "\033[K"
|
# if [ $f -eq 0 ]; then
|
||||||
echo -e "\033[7A"
|
echo -e "\033[K"
|
||||||
# fi
|
echo -e "\033[K"
|
||||||
|
echo -e "\033[K"
|
||||||
|
echo -e "\033[K (${idsCL[Green]}s${idsCL[Default]})ave, (${idsCL[Red]}c${idsCL[Default]})ancel, (${idsCL[Green]}e${idsCL[Default]})xit"
|
||||||
|
echo -e "\033[K"
|
||||||
|
echo -e "\033[K"
|
||||||
|
echo -e "\033[7A"
|
||||||
|
# fi
|
||||||
|
|
||||||
echo -en "\n\033[K${idsCL[LightCyan]}Enter the line number to edit: ${idsCL[Default]}"
|
echo -en "\n\033[K${idsCL[LightCyan]}Enter the line number to edit: ${idsCL[Default]}"
|
||||||
read -n 1 edit
|
read -n 1 edit
|
||||||
|
|
||||||
case "${edit}" in
|
case "${edit}" in
|
||||||
0) echo -e "\033[K\n\033[K"
|
0) echo -e "\033[K\n\033[K"
|
||||||
echo -en "\033[KEnter new Server Names (comma seperated): "
|
echo -en "\033[KEnter new Server Names (comma seperated): "
|
||||||
read -i "${servernames}" -e servernames
|
read -i "${servernames}" -e servernames
|
||||||
servernames=${servernames//, /,}
|
servernames=${servernames//, /,}
|
||||||
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
|
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
|
||||||
;;
|
;;
|
||||||
1) [ "${type}" == "HTTP" ] && type='Proxy' || type='HTTP';;
|
1) [ "${type}" == "HTTP" ] && type='Proxy' || type='HTTP';;
|
||||||
2) [ "${ssl}" == "-" ] && ssl='Yes' || ssl='-';;
|
2) [ "${ssl}" == "-" ] && ssl='Yes' || ssl='-';;
|
||||||
3) [ "${hsts}" == "-" ] && hsts='Yes' || hsts='-';;
|
3) [ "${hsts}" == "-" ] && hsts='Yes' || hsts='-';;
|
||||||
4) [ "${wbskt}" == "-" ] && wbskt='Yes' || wbskt='-';;
|
4) [ "${wbskt}" == "-" ] && wbskt='Yes' || wbskt='-';;
|
||||||
5) [ "${explt}" == "-" ] && explt='Yes' || explt='-';;
|
5) [ "${explt}" == "-" ] && explt='Yes' || explt='-';;
|
||||||
6) if [ "${lock}" == "-" ]; then
|
6) if [ "${lock}" == "-" ]; then
|
||||||
lock='1FA'
|
lock='1FA'
|
||||||
elif [ "${lock}" == "1FA" ]; then
|
elif [ "${lock}" == "1FA" ]; then
|
||||||
lock='2FA'
|
lock='2FA'
|
||||||
elif [ "${lock}" == "2FA" ]; then
|
elif [ "${lock}" == "2FA" ]; then
|
||||||
lock='-'
|
lock='-'
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
7) echo -e "\033[K\n\033[K"
|
7) echo -e "\033[K\n\033[K"
|
||||||
echo -en "\033[KEnter new Proxy Address: "
|
echo -en "\033[KEnter new Proxy Address: "
|
||||||
read -i "${server}" -e server
|
read -i "${server}" -e server
|
||||||
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
|
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
|
||||||
;;
|
;;
|
||||||
8) [ "${scheme}" == "http" ] && scheme='https' || scheme='http';;
|
8) [ "${scheme}" == "http" ] && scheme='https' || scheme='http';;
|
||||||
9) echo -e "\033[K\n\033[K"
|
9) echo -e "\033[K\n\033[K"
|
||||||
echo -en "\033[KEnter new Proxy Port: "
|
echo -en "\033[KEnter new Proxy Port: "
|
||||||
read -i "${port}" -e port
|
read -i "${port}" -e port
|
||||||
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
|
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
[Ee])
|
[Ee])
|
||||||
echo -e "\n\033[K\n\033[K"
|
echo -e "\n\033[K\n\033[K"
|
||||||
exit 0
|
exit 0
|
||||||
;;
|
;;
|
||||||
[Cc])
|
[Cc])
|
||||||
echo -e "\033[K\n\033[K"
|
echo -e "\r\033[K\n\r\033[K"
|
||||||
echo -e "\033[8A"; for (( c=1; c<=8; c++ )); do echo -e "\033[K"; done; echo -e "\033[8A"
|
echo -e "\033[7A"; for (( c=1; c<=7; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[7A"
|
||||||
;;
|
;;
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
[ "${edit}" == "" ] && echo -e "\033[13A" || echo -e "\033[12A"
|
[ "${edit}" == "" ] && echo -e "\033[13A" || echo -e "\033[12A"
|
||||||
else
|
else
|
||||||
echo -en "\n\033[K${idsCL[LightCyan]}Confirm changes (Y/n): ${idsCL[Default]}"
|
echo -en "\n\033[K${idsCL[LightCyan]}Confirm changes (Y/n): ${idsCL[Default]}"
|
||||||
read -n 1 confirm
|
read -n 1 confirm
|
||||||
case "${confirm}" in
|
case "${confirm}" in
|
||||||
[Nn])
|
[Nn])
|
||||||
edit=''
|
edit=''
|
||||||
echo -e "\033[12A"
|
echo -e "\033[12A"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo -e "\n\033[K\n\033[K"
|
echo -e "\n\033[K\n\033[K"
|
||||||
NEWPROXYSITE_CREATE ${site} ${servernames} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock} ${ssl}
|
NEWPROXYSITE_CREATE ${site} ${servernames} ${server} ${port} ${scheme} ${wbskt} ${hsts} ${explt} ${lock} ${ssl}
|
||||||
break 3
|
break 3
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
fi
|
fi
|
||||||
f=1
|
f=1
|
||||||
done
|
done
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user