]> lifelog.hopto.org Git - LifeLog.git/commitdiff
Restore testing failed 2 try.
authorWill Budic <redacted>
Mon, 2 Mar 2020 00:41:16 +0000 (11:41 +1100)
committerWill Budic <redacted>
Mon, 2 Mar 2020 00:41:16 +0000 (11:41 +1100)
htdocs/cgi-bin/config.cgi

index 75fb559157bf4912a0ceaf5d02e7bf9cda95c90b..e931bd30938f9f8be3c0d6e7f627ec4240031c04 100755 (executable)
@@ -997,18 +997,19 @@ sub restore {
 
         print $cgi->header;
         print $cgi->start_html;
+        print "<pre>Reading->$hndl</pre>";
         my $dbck = &Settings::logPath."bck/"; `mkdir $dbck` if (!-d $dbck);
-        my $tar = $dbck .$hndl; $tar =~ s/osz$/tar/;
+        my $tar = $dbck.$hndl; $tar =~ s/osz$/tar/;
         my $pipe;
-        open ($pipe,  "| openssl enc -k $pass:$userid -d -des-ede3-cfb -in /dev/stdin 2>/dev/null > $tar");#| tar zt");#1>/dev/null");
+        open ($pipe,  "| openssl enc -k $pass:$userid -d -des-ede3-cfb -in /dev/stdin 2>/dev/null > $tar"); #| tar zt");#1>/dev/null");
             while(<$hndl>){print $pipe $_;};
         close $pipe;
+
         print "<pre>\n";
-        print "Produced->$tar\n";
-       # my $cmd = "tar xz * $file";
-        #`$cmd`;
-        print "Contents->".`tar tvf $tar`."\n";
-        print "Extracted->\n".`tar xzvf $tar -C $dbck --strip-components 1`."\n";
+        my $cmd = `tar tvf $tar 2>/dev/null`  or die "(SECURITY) FAILED READING $tar [$pass:$userid]";
+        print "Contents->".$cmd."\n";
+        $cmd = `tar xzvf $tar -C $dbck --strip-components 1 2>/dev/null` or die "Failed extracting $tar";
+        print "Extracted->\n".$cmd."\n" or die "Failed extracting $tar";;
 
         my $b_base = $dbck.$dbname;
         my $dsn= "DBI:SQLite:dbname=$b_base";
@@ -1076,7 +1077,7 @@ sub restore {
 
     }
     catch{
-        LifeLogException->throw(error=>"Restore failed! hndl->$hndl [$@]",show_trace=>&Settings::debug);
+        LifeLogException->throw(error=>"Restore failed! hndl->$hndl $@");#,show_trace=>&Settings::debug);
     };
 
 }