diff options
| -rw-r--r-- | includes/account.php | 27 | ||||
| -rw-r--r-- | includes/account_stuff.php | 358 | ||||
| -rw-r--r-- | includes/lib/check_weak_key.php | 323 | ||||
| -rw-r--r-- | includes/lib/general.php | 84 | ||||
| -rw-r--r-- | includes/mysql.php.sample | 2 | ||||
| -rw-r--r-- | pages/account/24.php | 6 | ||||
| -rw-r--r-- | pages/account/27.php | 6 | ||||
| -rw-r--r-- | pages/account/33.php | 2 | ||||
| -rw-r--r-- | pages/account/40.php | 14 | ||||
| -rw-r--r-- | pages/account/49.php | 4 | ||||
| -rw-r--r-- | pages/index/11.php | 4 | ||||
| -rwxr-xr-x | scripts/cron/warning.php | 48 | ||||
| -rw-r--r-- | www/account.php | 2 | ||||
| -rw-r--r-- | www/api/ccsr.php | 3 | ||||
| -rw-r--r-- | www/wot.php | 32 |
15 files changed, 518 insertions, 397 deletions
diff --git a/includes/account.php b/includes/account.php index b137c57..4faa0e5 100644 --- a/includes/account.php +++ b/includes/account.php @@ -17,6 +17,7 @@ */ require_once("../includes/loggedin.php"); require_once("../includes/lib/l10n.php"); + require_once('lib/check_weak_key.php'); loadem("account"); @@ -620,10 +621,30 @@ { $row = mysql_fetch_assoc($res); echo $row['domain']."<br>\n"; - mysql_query("update `domains` set `deleted`=NOW() where `id`='$id'"); - $dres = mysql_query("select * from `domlink` where `domid`='$id'"); + + $dres = mysql_query( + "select distinct `domaincerts`.`id` + from `domaincerts`, `domlink` + where `domaincerts`.`domid` = '$id' + or ( + `domaincerts`.`id` = `domlink`.`certid` + and `domlink`.`domid` = '$id' + )"); while($drow = mysql_fetch_assoc($dres)) - mysql_query("update `domaincerts` set `revoked`='1970-01-01 10:00:01' where `id`='".$drow['certid']."' and `revoked`=0 and UNIX_TIMESTAMP(`expire`)-UNIX_TIMESTAMP() > 0"); + { + mysql_query( + "update `domaincerts` + set `revoked`='1970-01-01 10:00:01' + where `id` = '".$drow['id']."' + and `revoked` = 0 + and UNIX_TIMESTAMP(`expire`) - + UNIX_TIMESTAMP() > 0"); + } + + mysql_query( + "update `domains` + set `deleted`=NOW() + where `id` = '$id'"); } } } diff --git a/includes/account_stuff.php b/includes/account_stuff.php index 794266a..148a0ac 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -284,361 +284,3 @@ function hideall() { </body> </html><? } - - /** - * Produces a log entry with the error message with log level E_USER_WARN - * and a random ID an returns a message that can be displayed to the user - * including the generated ID - * - * @param $errormessage string - * The error message that should be logged - * @return string containing the generated ID that can be displayed to the - * user - */ - function failWithId($errormessage) { - $errorId = rand(); - trigger_error("$errormessage. ID: $errorId", E_USER_WARNING); - return sprintf(_("Something went wrong when processing your request. ". - "Please contact %s for help and provide them with the ". - "following ID: %d"), - "<a href='mailto:support@cacert.org?subject=System%20Error%20-%20". - "ID%3A%20$errorId'>support@cacert.org</a>", - $errorId); - } - - /** - * Checks whether the given CSR contains a vulnerable key - * - * @param $csr string - * The CSR to be checked - * @param $encoding string [optional] - * The encoding the CSR is in (for the "-inform" parameter of OpenSSL, - * currently only "PEM" (default) or "DER" allowed) - * @return string containing the reason if the key is considered weak, - * empty string otherwise - */ - function checkWeakKeyCSR($csr, $encoding = "PEM") - { - // non-PEM-encodings may be binary so don't use echo - $descriptorspec = array( - 0 => array("pipe", "r"), // STDIN for child - 1 => array("pipe", "w"), // STDOUT for child - ); - $encoding = escapeshellarg($encoding); - $proc = proc_open("openssl req -inform $encoding -text -noout", - $descriptorspec, $pipes); - - if (is_resource($proc)) - { - fwrite($pipes[0], $csr); - fclose($pipes[0]); - - $csrText = ""; - while (!feof($pipes[1])) - { - $csrText .= fread($pipes[1], 8192); - } - fclose($pipes[1]); - - if (($status = proc_close($proc)) !== 0 || $csrText === "") - { - return _("I didn't receive a valid Certificate Request, hit ". - "the back button and try again."); - } - } else { - return failWithId("checkWeakKeyCSR(): Failed to start OpenSSL"); - } - - - return checkWeakKeyText($csrText); - } - - /** - * Checks whether the given X509 certificate contains a vulnerable key - * - * @param $cert string - * The X509 certificate to be checked - * @param $encoding string [optional] - * The encoding the certificate is in (for the "-inform" parameter of - * OpenSSL, currently only "PEM" (default), "DER" or "NET" allowed) - * @return string containing the reason if the key is considered weak, - * empty string otherwise - */ - function checkWeakKeyX509($cert, $encoding = "PEM") - { - // non-PEM-encodings may be binary so don't use echo - $descriptorspec = array( - 0 => array("pipe", "r"), // STDIN for child - 1 => array("pipe", "w"), // STDOUT for child - ); - $encoding = escapeshellarg($encoding); - $proc = proc_open("openssl x509 -inform $encoding -text -noout", - $descriptorspec, $pipes); - - if (is_resource($proc)) - { - fwrite($pipes[0], $cert); - fclose($pipes[0]); - - $certText = ""; - while (!feof($pipes[1])) - { - $certText .= fread($pipes[1], 8192); - } - fclose($pipes[1]); - - if (($status = proc_close($proc)) !== 0 || $certText === "") - { - return _("I didn't receive a valid Certificate Request, hit ". - "the back button and try again."); - } - } else { - return failWithId("checkWeakKeyCSR(): Failed to start OpenSSL"); - } - - - return checkWeakKeyText($certText); - } - - /** - * Checks whether the given SPKAC contains a vulnerable key - * - * @param $spkac string - * The SPKAC to be checked - * @param $spkacname string [optional] - * The name of the variable that contains the SPKAC. The default is - * "SPKAC" - * @return string containing the reason if the key is considered weak, - * empty string otherwise - */ - function checkWeakKeySPKAC($spkac, $spkacname = "SPKAC") - { - /* Check for the debian OpenSSL vulnerability */ - - $spkac = escapeshellarg($spkac); - $spkacname = escapeshellarg($spkacname); - $spkacText = `echo $spkac | openssl spkac -spkac $spkacname`; - if ($spkacText === null) { - return _("I didn't receive a valid Certificate Request, hit the ". - "back button and try again."); - } - - return checkWeakKeyText($spkacText); - } - - /** - * Checks whether the given text representation of a CSR or a SPKAC contains - * a weak key - * - * @param $text string - * The text representation of a key as output by the - * "openssl <foo> -text -noout" commands - * @return string containing the reason if the key is considered weak, - * empty string otherwise - */ - function checkWeakKeyText($text) - { - /* Which public key algorithm? */ - if (!preg_match('/^\s*Public Key Algorithm: ([^\s]+)$/m', $text, - $algorithm)) - { - return failWithId("checkWeakKeyText(): Couldn't extract the ". - "public key algorithm used"); - } else { - $algorithm = $algorithm[1]; - } - - - if ($algorithm === "rsaEncryption") - { - if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text, - $keysize)) - { - return failWithId("checkWeakKeyText(): Couldn't parse the RSA ". - "key size"); - } else { - $keysize = intval($keysize[1]); - } - - if ($keysize < 1024) - { - return sprintf(_("The keys that you use are very small ". - "and therefore insecure. Please generate stronger ". - "keys. More information about this issue can be ". - "found in %sthe wiki%s"), - "<a href='//wiki.cacert.org/WeakKeys#SmallKey'>", - "</a>"); - } elseif ($keysize < 2048) { - // not critical but log so we have some statistics about - // affected users - trigger_error("checkWeakKeyText(): Certificate for small ". - "key (< 2048 bit) requested", E_USER_NOTICE); - } - - - $debianVuln = checkDebianVulnerability($text, $keysize); - if ($debianVuln === true) - { - return sprintf(_("The keys you use have very likely been ". - "generated with a vulnerable version of OpenSSL which ". - "was distributed by debian. Please generate new keys. ". - "More information about this issue can be found in ". - "%sthe wiki%s"), - "<a href='//wiki.cacert.org/WeakKeys#DebianVulnerability'>", - "</a>"); - } elseif ($debianVuln === false) { - // not vulnerable => do nothing - } else { - return failWithId("checkWeakKeyText(): Something went wrong in". - "checkDebianVulnerability()"); - } - - if (!preg_match('/^\s*Exponent: (\d+) \(0x[0-9a-fA-F]+\)$/m', $text, - $exponent)) - { - return failWithId("checkWeakKeyText(): Couldn't parse the RSA ". - "exponent"); - } else { - $exponent = $exponent[1]; // exponent might be very big => - //handle as string using bc*() - - if (bccomp($exponent, "3") === 0) - { - return sprintf(_("The keys you use might be insecure. ". - "Although there is currently no known attack for ". - "reasonable encryption schemes, we're being ". - "cautious and don't allow certificates for such ". - "keys. Please generate stronger keys. More ". - "information about this issue can be found in ". - "%sthe wiki%s"), - "<a href='//wiki.cacert.org/WeakKeys#SmallExponent'>", - "</a>"); - } elseif (!(bccomp($exponent, "65537") >= 0 && - (bccomp($exponent, "100000") === -1 || - // speed things up if way smaller than 2^256 - bccomp($exponent, bcpow("2", "256")) === -1) )) { - // 65537 <= exponent < 2^256 recommended by NIST - // not critical but log so we have some statistics about - // affected users - trigger_error("checkWeakKeyText(): Certificate for ". - "unsuitable exponent '$exponent' requested", - E_USER_NOTICE); - } - } - } - - /* No weakness found */ - return ""; - } - - /** - * Reimplement the functionality of the openssl-vulnkey tool - * - * @param $text string - * The text representation of a key as output by the - * "openssl <foo> -text -noout" commands - * @param $keysize int [optional] - * If the key size is already known it can be provided so it doesn't - * have to be parsed again. This also skips the check whether the key - * is an RSA key => use wisely - * @return TRUE if key is vulnerable, FALSE otherwise, NULL in case of error - */ - function checkDebianVulnerability($text, $keysize = 0) - { - $keysize = intval($keysize); - - if ($keysize === 0) - { - /* Which public key algorithm? */ - if (!preg_match('/^\s*Public Key Algorithm: ([^\s]+)$/m', $text, - $algorithm)) - { - trigger_error("checkDebianVulnerability(): Couldn't extract ". - "the public key algorithm used", E_USER_WARNING); - return null; - } else { - $algorithm = $algorithm[1]; - } - - if ($algorithm !== "rsaEncryption") return false; - - /* Extract public key size */ - if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text, - $keysize)) - { - trigger_error("checkDebianVulnerability(): Couldn't parse the ". - "RSA key size", E_USER_WARNING); - return null; - } else { - $keysize = intval($keysize[1]); - } - } - - // $keysize has been made sure to contain an int - $blacklist = "/usr/share/openssl-blacklist/blacklist.RSA-$keysize"; - if (!(is_file($blacklist) && is_readable($blacklist))) - { - if (in_array($keysize, array(512, 1024, 2048, 4096))) - { - trigger_error("checkDebianVulnerability(): Blacklist for ". - "$keysize bit keys not accessible. Expected at ". - "$blacklist", E_USER_ERROR); - return null; - } - - trigger_error("checkDebianVulnerability(): $blacklist is not ". - "readable. Unsupported key size?", E_USER_WARNING); - return false; - } - - - /* Extract RSA modulus */ - if (!preg_match('/^\s*Modulus \(\d+ bit\):\n'. - '((?:\s*[0-9a-f][0-9a-f]:(?:\n)?)+[0-9a-f][0-9a-f])$/m', - $text, $modulus)) - { - trigger_error("checkDebianVulnerability(): Couldn't extract the ". - "RSA modulus", E_USER_WARNING); - return null; - } else { - $modulus = $modulus[1]; - // strip whitespace and colon leftovers - $modulus = str_replace(array(" ", "\t", "\n", ":"), "", $modulus); - - // when using "openssl xxx -text" first byte was 00 in all my test - // cases but 00 not present in the "openssl xxx -modulus" output - if ($modulus[0] === "0" && $modulus[1] === "0") - { - $modulus = substr($modulus, 2); - } else { - trigger_error("checkDebianVulnerability(): First byte is not ". - "zero", E_USER_NOTICE); - } - - $modulus = strtoupper($modulus); - } - - - /* calculate checksum and look it up in the blacklist */ - $checksum = substr(sha1("Modulus=$modulus\n"), 20); - - // $checksum and $blacklist should be safe, but just to make sure - $checksum = escapeshellarg($checksum); - $blacklist = escapeshellarg($blacklist); - exec("grep $checksum $blacklist", $dummy, $debianVuln); - if ($debianVuln === 0) // grep returned something => it is on the list - { - return true; - } elseif ($debianVuln === 1) { // grep returned nothing - return false; - } else { - trigger_error("checkDebianVulnerability(): Something went wrong ". - "when looking up the key with checksum $checksum in the ". - "blacklist $blacklist", E_USER_ERROR); - return null; - } - - // Should not get here - return null; - } -?> diff --git a/includes/lib/check_weak_key.php b/includes/lib/check_weak_key.php new file mode 100644 index 0000000..ca13ba2 --- /dev/null +++ b/includes/lib/check_weak_key.php @@ -0,0 +1,323 @@ +<?php /* + LibreSSL - CAcert web application + Copyright (C) 2004-2011 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +// failWithId() +require_once 'general.php'; + + +/** +* Checks whether the given CSR contains a vulnerable key +* +* @param $csr string +* The CSR to be checked +* @param $encoding string [optional] +* The encoding the CSR is in (for the "-inform" parameter of OpenSSL, +* currently only "PEM" (default) or "DER" allowed) +* @return string containing the reason if the key is considered weak, +* empty string otherwise +*/ +function checkWeakKeyCSR($csr, $encoding = "PEM") +{ + $encoding = escapeshellarg($encoding); + $status = runCommand("openssl req -inform $encoding -text -noout", + $csr, $csrText); + if ($status === true) { + return failWithId("checkWeakKeyCSR(): Failed to start OpenSSL"); + } + + if ($status !== 0 || $csrText === "") { + return _("I didn't receive a valid Certificate Request. Hit ". + "the back button and try again."); + } + + return checkWeakKeyText($csrText); +} + +/** + * Checks whether the given X509 certificate contains a vulnerable key + * + * @param $cert string + * The X509 certificate to be checked + * @param $encoding string [optional] + * The encoding the certificate is in (for the "-inform" parameter of + * OpenSSL, currently only "PEM" (default), "DER" or "NET" allowed) + * @return string containing the reason if the key is considered weak, + * empty string otherwise + */ +function checkWeakKeyX509($cert, $encoding = "PEM") +{ + $encoding = escapeshellarg($encoding); + $status = runCommand("openssl x509 -inform $encoding -text -noout", + $cert, $certText); + if ($status === true) { + return failWithId("checkWeakKeyX509(): Failed to start OpenSSL"); + } + + if ($status !== 0 || $certText === "") { + return _("I didn't receive a valid Certificate Request. Hit ". + "the back button and try again."); + } + + return checkWeakKeyText($certText); +} + +/** + * Checks whether the given SPKAC contains a vulnerable key + * + * @param $spkac string + * The SPKAC to be checked + * @param $spkacname string [optional] + * The name of the variable that contains the SPKAC. The default is + * "SPKAC" + * @return string containing the reason if the key is considered weak, + * empty string otherwise + */ +function checkWeakKeySPKAC($spkac, $spkacname = "SPKAC") +{ + $spkacname = escapeshellarg($spkacname); + $status = runCommand("openssl spkac -spkac $spkacname", $spkac, $spkacText); + if ($status === true) { + return failWithId("checkWeakKeySPKAC(): Failed to start OpenSSL"); + } + + if ($status !== 0 || $spkacText === "") { + return _("I didn't receive a valid Certificate Request. Hit the ". + "back button and try again."); + } + + return checkWeakKeyText($spkacText); +} + +/** + * Checks whether the given text representation of a CSR or a SPKAC contains + * a weak key + * + * @param $text string + * The text representation of a key as output by the + * "openssl <foo> -text -noout" commands + * @return string containing the reason if the key is considered weak, + * empty string otherwise + */ +function checkWeakKeyText($text) +{ + /* Which public key algorithm? */ + if (!preg_match('/^\s*Public Key Algorithm: ([^\s]+)$/m', $text, + $algorithm)) + { + return failWithId("checkWeakKeyText(): Couldn't extract the ". + "public key algorithm used.\nData:\n$text"); + } else { + $algorithm = $algorithm[1]; + } + + + if ($algorithm === "rsaEncryption") + { + if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text, + $keysize)) + { + return failWithId("checkWeakKeyText(): Couldn't parse the RSA ". + "key size.\nData:\n$text"); + } else { + $keysize = intval($keysize[1]); + } + + if ($keysize < 1024) + { + return sprintf(_("The keys that you use are very small ". + "and therefore insecure. Please generate stronger ". + "keys. More information about this issue can be ". + "found in %sthe wiki%s"), + "<a href='//wiki.cacert.org/WeakKeys#SmallKey'>", + "</a>"); + } elseif ($keysize < 2048) { + // not critical but log so we have some statistics about + // affected users + trigger_error("checkWeakKeyText(): Certificate for small ". + "key (< 2048 bit) requested", E_USER_NOTICE); + } + + + $debianVuln = checkDebianVulnerability($text, $keysize); + if ($debianVuln === true) + { + return sprintf(_("The keys you use have very likely been ". + "generated with a vulnerable version of OpenSSL which ". + "was distributed by debian. Please generate new keys. ". + "More information about this issue can be found in ". + "%sthe wiki%s"), + "<a href='//wiki.cacert.org/WeakKeys#DebianVulnerability'>", + "</a>"); + } elseif ($debianVuln === false) { + // not vulnerable => do nothing + } else { + return failWithId("checkWeakKeyText(): Something went wrong in". + "checkDebianVulnerability().\nKeysize: $keysize\n". + "Data:\n$text"); + } + + if (!preg_match('/^\s*Exponent: (\d+) \(0x[0-9a-fA-F]+\)$/m', $text, + $exponent)) + { + return failWithId("checkWeakKeyText(): Couldn't parse the RSA ". + "exponent.\nData:\n$text"); + } else { + $exponent = $exponent[1]; // exponent might be very big => + //handle as string using bc*() + + if (bccomp($exponent, "3") === 0) + { + return sprintf(_("The keys you use might be insecure. ". + "Although there is currently no known attack for ". + "reasonable encryption schemes, we're being ". + "cautious and don't allow certificates for such ". + "keys. Please generate stronger keys. More ". + "information about this issue can be found in ". + "%sthe wiki%s"), + "<a href='//wiki.cacert.org/WeakKeys#SmallExponent'>", + "</a>"); + } elseif (!(bccomp($exponent, "65537") >= 0 && + (bccomp($exponent, "100000") === -1 || + // speed things up if way smaller than 2^256 + bccomp($exponent, bcpow("2", "256")) === -1) )) { + // 65537 <= exponent < 2^256 recommended by NIST + // not critical but log so we have some statistics about + // affected users + trigger_error("checkWeakKeyText(): Certificate for ". + "unsuitable exponent '$exponent' requested", + E_USER_NOTICE); + } + } + } + + /* No weakness found */ + return ""; +} + +/** + * Reimplement the functionality of the openssl-vulnkey tool + * + * @param $text string + * The text representation of a key as output by the + * "openssl <foo> -text -noout" commands + * @param $keysize int [optional] + * If the key size is already known it can be provided so it doesn't + * have to be parsed again. This also skips the check whether the key + * is an RSA key => use wisely + * @return TRUE if key is vulnerable, FALSE otherwise, NULL in case of error + */ +function checkDebianVulnerability($text, $keysize = 0) +{ + $keysize = intval($keysize); + + if ($keysize === 0) + { + /* Which public key algorithm? */ + if (!preg_match('/^\s*Public Key Algorithm: ([^\s]+)$/m', $text, + $algorithm)) + { + trigger_error("checkDebianVulnerability(): Couldn't extract ". + "the public key algorithm used.\nData:\n$text", + E_USER_WARNING); + return null; + } else { + $algorithm = $algorithm[1]; + } + + if ($algorithm !== "rsaEncryption") return false; + + /* Extract public key size */ + if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text, + $keysize)) + { + trigger_error("checkDebianVulnerability(): Couldn't parse the ". + "RSA key size.\nData:\n$text", E_USER_WARNING); + return null; + } else { + $keysize = intval($keysize[1]); + } + } + + // $keysize has been made sure to contain an int + $blacklist = "/usr/share/openssl-blacklist/blacklist.RSA-$keysize"; + if (!(is_file($blacklist) && is_readable($blacklist))) + { + if (in_array($keysize, array(512, 1024, 2048, 4096))) + { + trigger_error("checkDebianVulnerability(): Blacklist for ". + "$keysize bit keys not accessible. Expected at ". + "$blacklist", E_USER_ERROR); + return null; + } + + trigger_error("checkDebianVulnerability(): $blacklist is not ". + "readable. Unsupported key size?", E_USER_WARNING); + return false; + } + + + /* Extract RSA modulus */ + if (!preg_match('/^\s*Modulus \(\d+ bit\):\n'. + '((?:\s*[0-9a-f][0-9a-f]:(?:\n)?)+[0-9a-f][0-9a-f])$/m', + $text, $modulus)) + { + trigger_error("checkDebianVulnerability(): Couldn't extract the ". + "RSA modulus.\nData:\n$text", E_USER_WARNING); + return null; + } else { + $modulus = $modulus[1]; + // strip whitespace and colon leftovers + $modulus = str_replace(array(" ", "\t", "\n", ":"), "", $modulus); + + // when using "openssl xxx -text" first byte was 00 in all my test + // cases but 00 not present in the "openssl xxx -modulus" output + if ($modulus[0] === "0" && $modulus[1] === "0") + { + $modulus = substr($modulus, 2); + } else { + trigger_error("checkDebianVulnerability(): First byte is not ". + "zero", E_USER_NOTICE); + } + + $modulus = strtoupper($modulus); + } + + + /* calculate checksum and look it up in the blacklist */ + $checksum = substr(sha1("Modulus=$modulus\n"), 20); + + // $checksum and $blacklist should be safe, but just to make sure + $checksum = escapeshellarg($checksum); + $blacklist = escapeshellarg($blacklist); + $debianVuln = runCommand("grep $checksum $blacklist"); + if ($debianVuln === 0) // grep returned something => it is on the list + { + return true; + } elseif ($debianVuln === 1) { + // grep returned nothing + return false; + } else { + trigger_error("checkDebianVulnerability(): Something went wrong ". + "when looking up the key with checksum $checksum in the ". + "blacklist $blacklist", E_USER_ERROR); + return null; + } + + // Should not get here + return null; +} diff --git a/includes/lib/general.php b/includes/lib/general.php index 25d2561..d91b24e 100644 --- a/includes/lib/general.php +++ b/includes/lib/general.php @@ -47,4 +47,86 @@ function get_user_id_from_cert($serial, $issuer_cn) return -1; } -?> +/** + * Produces a log entry with the error message with log level E_USER_WARN + * and a random ID an returns a message that can be displayed to the user + * including the generated ID + * + * @param $errormessage string + * The error message that should be logged + * @return string containing the generated ID that can be displayed to the + * user + */ +function failWithId($errormessage) { + $errorId = rand(); + trigger_error("$errormessage. ID: $errorId", E_USER_WARNING); + return sprintf(_("Something went wrong when processing your request. ". + "Please contact %s for help and provide them with the ". + "following ID: %d"), + "<a href='mailto:support@cacert.org?subject=System%20Error%20-%20". + "ID%3A%20$errorId'>support@cacert.org</a>", + $errorId); +} + + +/** + * Runs a command on the shell and return it's exit code and output + * + * @param string $command + * The command to run. Make sure that you escapeshellarg() any non-constant + * parts as this is executed on a shell! + * @param string|bool $input + * The input that is passed to the command via STDIN, if true the real + * STDIN is passed through + * @param string|bool $output + * The output the command wrote to STDOUT (this is passed as reference), + * if true the output will be written to the real STDOUT. Output is ignored + * by default + * @param string|bool $errors + * The output the command wrote to STDERR (this is passed as reference), + * if true (default) the output will be written to the real STDERR + * + * @return int|bool + * The exit code of the command, true if the execution of the command + * failed (true because then + * <code>if (runCommand('echo "foo"')) handle_error();</code> will work) + */ +function runCommand($command, $input = "", &$output = null, &$errors = true) { + $descriptorspec = array(); + + if ($input !== true) { + $descriptorspec[0] = array("pipe", "r"); // STDIN for child + } + + if ($output !== true) { + $descriptorspec[1] = array("pipe", "w"); // STDOUT for child + } + + if ($errors !== true) { + $descriptorspec[2] = array("pipe", "w"); // STDERR for child + } + + $proc = proc_open($command, $descriptorspec, $pipes); + + if (is_resource($proc)) + { + if ($input !== true) { + fwrite($pipes[0], $input); + fclose($pipes[0]); + } + + if ($output !== true) { + $output = stream_get_contents($pipes[1]); + } + + if ($errors !== true) { + $errors = stream_get_contents($pipes[2]); + } + + return proc_close($proc); + + } else { + return true; + } +} + diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index ff5cfc3..eb86401 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -28,7 +28,7 @@ function sendmail($to, $subject, $message, $from, $replyto = "", $toname = "", $fromname = "", $errorsto = "returns@cacert.org", $extra="") { - $lines = explode('\n', $message); + $lines = explode("\n", $message); $message = ""; foreach($lines as $line) { diff --git a/pages/account/24.php b/pages/account/24.php index 7f56023..14a47c0 100644 --- a/pages/account/24.php +++ b/pages/account/24.php @@ -48,7 +48,11 @@ </tr> <tr> <td class="DataTD"><?=_("Country")?>:</td> - <td class="DataTD"><input type="text" name="C" value="" size="5">(2 letter <a href="http://www.iso.org/iso/english_country_names_and_code_elements">ISO code</a>)</td> + <td class="DataTD"><input type="text" name="C" value="" size="5"> + <?php printf(_('(2 letter %s ISO code %s )'), + '<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">', + '</a>')?> + </td> </tr> <tr> <td class="DataTD"><?=_("Comments")?>:</td> diff --git a/pages/account/27.php b/pages/account/27.php index 9524620..a1086d4 100644 --- a/pages/account/27.php +++ b/pages/account/27.php @@ -41,7 +41,11 @@ </tr> <tr> <td class="DataTD"><?=_("Country")?>:</td> - <td class="DataTD"><input type="text" name="C" value="<?=($row['C'])?>" size="5"> (2 letter <a href="http://www.iso.org/iso/english_country_names_and_code_elements">ISO code</a>)</td> + <td class="DataTD"><input type="text" name="C" value="<?=($row['C'])?>" size="5"> + <?php printf(_('(2 letter %s ISO code %s )'), + '<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">', + '</a>')?> + </td> </tr> <tr> <td class="DataTD"><?=_("Comments")?>:</td> diff --git a/pages/account/33.php b/pages/account/33.php index 376a8b9..9e2f67a 100644 --- a/pages/account/33.php +++ b/pages/account/33.php @@ -51,7 +51,7 @@ <? } ?> <tr> <td class="DataTD"><?=_("Comments")?>:</td> - <td class="DataTD"><input type="text" name="comments" size=27 maxlength=20 value=""></td> + <td class="DataTD"><textarea name="comments" cols="30" rows="5"></textarea></td> </tr> <tr> <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Add")?>"></td> diff --git a/pages/account/40.php b/pages/account/40.php index fa0c52f..b1a7fdb 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -19,15 +19,6 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s ?> <H3><?=_("Contact Us")?></H3> -<p><? printf(_("To contact us please log out and then use the contact form ". - "there or send us an email to %s. We are working to fix this ". - "situation so you may contact us while staying logged in again."), - - "<a href='mailto:support@cacert.org'>support@cacert.org</a>" - ) ?> -</p> - -<?/* <p><b><?=_("General Questions")?></b></p> <p><b><?=_("PLEASE NOTE: Due to the large amounts of support questions, incorrectly directed emails may be over looked, this is a volunteer effort and directing general questions to the right place will help everyone, including yourself as you will get a reply quicker.")?></b></p> <p><b><?=_("If you are contacting us about advertising, please use the form at the bottom of the website, the first contact form is not the correct place.")?></b></p> @@ -36,7 +27,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s <p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p> <p><a href="https://lists.cacert.org/wws/info/cacert-support"><?=_("Click here to go to the Support List")?></a></p> <p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p> -<form method="post" name="form1"> +<form method="post" action="account.php" name="form1"> <input type="hidden" name="oldid" value="<?=$id?>"> <input type="hidden" name="support" value="yes"> <input type="hidden" name="secrethash2" value=""> @@ -61,7 +52,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s <p><b><?=_("Sensitive Information")?></b></p> <p><?=_("If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help.")?></p> -<form method="post" action="https://www.cacert.org/index.php" name="form2"> +<form method="post" action="account.php" name="form2"> <input type="hidden" name="secrethash2" value=""> <input type="hidden" name="oldid" value="<?=$id?>"> <table border="0"> @@ -98,4 +89,3 @@ Australia</p> document.form2.secrethash2.value = pagehash; --> </script> -*/ diff --git a/pages/account/49.php b/pages/account/49.php index 688b9a4..a5345e6 100644 --- a/pages/account/49.php +++ b/pages/account/49.php @@ -34,7 +34,7 @@ if(mysql_num_rows($res) >= 1) { ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="5" class="title"><?=_("Select Specific Account Details")?></td> + <td colspan="5" class="title"><?=_("Select Specific User Account Details")?></td> </tr> <? while($row = mysql_fetch_assoc($res)) @@ -66,7 +66,7 @@ if(mysql_num_rows($res) >= 1) { ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="5" class="title"><?=_("Select Specific Account Details")?></td> + <td colspan="5" class="title"><?=_("Select Specific Organisation Account Details")?></td> </tr> <? while($row = mysql_fetch_assoc($res)) diff --git a/pages/index/11.php b/pages/index/11.php index 8391903..60c8941 100644 --- a/pages/index/11.php +++ b/pages/index/11.php @@ -27,7 +27,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s <p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p> <p><a href="https://lists.cacert.org/wws/info/cacert-support"><?=_("Click here to go to the Support List")?></a></p> <p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p> -<form method="post" name="form1"> +<form method="post" action="index.php" name="form1"> <input type="hidden" name="oldid" value="<?=$id?>"> <input type="hidden" name="support" value="yes"> <input type="hidden" name="secrethash2" value=""> @@ -52,7 +52,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s <p><b><?=_("Sensitive Information")?></b></p> <p><?=_("If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help.")?></p> -<form method="post" action="https://www.cacert.org/index.php" name="form2"> +<form method="post" action="index.php" name="form2"> <input type="hidden" name="secrethash2" value=""> <input type="hidden" name="oldid" value="<?=$id?>"> <table border="0"> diff --git a/scripts/cron/warning.php b/scripts/cron/warning.php index 18e89da..5cf7c31 100755 --- a/scripts/cron/warning.php +++ b/scripts/cron/warning.php @@ -24,7 +24,7 @@ foreach($days as $day => $warning) { $query = "SELECT `emailcerts`.`id`,`users`.`fname`,`users`.`lname`,`users`.`email`,`emailcerts`.`memid`, - `emailcerts`.`subject`, `emailcerts`.`crt_name`,`emailcerts`.`CN`, + `emailcerts`.`subject`, `emailcerts`.`crt_name`,`emailcerts`.`CN`, `emailcerts`.`serial`, (UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP(NOW())) / 86400 as `daysleft` FROM `users`,`emailcerts` WHERE UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP(NOW()) > -7 * 86400 and @@ -56,7 +56,11 @@ $body = sprintf(_("Hi %s"), $row['fname']).",\n\n"; $body .= _("You are receiving this email as you are the listed contact for:")."\n\n"; $body .= $row['subject']."\n\n"; - $body .= sprintf(_("Your certificate is set to expire in approximately %s days time, you can renew this by going to the following URL:"), $row['daysleft'])."\n\n"; + $body .= sprintf(_("Your certificate with the serial number %s is ". + "set to expire in approximately %s days time. You can ". + "renew it by going to the following URL:"), + $row['serial'], + $row['daysleft'])."\n\n"; $body .= "https://www.cacert.org/account.php?id=5\n\n"; $body .= _("Best Regards")."\n"._("CAcert Support"); sendmail($row['email'], "[CAcert.org] "._("Your Certificate is about to expire"), $body, "support@cacert.org", "", "", "CAcert Support"); @@ -68,16 +72,32 @@ echo $row['fname']." ".$row['lname']." <".$row['email']."> (memid: ".$row['memid foreach($days as $day => $warning) { - $query = "SELECT `domaincerts`.`id`, `users`.`fname`, `users`.`lname`, `users`.`email`, - `domains`.`memid`, `domaincerts`.`subject`, `domaincerts`.`crt_name`, - `domaincerts`.`CN`, - (UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP(NOW())) / 86400 AS `daysleft` + $query = + "SELECT DISTINCT `domaincerts`.`id`, + `users`.`fname`, `users`.`lname`, `users`.`email`, + `domains`.`memid`, + `domaincerts`.`subject`, `domaincerts`.`crt_name`, + `domaincerts`.`CN`, + `domaincerts`.`serial`, + (UNIX_TIMESTAMP(`domaincerts`.`expire`) - + UNIX_TIMESTAMP(NOW())) / 86400 AS `daysleft` + FROM `users`, `domaincerts`, `domlink`, `domains` - WHERE UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP(NOW()) > -7 * 86400 AND - UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP(NOW()) < $day * 86400 AND - `domaincerts`.`renewed`=0 AND `domaincerts`.`warning` <= '$warning' AND - `domaincerts`.`revoked`=0 AND `users`.`id` = `domains`.`memid` AND - `domlink`.`certid` = `domaincerts`.`id` AND `domains`.`id` = `domlink`.`domid`"; + WHERE UNIX_TIMESTAMP(`domaincerts`.`expire`) - + UNIX_TIMESTAMP(NOW()) > -7 * 86400 + AND UNIX_TIMESTAMP(`domaincerts`.`expire`) - + UNIX_TIMESTAMP(NOW()) < $day * 86400 + AND `domaincerts`.`renewed` = 0 + AND `domaincerts`.`warning` <= '$warning' + AND `domaincerts`.`revoked` = 0 + AND ( + `domaincerts`.`domid` = `domains`.`id` + OR ( + `domaincerts`.`id` = `domlink`.`certid` + AND `domlink`.`domid` = `domains`.`id` + ) + ) + AND `domains`.`memid` = `users`.`id`"; $res = mysql_query($query); while($row = mysql_fetch_assoc($res)) { @@ -88,7 +108,11 @@ echo $row['fname']." ".$row['lname']." <".$row['email']."> (memid: ".$row['memid $body = sprintf(_("Hi %s"), $row['fname']).",\n\n"; $body .= _("You are receiving this email as you are the listed contact for:")."\n\n"; $body .= $row['subject']."\n\n"; - $body .= sprintf(_("Your certificate is set to expire in approximately %s days time, you can renew this by going to the following URL:"), $row['daysleft'])."\n\n"; + $body .= sprintf(_("Your certificate with the serial number %s is ". + "set to expire in approximately %s days time. You can ". + "renew it by going to the following URL:"), + $row['serial'], + $row['daysleft'])."\n\n"; $body .= "https://www.cacert.org/account.php?id=12\n\n"; $body .= _("Best Regards")."\n"._("CAcert Support"); sendmail($row['email'], "[CAcert.org] "._("Your Certificate is about to expire"), $body, "support@cacert.org", "", "", "CAcert Support"); diff --git a/www/account.php b/www/account.php index d1dd695..0b32c2c 100644 --- a/www/account.php +++ b/www/account.php @@ -47,7 +47,7 @@ $message = "From: $who\nEmail: $email\nSubject: $subject\n\nMessage:\n".$message; - sendmail("cacert-support@lists.cacert.org, $email", "[website form email]: ".$subject, $message, "website-form@cacert.org", "cacert-support@lists.cacert.org, $email", "", "CAcert Website"); + sendmail("cacert-support@lists.cacert.org", "[website form email]: ".$subject, $message, "website-form@cacert.org", "cacert-support@lists.cacert.org, $email", "", "CAcert Website"); showheader(_("Welcome to CAcert.org")); echo _("Your message has been sent to the general support list."); diff --git a/www/api/ccsr.php b/www/api/ccsr.php index a4ec71e..7efdf8d 100644 --- a/www/api/ccsr.php +++ b/www/api/ccsr.php @@ -15,6 +15,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +require_once '../../includes/lib/check_weak_key.php'; + $username = mysql_real_escape_string($_REQUEST['username']); $password = mysql_real_escape_string($_REQUEST['password']); diff --git a/www/wot.php b/www/wot.php index ffc097b..c6c0568 100644 --- a/www/wot.php +++ b/www/wot.php @@ -446,8 +446,36 @@ $iecho= "c"; where `to`='".$user['id']."' group by `to` HAVING SUM(`points`) > 0")); if($points > 0) { - sendmail($user['email'], "[CAcert.org] ".$_REQUEST['subject'], $_REQUEST['message'], - $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']); + $my_translation = L10n::get_translation(); + L10n::set_translation($user['language']); + + $subject = "[CAcert.org] ".sprintf(_("Message from %s"), + $_SESSION['profile']['fname']); + + $body = sprintf(_("Hi %s,"), $user['fname'])."\n\n"; + $body .= sprintf(_("%s %s has sent you a message via the ". + "contact an Assurer form on CAcert.org."), + $_SESSION['profile']['fname'], + $_SESSION['profile']['lname'])."\n\n"; + $body .= sprintf(_("Subject: %s"), $_REQUEST['subject'])."\n"; + $body .= _("Message:")."\n"; + $body .= $_REQUEST['message']."\n\n"; + $body .= "------------------------------------------------\n\n"; + $body .= _("Please note, that this is NOT a message on behalf ". + "of CAcert but another CAcert community member. If ". + "you suspect that the contact form might have been ". + "abused, please write to support@cacert.org")."\n\n"; + $body .= _("Best regards")."\n"; + $body .= _("Your CAcert Community"); + + sendmail($user['email'], $subject, $body, + $_SESSION['profile']['email'], //from + "", //replyto + "", //toname + $_SESSION['profile']['fname']." ". + $_SESSION['profile']['lname']); //fromname + + L10n::set_translation($my_translation); showheader(_("My CAcert.org Account!"));?> <p> |