From 8fa82f2cbd17e3f32a537cd405b01d6b6c623ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 7 Aug 2013 00:39:46 +0200 Subject: bug 1199: Remove left over debugging code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- www/gpg.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'www/gpg.php') diff --git a/www/gpg.php b/www/gpg.php index 317072c..c3ba98d 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -82,13 +82,13 @@ function verifyEmail($email) $state=0; if($oldid == "0" && $CSR != "") { - $debugkey = $gpgkey = clean_gpgcsr($CSR); + $gpgkey = clean_gpgcsr($CSR); $tnam = tempnam('/tmp/', '__gpg'); $fp = fopen($tnam, 'w'); fwrite($fp, $gpgkey); fclose($fp); - $debugpg = $gpg = trim(`gpg --with-colons --homedir /tmp 2>&1 < $tnam`); + $gpg = trim(`gpg --with-colons --homedir /tmp 2>&1 < $tnam`); unlink($tnam); $lines = ""; @@ -260,7 +260,6 @@ function verifyEmail($email) unset($_REQUEST['process']); $id = $oldid; unset($oldid); - $do = `echo "$debugkey\n--\n$debugpg\n--" >> /www/tmp/gpg.debug`; exit(); } elseif($nerr) @@ -303,7 +302,7 @@ function verifyEmail($email) system("gpg --homedir $cwd --import $cwd/gpg.csr"); - $debugpg = $gpg = trim(`gpg --homedir $cwd --with-colons --fixed-list-mode --list-keys $keyid 2>&1`); + $gpg = trim(`gpg --homedir $cwd --with-colons --fixed-list-mode --list-keys $keyid 2>&1`); $lines = ""; $gpgarr = explode("\n", $gpg); foreach($gpgarr as $line) -- cgit v1.2.1 From 79a582ee1a478fc5b1858d9752226640f63af55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 7 Aug 2013 01:45:09 +0200 Subject: bug 1200: Use runCommand() to execute gpg to avoid using an unneeded tempfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- www/gpg.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'www/gpg.php') diff --git a/www/gpg.php b/www/gpg.php index c3ba98d..813ee31 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -17,6 +17,7 @@ */ ?> &1', + clean_gpgcsr($CSR), + $gpg)) + { + showheader(_("Welcome to CAcert.org")); - $tnam = tempnam('/tmp/', '__gpg'); - $fp = fopen($tnam, 'w'); - fwrite($fp, $gpgkey); - fclose($fp); - $gpg = trim(`gpg --with-colons --homedir /tmp 2>&1 < $tnam`); - unlink($tnam); + echo "

"._("There was an error parsing your key.")."

"; + unset($_REQUEST['process']); + $id = $oldid; + unset($oldid); + exit(); + } $lines = ""; - $gpgarr = explode("\n", $gpg); + $gpgarr = explode("\n", trim($gpg)); foreach($gpgarr as $line) { #echo "Line[]: $line
\n"; -- cgit v1.2.1 From 359e6dac12f900ffecb74230f671951cf054101a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 7 Aug 2013 02:43:02 +0200 Subject: bug 1200: Use a freshly created temporary directory as gpg homedir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- www/gpg.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'www/gpg.php') diff --git a/www/gpg.php b/www/gpg.php index 813ee31..241df30 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -83,9 +83,17 @@ function verifyEmail($email) $state=0; if($oldid == "0" && $CSR != "") { - if (runCommand('gpg --with-colons --homedir /tmp 2>&1', - clean_gpgcsr($CSR), - $gpg)) + $err = runCommand('mktemp --directory /tmp/cacert_gpg.XXXXXXXXXX', $tmpdir); + if (!err && $tmpdir) + { + $err = runCommand("gpg --with-colons --homedir $tmpdir 2>&1", + clean_gpgcsr($CSR), + $gpg); + + `rm -r $tmpdir`; + } + + if ($err) { showheader(_("Welcome to CAcert.org")); -- cgit v1.2.1 From a733a971db70514c5f791193d9c49bd44f1d4def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Wed, 7 Aug 2013 03:05:31 +0200 Subject: bug 1200: Doh, STDOUT is the *third* parameter of runCommand() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- www/gpg.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'www/gpg.php') diff --git a/www/gpg.php b/www/gpg.php index 241df30..d1c67e0 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -83,8 +83,15 @@ function verifyEmail($email) $state=0; if($oldid == "0" && $CSR != "") { - $err = runCommand('mktemp --directory /tmp/cacert_gpg.XXXXXXXXXX', $tmpdir); - if (!err && $tmpdir) + $err = runCommand('mktemp --directory /tmp/cacert_gpg.XXXXXXXXXX', + "", + $tmpdir); + if (!$tmpdir) + { + $err = true; + } + + if (!err) { $err = runCommand("gpg --with-colons --homedir $tmpdir 2>&1", clean_gpgcsr($CSR), -- cgit v1.2.1 From be962501af189b26322728a8a28efddc9afdd81b Mon Sep 17 00:00:00 2001 From: Benny Baumann Date: Thu, 8 Aug 2013 07:45:02 +0200 Subject: bug 1200: Fix missing dollar sign before error handling --- www/gpg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/gpg.php') diff --git a/www/gpg.php b/www/gpg.php index d1c67e0..bf8ba29 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -91,7 +91,7 @@ function verifyEmail($email) $err = true; } - if (!err) + if (!$err) { $err = runCommand("gpg --with-colons --homedir $tmpdir 2>&1", clean_gpgcsr($CSR), -- cgit v1.2.1