cryptonas
/
cryptonas
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

validation fixed 

"cryptsetup remove" fixed
This commit is contained in:
lars 2005-07-24 16:04:08 +00:00
parent 546ce6e73c
commit 831849b93f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cryptobox.conf.d/usr/lib/cryptobox/cbox-manage.sh
View File

@ -209,7 +209,7 @@ function mount_crypto()
$CRYPTSETUP -h "$HASH" -c "$ALGO" create "`basename $CRYPTMAPPER_DEV`" "${device}2" $CRYPTSETUP -h "$HASH" -c "$ALGO" create "`basename $CRYPTMAPPER_DEV`" "${device}2"
if mount "$CRYPTMAPPER_DEV" "$CRYPTO_DIR" if mount "$CRYPTMAPPER_DEV" "$CRYPTO_DIR"
then /etc/init.d/samba start then /etc/init.d/samba start
else dmsetup remove "$CRYPTMAPPER_DEV" else dmsetup remove $(basename $CRYPTMAPPER_DEV)
return 1 return 1
fi fi
} }
@ -225,7 +225,7 @@ function umount_crypto()
ps -e | grep -q " smbd$" && killall -9 smbd ps -e | grep -q " smbd$" && killall -9 smbd
ps -e | grep -q " nmbd$" && killall -9 nmbd ps -e | grep -q " nmbd$" && killall -9 nmbd
umount "$CRYPTO_DIR" umount "$CRYPTO_DIR"
$CRYPTSETUP remove "$CRYPTMAPPER_DEV" $CRYPTSETUP remove $(basename $CRYPTMAPPER_DEV)
set -e set -e
} }

14
cryptobox.conf.d/var/www/cgi-bin/cryptobox.pl
View File

@ -227,7 +227,7 @@ sub validate_language()
{ {
my $language = shift; my $language = shift;
# check for non-alphanumeric character # check for non-alphanumeric character
return 0 if ($language = ~/\W/); return 0 if ($language =~ /\W/);
return 0 if ( ! -e "$LANGUAGE_DIR/$language" . '.hdf'); return 0 if ( ! -e "$LANGUAGE_DIR/$language" . '.hdf');
return 1; return 1;
} }
@ -385,15 +385,15 @@ if ( ! &check_ssl()) {
$pagedata->setValue('Data.Warning', 'NotConfigured'); $pagedata->setValue('Data.Warning', 'NotConfigured');
$pagedata->setValue('Data.Action', 'init_form'); $pagedata->setValue('Data.Action', 'init_form');
} else { } else {
if ( ! &validate_language()) { if ( ! &validate_language($query->param('language'))) {
$pagedata->setValue('Data.Warning', 'InvalidLanguage'); $pagedata->setValue('Data.Warning', 'InvalidLanguage');
$pagedata->setValue('Data.Action', 'config_ask'); $pagedata->setValue('Data.Action', 'config_form');
} elsif ( ! &validate_ip()) { } elsif ( ! &validate_ip($query->param('ip'))) {
$pagedata->setValue('Data.Warning', 'InvalidIP'); $pagedata->setValue('Data.Warning', 'InvalidIP');
$pagedata->setValue('Data.Action', 'config_ask'); $pagedata->setValue('Data.Action', 'config_form');
} elsif ( ! &validate_timeout()) { } elsif ( ! &validate_timeout($query->param('timeout'))) {
$pagedata->setValue('Data.Warning', 'InvalidTimeOut'); $pagedata->setValue('Data.Warning', 'InvalidTimeOut');
$pagedata->setValue('Data.Action', 'config_ask'); $pagedata->setValue('Data.Action', 'config_form');
} else { } else {
system("$CB_SCRIPT", "set_config", "language", $query->param('language')); system("$CB_SCRIPT", "set_config", "language", $query->param('language'));
system("$CB_SCRIPT", "set_config", "timeout", $query->param('timeout')); system("$CB_SCRIPT", "set_config", "timeout", $query->param('timeout'));