will/pamela
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added --no-certificat option to wget in scanner script to deal with https and badly configured wget ca-certificates, store -t parameter when registering cron job

Browse Source
This commit is contained in:
sandbender 2011-02-13 14:54:08 +01:00
parent b0d9788f37
commit d58e81d3cc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scanner/pamela-scanner.sh
View File

@ -73,7 +73,7 @@ function register {
check_if_root check_if_root
check_if_arpscan_installed check_if_arpscan_installed
echo "Registering pamela in cron: ${PAM_CRON}" echo "Registering pamela in cron: ${PAM_CRON}"
echo "*/2 * * * * [ -x \"${PAM_SCRIPT}\" ] && \"${PAM_SCRIPT}\" -i \"${IF}\" -o \"${OUT}\" -u \"${USER}\" -p \"${PASSWORD}\" | logger -t pamela" > "${PAM_CRON}" echo "*/2 * * * * [ -x \"${PAM_SCRIPT}\" ] && \"${PAM_SCRIPT}\" -i \"${IF}\" -o \"${OUT}\" -u \"${USER}\" -p \"${PASSWORD}\" -t \"${TRANSLATE}\" | logger -t pamela" > "${PAM_CRON}"
echo "Depending on your version of crond, you might have to restart the cron daemon for the changes to take effect" echo "Depending on your version of crond, you might have to restart the cron daemon for the changes to take effect"
} }
@ -141,7 +141,7 @@ function translate {
TRANSLATE_URL=${TRANSLATE} TRANSLATE_URL=${TRANSLATE}
TRANSLATE=$(mktemp) TRANSLATE=$(mktemp)
wget --quiet -O "${TRANSLATE}" "${TRANSLATE_URL}" wget --no-check-certificate --quiet -O "${TRANSLATE}" "${TRANSLATE_URL}"
POST=$(echo ${POST} | awk -v names="${TRANSLATE}" 'BEGIN { POST=$(echo ${POST} | awk -v names="${TRANSLATE}" 'BEGIN {
RS="\n" RS="\n"
@ -169,9 +169,9 @@ function translate {
function upload { function upload {
if [ -z "${SIMULATE}" ] if [ -z "${SIMULATE}" ]
then then
RESULT=$(wget "${OUT}" -O - --quiet --post-data "data=${POST}" --user "${USER}" --password "${PASSWORD}") RESULT=$(wget "${OUT}" --no-check-certificate -O - --quiet --post-data "data=${POST}" --user "${USER}" --password "${PASSWORD}")
else else
echo Not executing: [wget "${OUT}" -O - --quiet --post-data "data=${POST}" --user "${USER}" --password "${PASSWORD}"] echo Not executing: [wget "${OUT}" --no-check-certificate -O - --quiet --post-data "data=${POST}" --user "${USER}" --password "${PASSWORD}"]
RESULT= RESULT=
fi fi