* Commit for 2.1.0.

[BackupPC.git] / lib / BackupPC / CGI / Restore.pm

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index f236e1e..8079d91 100644 (file)
--- 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.
 #
 #
 # See http://backuppc.sourceforge.net.
 #


@@ -39,10 +39,11 @@ package BackupPC::CGI::Restore;
 use strict;
 use BackupPC::CGI::Lib qw(:all);
 use Data::Dumper;
 use strict;
 use BackupPC::CGI::Lib qw(:all);
 use Data::Dumper;

+use File::Path;

 
 sub action
 {
 
 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}}"));
     my $Privileged = CheckPermission($In{host});
     if ( !$Privileged ) {
         ErrorExit(eval("qq{$Lang->{Only_privileged_users_can_restore_backup_files}}"));


@@ -62,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 ) {
         (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, "/"));
        } else {
            while ( substr($name, 0, length($pathHdr)) ne $pathHdr ) {
                $pathHdr = substr($pathHdr, 0, rindex($pathHdr, "/"));


@@ -86,9 +87,6 @@ EOF
     if ( $badFileCnt ) {
         ErrorExit($Lang->{Nice_try__but_you_can_t_put});
     }
     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} ) {
        #
     $pathHdr = "/" if ( $pathHdr eq "" );
     if ( $In{type} != 0 && @fileList == $In{fcbMax} ) {
        #


@@ -98,22 +96,63 @@ EOF
        @fileList = ( $pathHdr );
     }
     if ( $In{type} == 0 ) {
        @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 .= "<option value=\"$h\"$sel>${EscHTML($h)}</option>";
+            push(@hosts, $h);
+       }
+

         #
         # Tell the user what options they have
         #
         #
         # 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 there is a single host, make sure direct restore is enabled
+        #
+        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}}");
+            }
+        } else {
+            $content .= eval("qq{$Lang->{Restore_Options_for__host_Option1}}");
+        }

 
        #
        # Verify that Archive::Zip is available before showing the
        # zip restore option
        #
        if ( eval { require Archive::Zip } ) {
 
        #
        # 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 {
        } 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 ) {
         #
         Trailer();
     } elsif ( $In{type} == 1 ) {
         #


@@ -142,14 +181,15 @@ EOF
        # This is necessary to ensure the output gets to the correct place
        # under mod_perl.
        #
        # 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
            ],
                 "-h", $host,
                 "-n", $num,
                 "-s", $share,
                 @pathOpts,
                 @fileList
            ],

-           sub { print(@_); }
+           sub { print(@_); },
+           1,                  # ignore stderr

        );
     } elsif ( $In{type} == 2 ) {
         #
        );
     } elsif ( $In{type} == 2 ) {
         #


@@ -179,7 +219,7 @@ EOF
        # This is necessary to ensure the output gets to the correct place
        # under mod_perl.
        #
        # 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},
                 "-h", $host,
                 "-n", $num,
                 "-c", $In{compressLevel},


@@ -187,7 +227,8 @@ EOF
                 @pathOpts,
                 @fileList
            ],
                 @pathOpts,
                 @fileList
            ],

-           sub { print(@_); }
+           sub { print(@_); },
+           1,                  # ignore stderr

        );
     } elsif ( $In{type} == 3 ) {
         #
        );
     } elsif ( $In{type} == 3 ) {
         #


@@ -199,18 +240,38 @@ EOF
        if ( !CheckPermission($In{hostDest}) ) {
            ErrorExit(eval("qq{$Lang->{You_don_t_have_permission_to_restore_onto_host}}"));
        }
        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/^\///;
         $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 .= <<EOF;
 <tr><td>$host:/$strippedShare$f</td><td>$In{hostDest}:/$strippedShareDest$targetFile</td></tr>
 EOF
         }
             $fileListStr .= <<EOF;
 <tr><td>$host:/$strippedShare$f</td><td>$In{hostDest}:/$strippedShareDest$targetFile</td></tr>
 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}}) ) {
         Trailer();
     } elsif ( $In{type} == 4 ) {
        if ( !defined($Hosts->{$In{hostDest}}) ) {


@@ -232,6 +293,9 @@ EOF
             $reqFileName = "restoreReq.$$.$i";
             last if ( !-f "$TopDir/pc/$hostDest/$reqFileName" );
         }
             $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},
         my %restoreReq = (
            # source of restore is hostSrc, #num, path shareSrc/pathHdrSrc
             num         => $In{num},


@@ -242,7 +306,7 @@ EOF
            # destination of restore is hostDest:shareDest/pathHdrDest
             hostDest    => $hostDest,
             shareDest   => $In{shareDest},
            # destination of restore is hostDest:shareDest/pathHdrDest
             hostDest    => $hostDest,
             shareDest   => $In{shareDest},

-            pathHdrDest => $In{pathHdr},
+            pathHdrDest => $inPathHdr,

 
            # list of files to restore
             fileList    => \@fileList,
 
            # list of files to restore
             fileList    => \@fileList,


@@ -255,6 +319,8 @@ EOF
                          [  \%restoreReq],
                          [qw(*RestoreReq)]);
         $dump->Indent(1);
                          [  \%restoreReq],
                          [qw(*RestoreReq)]);
         $dump->Indent(1);

+        mkpath("$TopDir/pc/$hostDest", 0, 0777)
+                                    if ( !-d "$TopDir/pc/$hostDest" );

         if ( open(REQ, ">$TopDir/pc/$hostDest/$reqFileName") ) {
            binmode(REQ);
             print(REQ $dump->Dump);
         if ( open(REQ, ">$TopDir/pc/$hostDest/$reqFileName") ) {
            binmode(REQ);
             print(REQ $dump->Dump);


@@ -265,8 +331,8 @@ EOF
        $reply = $bpc->ServerMesg("restore ${EscURI($ipAddr)}"
                        . " ${EscURI($hostDest)} $User $reqFileName");
        $str = eval("qq{$Lang->{Restore_requested_to_host__hostDest__backup___num}}");
        $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();
     }
 }
         Trailer();
     }
 }