Bugzilla Bug 651916 - kra and ocsp are using incorrect ports to talk to CA and complete configuration in DonePanel: correction patch

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

5 files changed, 34 insertions, 23 deletions

diff --git a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
index b86cc343a..2b9fc1861 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
@@ -76,7 +76,7 @@ sub update
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("CAInfoPanel: update");
 
-    my $count = $q->param('urls') || "";
+    my $count = defined($q->param('urls')) ? $q->param('urls') : "";
     if ($count eq "") {
       $::symbol{errorString} = "No CA information provided.  CA, TKS and optionally DRM must be installed prior to TPS installation";
       return 0;
@@ -93,13 +93,13 @@ sub update
     if ($count =~ /http/) {
       # this is for pkisilent
       my $info = new URI::URL($count);
-      $host = $info->host || "";
+      $host = defined($info->host) ? $info->host : "";
       if ($host eq "") {
         $::symbol{errorString} = "No CA host provided.";
         return 0;
       }
 
-      $https_ee_port = $info->port || "";
+      $https_ee_port = defined($info->port) ? $info->port : "";
       if ($https_ee_port eq "") {
         $::symbol{errorString} = "No CA EE port provided.";
         return 0;
@@ -119,10 +119,14 @@ sub update
           return 0;
       }
     } else {
-      $host = $::config->get("preop.securitydomain.ca$count.host") || "";
-      $https_ee_port = $::config->get("preop.securitydomain.ca$count.secureport") || "";
-      $https_agent_port = $::config->get("preop.securitydomain.ca$count.secureagentport") || "";
-      $https_admin_port = $::config->get("preop.securitydomain.ca$count.secureadminport") || "";
+      $host = defined($::config->get("preop.securitydomain.ca$count.host")) ?
+          $::config->get("preop.securitydomain.ca$count.host") : "";
+      $https_ee_port = defined($::config->get("preop.securitydomain.ca$count.secureport")) ?
+          $::config->get("preop.securitydomain.ca$count.secureport") : "";
+      $https_agent_port = defined($::config->get("preop.securitydomain.ca$count.secureagentport")) ?
+          $::config->get("preop.securitydomain.ca$count.secureagentport") : "";
+      $https_admin_port = defined($::config->get("preop.securitydomain.ca$count.secureadminport")) ?
+          $::config->get("preop.securitydomain.ca$count.secureadminport") : "";
     }
 
     if (($host eq "") || ($https_ee_port eq "") || ($https_admin_port eq "") || ($https_agent_port eq "")) {
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
index ce8cc8778..1ccef670d 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
@@ -77,7 +77,7 @@ sub update
     $::config->put("preop.krainfo.keygen", $choice);
 
     if ($choice eq "keygen") {
-      my $count = $q->param('urls') || "";
+      my $count = defined($q->param('urls')) ? $q->param('urls') : "";
       if ($count eq "") {
         $::symbol{errorString} = "no DRM information provided.  CA, TKS and DRM must be installed prior to TPS installation";
         return 0;
@@ -92,15 +92,19 @@ sub update
       if ($count =~ /http/) {
         # this is for pkisilent
         my $info = new URI::URL($count);
-        $host = $info->host || "";
-        $https_agent_port = $info->port || "";
-        $https_admin_port = $q->param('adminport') || "";
+        $host = defined($info->host) ? $info->host : "";
+        $https_agent_port = defined($info->port) ? $info->port : "";
+        $https_admin_port = defined($q->param('adminport'))? $q->param('adminport') : "";
       } else {
-        $host = $::config->get("preop.securitydomain.kra$count.host") || "";
-        $https_agent_port = $::config->get("preop.securitydomain.kra$count.secureagentport") || "";
-        $https_admin_port = $::config->get("preop.securitydomain.kra$count.secureadminport") || "";
+        $host = defined($::config->get("preop.securitydomain.kra$count.host")) ? 
+            $::config->get("preop.securitydomain.kra$count.host") : "";
+        $https_agent_port = defined($::config->get("preop.securitydomain.kra$count.secureagentport")) ? 
+            $::config->get("preop.securitydomain.kra$count.secureagentport") : "";
+        $https_admin_port = defined($::config->get("preop.securitydomain.kra$count.secureadminport")) ? 
+            $::config->get("preop.securitydomain.kra$count.secureadminport") : "";
       }
 
+
       if (($host eq "") || ($https_agent_port eq "")) {
         $::symbol{errorString} = "no DRM found.  CA, TKS and DRM must be installed prior to TPS installation";
         return 0;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
index 32941816d..9aca3b627 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
@@ -289,7 +289,7 @@ sub display
         #         $symbol{port}  = "443";
     &PKI::TPS::Wizard::debug_log("DonePanel: display");
 
-    my $status = $::config->get("preop.done.status") || "";
+    my $status = defined($::config->get("preop.done.status"))? $::config->get("preop.done.status") : "";
     if ($status eq "done") {
       return 1;
     }
diff --git a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
index 1ed814c82..5e7089812 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/ModulePanel.pm
@@ -144,7 +144,7 @@ sub getTokens {
 # otherwise it is "not logged in"
 sub Login {
     my $tokenname = $_[0];
-    my $pwd = $::pwdconf->get($tokenname) || "";
+    my $pwd = defined($::pwdconf->get($tokenname)) ? $::pwdconf->get($tokenname) : "";
     if ($pwd ne "") {
         &PKI::TPS::Wizard::debug_log("ModulePanel -> isLoggedIn retrieved pwd from pwdconf");
         return 1;
diff --git a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
index 85c0b7d67..720093ac5 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
@@ -73,7 +73,7 @@ sub update
     my ($q) = @_;
     &PKI::TPS::Wizard::debug_log("TKSInfoPanel: update");
 
-    my $count = $q->param('urls') || "";
+    my $count = defined($q->param('urls')) ? $q->param('urls') : "";
     if ($count eq "") {
         $::symbol{errorString} = "no TKS info provided.  CA, TKS and optionally DRM must be installed prior to TPS installation";
         return 0;
@@ -88,13 +88,16 @@ sub update
     if ($count =~ /http/) {
       # this is for pkisilent
       my $info = new URI::URL($count);
-      $host = $info->host || "";
-      $https_agent_port = $info->port || "";
-      $https_admin_port = q->param('adminport') || "";
+      $host = defined($info->host) ? $info->host : "";
+      $https_agent_port = defined($info->port) ? $info->port : "";
+      $https_admin_port = defined($q->param('adminport')) ? $q->param('adminport') : "";
     } else {
-      $host = $::config->get("preop.securitydomain.tks$count.host") || "";
-      $https_admin_port = $::config->get("preop.securitydomain.tks$count.secureadminport") || "";
-      $https_agent_port = $::config->get("preop.securitydomain.tks$count.secureagentport") || "";
+      $host = defined($::config->get("preop.securitydomain.tks$count.host")) ?
+          $::config->get("preop.securitydomain.tks$count.host") : "";
+      $https_admin_port = defined($::config->get("preop.securitydomain.tks$count.secureadminport")) ?
+          $::config->get("preop.securitydomain.tks$count.secureadminport") : "";
+      $https_agent_port = defined($::config->get("preop.securitydomain.tks$count.secureagentport")) ? 
+          $::config->get("preop.securitydomain.tks$count.secureagentport") : "";
     }
 
     if (($host eq "") || ($https_agent_port eq "")) {