mirror of
https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker.git
synced 2025-09-03 19:20:16 +00:00
update-ngxblocker: use getopts not getopt
long options for the command line are removed. getopt is replaced with the newer getopts (which is compatible with Debian's DASH Shell) * fixes https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/issues/35 * adds sanity checks for user command line switches * adds -v command line option to print blacklist version
This commit is contained in:
parent
59c34aebe7
commit
312ee8bdb5
1 changed files with 83 additions and 28 deletions
|
@ -35,22 +35,36 @@ CONF_DIR=/etc/nginx/conf.d
|
||||||
##### end user configuration ##############################################################
|
##### end user configuration ##############################################################
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
local script=$(basename $0)
|
local script=$(basename $0)
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
$script: update Nginx Bad Bot Blocker blacklist to: [ $CONF_DIR ]
|
$script: UPDATE Nginx Bad Bot Blocker blacklist in: [ $CONF_DIR ]
|
||||||
|
|
||||||
Usage: $script [OPTIONS]
|
Usage: $script [OPTIONS]
|
||||||
[ -c | --conf ] : NGINX conf directory (default: $CONF_DIR)
|
[ -c ] : NGINX conf directory (default: $CONF_DIR)
|
||||||
[ -r | --repo ] : Change repo url (default: $REPO)
|
[ -r ] : Change repo url (default: $REPO)
|
||||||
[ -e | --email ] : Change email address (default: $EMAIL)
|
[ -e ] : Change email address (default: $EMAIL)
|
||||||
[ -n | --no-email ] : Do not send email report (default: $SEND_EMAIL)
|
[ -n ] : Do not send email report (default: $SEND_EMAIL)
|
||||||
[ -h | --help ] : this help message
|
[ -v ] : Print blacklist version
|
||||||
|
[ -h ] : this help message
|
||||||
|
|
||||||
Examples:
|
Examples:
|
||||||
$script (Download blacklist.conf to: $CONF_DIR)
|
$script (Download blacklist.conf to: $CONF_DIR)
|
||||||
$script -c /my/custom/conf.d (Download blacklist.conf to a custom location)
|
$script -c /my/custom/conf.d (Download blacklist.conf to a custom location)
|
||||||
EOF
|
EOF
|
||||||
return 0
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
check_version() {
|
||||||
|
local file=$CONF_DIR/globalblacklist.conf
|
||||||
|
|
||||||
|
if [ -f $file ]; then
|
||||||
|
grep Version $file
|
||||||
|
grep 'Updated:' $file
|
||||||
|
else
|
||||||
|
printf "Missing '$file' (pass -c \$path before -v)\n"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
service_cmd() {
|
service_cmd() {
|
||||||
|
@ -77,28 +91,69 @@ wget_opts() {
|
||||||
echo $opts
|
echo $opts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sanitize_path() {
|
||||||
|
echo $1 |tr -cd '[:alnum:] [=@=] [=.=] [=-=] [=/=] [=_=]' \
|
||||||
|
|tr -s '@.-/_' |awk '{print tolower($0)}'
|
||||||
|
}
|
||||||
|
|
||||||
|
sanitize_url() {
|
||||||
|
echo $1 |tr -cd '[:alnum:] [=:=] [=.=] [=-=] [=/=]' \
|
||||||
|
|tr -s ':.-' |awk '{print tolower($0)}'
|
||||||
|
}
|
||||||
|
|
||||||
|
sanitize_email() {
|
||||||
|
echo $1 |tr -cd '[:alnum:] [=@=] [=.=] [=-=] [=_=]' \
|
||||||
|
|tr -s '@-_.' |awk '{print tolower($0)}'
|
||||||
|
}
|
||||||
|
|
||||||
|
check_args() {
|
||||||
|
local option=$1 type=$2 arg=$3
|
||||||
|
local msg="ERROR: option '-$option' argument '$arg' requires:"
|
||||||
|
|
||||||
|
case "$type" in
|
||||||
|
path) if ! echo $arg | grep ^/ 1>/dev/null; then
|
||||||
|
printf "$msg absolute path.\n"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
email) if ! echo $arg | grep -E ^[-_[:alnum:]]+@[-_[:alnum:]]+[\.][\.a-z]+ 1>/dev/null; then
|
||||||
|
printf "$msg email@domain.com\n"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
url) if ! echo $arg | grep -E ^http[s]?://[0-9a-zA-Z-]+[.]+[/0-9a-zA-Z.]+ 1>/dev/null; then
|
||||||
|
printf "$msg url => http[s]://the.url\n"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
none) printf "$msg argument.\n"; exit 1;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
get_options() {
|
get_options() {
|
||||||
local options=$(getopt -o c:r:e:nh --long \
|
local arg= opts=
|
||||||
bots:,conf:,repo:,email:,no-email,help,exec -- "$@" 2>/dev/null)
|
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
while getopts :c:r:e:nvh opts "$@"
|
||||||
usage
|
do
|
||||||
exit 1
|
if [ -n "${OPTARG}" ]; then
|
||||||
fi
|
case "$opts" in
|
||||||
|
r) arg=$(sanitize_url ${OPTARG});;
|
||||||
|
e) arg=$(sanitize_email ${OPTARG});;
|
||||||
|
*) arg=$(sanitize_path ${OPTARG});;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
eval set -- "$options"
|
case "$opts" in
|
||||||
|
c) CONF_DIR=$arg; check_args $opts path $arg ;;
|
||||||
while :; do
|
r) REPO=$arg; check_args $opts url $arg ;;
|
||||||
case "$1" in
|
e) EMAIL=$arg; check_args $opts email $arg ;;
|
||||||
-h | --help) usage && exit 1;;
|
n) SEND_EMAIL=N ;;
|
||||||
-c | --conf) CONF_DIR=$2; shift 2;;
|
v) check_version ;;
|
||||||
-r | --repo) REPO=$2; shift 2;;
|
h) usage ;;
|
||||||
-e | --email) EMAIL=$2; shift 2;;
|
\?) usage ;;
|
||||||
-n | --no-email) SEND_EMAIL=N; shift 2;;
|
:) check_args $OPTARG none none ;;
|
||||||
*) break;;
|
esac
|
||||||
esac
|
done
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue