Bugzilla Bug #486435 - clicking on configuration URL results in error.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@239 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

2 files changed, 15 insertions, 9 deletions

diff --git a/pki/base/tps/lib/perl/PKI/TPS/Login.pm b/pki/base/tps/lib/perl/PKI/TPS/Login.pm
index 7a8fd817a..b4a4954a1 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/Login.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/Login.pm
@@ -106,8 +106,9 @@ if( -e "$pkiroot/conf/pwcache.conf" ) {
 }
 
 # create cfg debug log
-open(DEBUG, ">>" . $config->get("service.instanceDir") . 
-                "/logs/debug");
+my $logfile = $config->get("service.instanceDir") . "/logs/debug";
+open( DEBUG, ">>" . $logfile ) ||
+warn( "Could not open '" . $logfile . "':  $!" );
 
 # apache server
 
@@ -141,7 +142,9 @@ sub debug_log
   my ($msg) = @_;
   my $date = `date`;
   chomp($date);
-  print DEBUG "$date - $msg\n";
+  if( -w $logfile ) {
+      print DEBUG "$date - $msg\n";
+  }
 }
 
   # initializes entries in parser's global symbol table for panels
@@ -295,10 +298,10 @@ sub handler {
     my $q = new CGI;
 
     # check cookie
-    my $pin = $q->param('__pin');
+    my $pin = $q->param('pin');
     if (defined($pin)) {
          my $cookie = $q->cookie(
-                -name=>'__pin',
+                -name=>'pin',
                 -value=> $pin,
                 -expires=>'+1y',
                 -path=>'/');
diff --git a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
index 1dc27b0d5..d00cc0d0c 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/wizard.pm
@@ -108,7 +108,8 @@ if( -e "$pkiroot/conf/pwcache.conf" ) {
 my $logfile = $config->get("service.instanceDir") .  "/logs/debug";
 system( "touch $logfile" );
 system( "chmod 00660 $logfile" );
-open(DEBUG, ">>" . $logfile);
+open( DEBUG, ">>" . $logfile ) ||
+warn( "Could not open '" . $logfile . "':  $!" );
 
 # apache server
 
@@ -142,7 +143,9 @@ sub debug_log
   my ($msg) = @_;
   my $date = `date`;
   chomp($date);
-  print DEBUG "$date - $msg\n";
+  if( -w $logfile ) {
+      print DEBUG "$date - $msg\n";
+  }
 }
 
   # initializes entries in parser's global symbol table for panels
@@ -331,7 +334,7 @@ sub handler {
     my $q = new CGI;
 
     # check cookie
-    my $cookie = $q->cookie('__pin');
+    my $cookie = $q->cookie('pin');
     my $pin = $::config->get("preop.pin");
     if ($cookie ne $pin) {
          print $q->redirect("login");
@@ -421,7 +424,7 @@ sub handler {
     }
 
     my $result;
-    if ($q->param("xml") eq "true") {
+    if ($q->param('xml') && $q->param('xml') eq "true") {
         $r->send_http_header('text/xml');
         $result = "<xml>";
         foreach $s (sort keys %symbol) {