From 1bb75b8a708837f623b228564e5563ed79ac8bc2 Mon Sep 17 00:00:00 2001
From: Will Budic <vilijanc@gmail.com>
Date: Mon, 2 Mar 2020 11:41:16 +1100
Subject: [PATCH] Restore testing failed 2 try.

---
 htdocs/cgi-bin/config.cgi | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/cgi-bin/config.cgi b/htdocs/cgi-bin/config.cgi
index 75fb559..e931bd3 100755
--- a/htdocs/cgi-bin/config.cgi
+++ b/htdocs/cgi-bin/config.cgi
@@ -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);
     };
 
 }
-- 
2.34.1