X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FRestore.pm;h=0310c63621bddb9c9680840adbe04822b927f8ef;hp=8e2022e2664cbc065187bb80b7362665b7aac428;hb=17dcbbebb871212f90b81bb97f8d1feb528bdc43;hpb=329e870f56fb6572fa697998d33676588034c149
diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index 8e2022e..0310c63 100644
--- a/lib/BackupPC/CGI/Restore.pm
+++ b/lib/BackupPC/CGI/Restore.pm
@@ -28,7 +28,7 @@
#
#========================================================================
#
-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 2.1.0, released 20 Jun 2004.
#
# See http://backuppc.sourceforge.net.
#
@@ -38,10 +38,12 @@ package BackupPC::CGI::Restore;
use strict;
use BackupPC::CGI::Lib qw(:all);
+use Data::Dumper;
+use File::Path;
sub action
{
- my($str, $reply);
+ my($str, $reply, $content);
my $Privileged = CheckPermission($In{host});
if ( !$Privileged ) {
ErrorExit(eval("qq{$Lang->{Only_privileged_users_can_restore_backup_files}}"));
@@ -61,7 +63,7 @@ sub action
(my $name = $In{"fcb$i"}) =~ s/%([0-9A-F]{2})/chr(hex($1))/eg;
$badFileCnt++ if ( $name =~ m{(^|/)\.\.(/|$)} );
if ( @fileList == 0 ) {
- $pathHdr = $name;
+ $pathHdr = substr($name, 0, rindex($name, "/"));
} else {
while ( substr($name, 0, length($pathHdr)) ne $pathHdr ) {
$pathHdr = substr($pathHdr, 0, rindex($pathHdr, "/"));
@@ -85,9 +87,6 @@ EOF
if ( $badFileCnt ) {
ErrorExit($Lang->{Nice_try__but_you_can_t_put});
}
- if ( @fileList == 1 ) {
- $pathHdr =~ s/(.*)\/.*/$1/;
- }
$pathHdr = "/" if ( $pathHdr eq "" );
if ( $In{type} != 0 && @fileList == $In{fcbMax} ) {
#
@@ -97,22 +96,58 @@ EOF
@fileList = ( $pathHdr );
}
if ( $In{type} == 0 ) {
+ #
+ # Build list of hosts
+ #
+ my $hostDestSel;
+ my @hosts;
+ foreach my $h ( GetUserHosts(1) ) {
+ my $sel = " selected" if ( $h eq $In{host} );
+ $hostDestSel .= "";
+ push(@hosts, $h);
+ }
+
#
# Tell the user what options they have
#
- Header(eval("qq{$Lang->{Restore_Options_for__host}}"));
- print(eval("qq{$Lang->{Restore_Options_for__host2}}"));
+ $content .= eval("qq{$Lang->{Restore_Options_for__host2}}");
+
+ if ( @hosts == 1 ) {
+ #
+ # Pick up the host's config file
+ #
+ $bpc->ConfigRead($hosts[0]);
+ %Conf = $bpc->Conf();
+ }
+
+ #
+ # Decide if option 1 (direct restore) is available based
+ # on whether the restore command is set.
+ #
+ my $cmd = $Conf{XferMethod} eq "smb" ? $Conf{SmbClientRestoreCmd}
+ : $Conf{XferMethod} eq "tar" ? $Conf{TarClientRestoreCmd}
+ : $Conf{XferMethod} eq "archive" ? undef
+ : $Conf{RsyncRestoreArgs};
+ if ( defined($cmd) ) {
+ $content .= eval(
+ "qq{$Lang->{Restore_Options_for__host_Option1}}");
+ } else {
+ my $hostDest = $hosts[0];
+ $content .= eval(
+ "qq{$Lang->{Restore_Options_for__host_Option1_disabled}}");
+ }
#
# Verify that Archive::Zip is available before showing the
# zip restore option
#
if ( eval { require Archive::Zip } ) {
- print (eval("qq{$Lang->{Option_2__Download_Zip_archive}}"));
+ $content .= eval("qq{$Lang->{Option_2__Download_Zip_archive}}");
} else {
- print (eval("qq{$Lang->{Option_2__Download_Zip_archive2}}"));
+ $content .= eval("qq{$Lang->{Option_2__Download_Zip_archive2}}");
}
- print (eval("qq{$Lang->{Option_3__Download_Zip_archive}}"));
+ $content .= eval("qq{$Lang->{Option_3__Download_Zip_archive}}");
+ Header(eval("qq{$Lang->{Restore_Options_for__host}}"), $content);
Trailer();
} elsif ( $In{type} == 1 ) {
#
@@ -141,14 +176,15 @@ EOF
# This is necessary to ensure the output gets to the correct place
# under mod_perl.
#
- $bpc->cmdSystemOrEval(["$BinDir/BackupPC_tarCreate",
+ $bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_tarCreate",
"-h", $host,
"-n", $num,
"-s", $share,
@pathOpts,
@fileList
],
- sub { print(@_); }
+ sub { print(@_); },
+ 1, # ignore stderr
);
} elsif ( $In{type} == 2 ) {
#
@@ -178,7 +214,7 @@ EOF
# This is necessary to ensure the output gets to the correct place
# under mod_perl.
#
- $bpc->cmdSystemOrEval(["$BinDir/BackupPC_zipCreate",
+ $bpc->cmdSystemOrEvalLong(["$BinDir/BackupPC_zipCreate",
"-h", $host,
"-n", $num,
"-c", $In{compressLevel},
@@ -186,7 +222,8 @@ EOF
@pathOpts,
@fileList
],
- sub { print(@_); }
+ sub { print(@_); },
+ 1, # ignore stderr
);
} elsif ( $In{type} == 3 ) {
#
@@ -198,18 +235,38 @@ EOF
if ( !CheckPermission($In{hostDest}) ) {
ErrorExit(eval("qq{$Lang->{You_don_t_have_permission_to_restore_onto_host}}"));
}
+ #
+ # Pick up the destination host's config file
+ #
+ my $hostDest = $1 if ( $In{hostDest} =~ /(.*)/ );
+ $bpc->ConfigRead($hostDest);
+ %Conf = $bpc->Conf();
+
+ #
+ # Decide if option 1 (direct restore) is available based
+ # on whether the restore command is set.
+ #
+ my $cmd = $Conf{XferMethod} eq "smb" ? $Conf{SmbClientRestoreCmd}
+ : $Conf{XferMethod} eq "tar" ? $Conf{TarClientRestoreCmd}
+ : $Conf{XferMethod} eq "archive" ? undef
+ : $Conf{RsyncRestoreArgs};
+ if ( !defined($cmd) ) {
+ ErrorExit(eval("qq{$Lang->{Restore_Options_for__host_Option1_disabled}}"));
+ }
+
$fileListStr = "";
foreach my $f ( @fileList ) {
my $targetFile = $f;
(my $strippedShare = $share) =~ s/^\///;
(my $strippedShareDest = $In{shareDest}) =~ s/^\///;
- substr($targetFile, 0, length($pathHdr)) = $In{pathHdr};
+ substr($targetFile, 0, length($pathHdr)) = "/$In{pathHdr}/";
+ $targetFile =~ s{//+}{/}g;
$fileListStr .= <| $host:/$strippedShare$f | $In{hostDest}:/$strippedShareDest$targetFile |
EOF
}
- Header(eval("qq{$Lang->{Restore_Confirm_on__host}}"));
- print(eval("qq{$Lang->{Are_you_sure}}"));
+ my $content = eval("qq{$Lang->{Are_you_sure}}");
+ Header(eval("qq{$Lang->{Restore_Confirm_on__host}}"), $content);
Trailer();
} elsif ( $In{type} == 4 ) {
if ( !defined($Hosts->{$In{hostDest}}) ) {
@@ -231,6 +288,9 @@ EOF
$reqFileName = "restoreReq.$$.$i";
last if ( !-f "$TopDir/pc/$hostDest/$reqFileName" );
}
+ my $inPathHdr = $In{pathHdr};
+ $inPathHdr = "/$inPathHdr" if ( $inPathHdr !~ m{^/} );
+ $inPathHdr = "$inPathHdr/" if ( $inPathHdr !~ m{/$} );
my %restoreReq = (
# source of restore is hostSrc, #num, path shareSrc/pathHdrSrc
num => $In{num},
@@ -241,7 +301,7 @@ EOF
# destination of restore is hostDest:shareDest/pathHdrDest
hostDest => $hostDest,
shareDest => $In{shareDest},
- pathHdrDest => $In{pathHdr},
+ pathHdrDest => $inPathHdr,
# list of files to restore
fileList => \@fileList,
@@ -254,18 +314,21 @@ EOF
[ \%restoreReq],
[qw(*RestoreReq)]);
$dump->Indent(1);
- if ( open(REQ, ">$TopDir/pc/$hostDest/$reqFileName") ) {
+ mkpath("$TopDir/pc/$hostDest", 0, 0777)
+ if ( !-d "$TopDir/pc/$hostDest" );
+ my $openPath = "$TopDir/pc/$hostDest/$reqFileName";
+ if ( open(REQ, ">", $openPath) ) {
binmode(REQ);
print(REQ $dump->Dump);
close(REQ);
} else {
- ErrorExit(eval("qq{$Lang->{Can_t_open_create}}"));
+ ErrorExit(eval("qq{$Lang->{Can_t_open_create__openPath}}"));
}
$reply = $bpc->ServerMesg("restore ${EscURI($ipAddr)}"
. " ${EscURI($hostDest)} $User $reqFileName");
$str = eval("qq{$Lang->{Restore_requested_to_host__hostDest__backup___num}}");
- Header(eval("qq{$Lang->{Restore_Requested_on__hostDest}}"));
- print (eval("qq{$Lang->{Reply_from_server_was___reply}}"));
+ my $content = eval("qq{$Lang->{Reply_from_server_was___reply}}");
+ Header(eval("qq{$Lang->{Restore_Requested_on__hostDest}}"), $content);
Trailer();
}
}