diff --git a/packages/warden-client-2.2-beta.tar.gz b/packages/warden-client-2.2-beta.tar.gz index 80a17db4e73390dc6ff55224ff6c201265c043e5..59926d57e7d289ac3d8fc48775918351bb1da80b 100644 Binary files a/packages/warden-client-2.2-beta.tar.gz and b/packages/warden-client-2.2-beta.tar.gz differ diff --git a/packages/warden-client-2.2-beta.tar.gz.sig b/packages/warden-client-2.2-beta.tar.gz.sig index 2aab299fbe31f5dfc56fffffd127269fde12c6bf..78aaef5399f740c9fe9b7d394eeefa6af105382b 100644 --- a/packages/warden-client-2.2-beta.tar.gz.sig +++ b/packages/warden-client-2.2-beta.tar.gz.sig @@ -1 +1 @@ -4d05f9267428cf0cc850579e3e90840e79e4f93b warden-client-2.2-beta.tar.gz +02bdd93c01785e92fede094a2eaa4f1abf2562a2 warden-client-2.2-beta.tar.gz diff --git a/src/warden-client/doc/example-sender-2.pl.txt b/src/warden-client/doc/example-sender-2.pl.txt index 6e2a5fa87ad4d77ffd29b7dfeec9b83b0eee9df8..07a9e77493949e7dd9cf5cbf476802c8fa726e36 100755 --- a/src/warden-client/doc/example-sender-2.pl.txt +++ b/src/warden-client/doc/example-sender-2.pl.txt @@ -36,57 +36,57 @@ use Switch; use strict; use DateTime; -my $warden_path = '/home/soukal/pokus/warden/warden-client'; +my $warden_path = '/home/soukal/pokus/warden-2.2-beta-package/warden-client-2.2-beta-installation-3/dummy/foo/whatever/warden-client'; require $warden_path . '/lib/WardenClientSend.pm'; my $service = "test"; # service is needed in authorization process of the client, # therefore it can not be set randomly -#switch (int(rand(2) + 0.5)) { -# case 0 { $service = 'ScanDetector'; } -# case 1 { $service = 'PhiGaro'; } -# case 2 { $service = 'HoneyScan'; } +#switch (int(rand(3) + 0.5)) { +# case 1 { $service = 'ScanDetector'; } +# case 2 { $service = 'PhiGaro'; } +# case 3 { $service = 'HoneyScan'; } # } my $detected = DateTime->from_epoch(epoch => time()); my $type = ""; -switch (int(rand(9) + 0.5)) { - case 0 { $type = 'portscan'; } - case 1 { $type = 'bruteforce'; } - case 2 { $type = 'spam'; } - case 3 { $type = 'phishing'; } - case 4 { $type = 'botnet_c_c'; } - case 5 { $type = 'dos'; } - case 6 { $type = 'malware'; } - case 7 { $type = 'copyright'; } - case 8 { $type = 'webattack'; } - case 9 { $type = 'other'; } +switch (int(rand(10) + 0.5)) { + case 1 { $type = 'portscan'; } + case 2 { $type = 'bruteforce'; } + case 3 { $type = 'spam'; } + case 4 { $type = 'phishing'; } + case 5 { $type = 'botnet_c_c'; } + case 6 { $type = 'dos'; } + case 7 { $type = 'malware'; } + case 8 { $type = 'copyright'; } + case 9 { $type = 'webattack'; } + case 10 { $type = 'other'; } } my $source_type = ""; -switch (int(rand(2) + 0.5)) { - case 0 { $source_type = 'IP'; } - case 1 { $source_type = 'URL'; } - case 2 { $source_type = 'Reply-To:'; } +switch (int(rand(3) + 0.5)) { + case 1 { $source_type = 'IP'; } + case 2 { $source_type = 'URL'; } + case 3 { $source_type = 'Reply-To:'; } } my $source = (int(rand(254) + 0.5) + 1) . "." . (int(rand(254) + 0.5) + 1) . "." . (int(rand(254) + 0.5) + 1) . "." . (int(rand(254) + 0.5) + 1); my $target_proto = ""; -switch (int(rand(1) + 0.5)) { - case 0 { $target_proto = 'TCP'; } - case 1 { $target_proto = 'UDP'; } +switch (int(rand(2) + 0.5)) { + case 1 { $target_proto = 'TCP'; } + case 2 { $target_proto = 'UDP'; } } my $target_port = ""; -switch (int(rand(5) + 0.5)) { - case 0 { $target_port = '22'; } - case 1 { $target_port = '23'; } - case 2 { $target_port = '25'; } - case 3 { $target_port = '443'; } - case 4 { $target_port = '3389'; } - case 5 { $target_port = 'null'; } +switch (int(rand(6) + 0.5)) { + case 1 { $target_port = '22'; } + case 2 { $target_port = '23'; } + case 3 { $target_port = '25'; } + case 4 { $target_port = '443'; } + case 5 { $target_port = '3389'; } + case 6 { $target_port = 'null'; } } my $attack_scale = (int(rand(100000) + 0.5) + 1000); diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh index 3c0ea2ea4b1ef3635b8f4bf0fd223483e24021bc..098f552c751cb87a29c688aa296cc2282c01ed69 100755 --- a/src/warden-client/sh/install.sh +++ b/src/warden-client/sh/install.sh @@ -139,6 +139,12 @@ modules_chck() make_warden_dir() { echo -n "Creating warden client directory ... " + + while [ ! -d `echo ${path_to_chown} | rev | cut -d '/' -f2- | rev` ] + do + path_to_chown=`echo ${path_to_chown} | rev | cut -d '/' -f2- | rev` + done + test -d $prefix || mkdir -p $prefix if cp -R ${dirname}/warden-client $prefix 2> $err; then @@ -258,7 +264,7 @@ make_conf_file() change_permissions() { echo -n "Changing permissions to installed package ... " - chown -R $user: $client_path 2> $err || err_clean + chown -R $user: $path_to_chown 2> $err || err_clean chmod 644 ${etc}/package_version || err_clean if chmod 600 $conf_file; then echo "OK" @@ -302,6 +308,7 @@ key_file=`basename $key` cert_file=`basename $cert` [[ $prefix == */ ]] && prefix="${prefix%?}" # remove last char (slash) from prefix client_path="${prefix}/warden-client" +path_to_chown="${client_path}" etc="${client_path}/etc" conf_file="${etc}/warden-client.conf" err="/tmp/warden-err"