Get username and password from separate variables for login master
authorMagnus Hagander <[email protected]>
Sun, 15 Dec 2013 14:04:23 +0000 (15:04 +0100)
committerMagnus Hagander <[email protected]>
Sun, 15 Dec 2013 14:04:23 +0000 (15:04 +0100)
This should hopefully keep them out of error messages, and thus not
leak the login details if there is a network problem.

perl-lib/PgCommitFest/Handler.pm

index 097b7e7d21dfb680fb17a1088cb9e4279fff1a3d..77e7a6288ad222b44daad20d3f6c2e0a52819af8 100644 (file)
@@ -99,7 +99,13 @@ sub login {
                my $pg_login_db =
                        PgCommitFest::DB->connect(defined $ENV{'PGCOMMITFEST_LOGIN_DB'} ?
                                $ENV{'PGCOMMITFEST_LOGIN_DB'}
-                       : 'dbi:Pg:dbname=pgcommitfest user=pgcommitfest', '', '');
+                       : 'dbi:Pg:dbname=pgcommitfest user=pgcommitfest',
+                                                 defined $ENV{'PGCOMMITFEST_LOGIN_DB_USERNAME'} ?
+                                                 $ENV{'PGCOMMITFEST_LOGIN_DB_USERNAME'} : '',
+
+                                                 defined $ENV{'PGCOMMITFEST_LOGIN_DB_PASSWORD'} ?
+                                                 $ENV{'PGCOMMITFEST_LOGIN_DB_PASSWORD'} : ''
+                       );
                my $u = $pg_login_db->select_one(<<EOM,
 SELECT userid_p AS userid FROM community_login(?, ?) WHERE success != 0
 EOM