diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-02-24 00:22:59 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-02-24 00:22:59 +0000 |
commit | 204c0d68151a7008ff579605623b7a5bf280fdb2 (patch) | |
tree | 2fc8bf7f7d8cdc094ea955d6417387421bdb05af /pki | |
parent | 613d642b0eed318d2bbc4b2ad33ff909ad7ea222 (diff) | |
download | pki-204c0d68151a7008ff579605623b7a5bf280fdb2.tar.gz pki-204c0d68151a7008ff579605623b7a5bf280fdb2.tar.xz pki-204c0d68151a7008ff579605623b7a5bf280fdb2.zip |
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
Diffstat (limited to 'pki')
-rwxr-xr-x | pki/base/ra/lib/perl/PKI/RA/Login.pm | 13 | ||||
-rwxr-xr-x | pki/base/ra/lib/perl/PKI/RA/wizard.pm | 11 | ||||
-rwxr-xr-x | pki/base/tps/lib/perl/PKI/TPS/Login.pm | 13 | ||||
-rwxr-xr-x | pki/base/tps/lib/perl/PKI/TPS/wizard.pm | 11 | ||||
-rw-r--r-- | pki/dogtag/ra/pki-ra.spec | 4 | ||||
-rw-r--r-- | pki/dogtag/tps/pki-tps.spec | 4 |
6 files changed, 36 insertions, 20 deletions
diff --git a/pki/base/ra/lib/perl/PKI/RA/Login.pm b/pki/base/ra/lib/perl/PKI/RA/Login.pm index 250b278be..687336b7a 100755 --- a/pki/base/ra/lib/perl/PKI/RA/Login.pm +++ b/pki/base/ra/lib/perl/PKI/RA/Login.pm @@ -107,8 +107,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 @@ -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 @@ -296,10 +299,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/ra/lib/perl/PKI/RA/wizard.pm b/pki/base/ra/lib/perl/PKI/RA/wizard.pm index f7d87223a..0afcda6bd 100755 --- a/pki/base/ra/lib/perl/PKI/RA/wizard.pm +++ b/pki/base/ra/lib/perl/PKI/RA/wizard.pm @@ -107,7 +107,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 @@ -143,7 +144,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 @@ -323,7 +326,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"); @@ -413,7 +416,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) { 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) { diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec index 7b1307814..bce43db35 100644 --- a/pki/dogtag/ra/pki-ra.spec +++ b/pki/dogtag/ra/pki-ra.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 14 +%define base_release 15 %define base_group System Environment/Daemons %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -261,6 +261,8 @@ fi ############################################################################### %changelog +* Mon Feb 23 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-15 +- Bugzilla Bug #486435 - clicking on configuration URL results in error * Sat Feb 14 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-14 - Bugzilla Bug #250874 -Change spec file dependencies to rely on latest versions of components (NSPR, NSS, JSS, MOD_NSS) diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec index a19cdc684..65db01a9e 100644 --- a/pki/dogtag/tps/pki-tps.spec +++ b/pki/dogtag/tps/pki-tps.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 22 +%define base_release 23 %define base_group System Environment/Daemons %define base_vendor Red Hat, Inc. %define base_license LGPLv2 with exceptions @@ -308,6 +308,8 @@ fi ############################################################################### %changelog +* Mon Feb 23 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-23 +- Bugzilla Bug #486435 - clicking on configuration URL results in error * Tue Feb 17 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-22 - Bugzilla Bug #485790 - Need changes made to spec files in various packages to be able to build in koji/brew |