diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php index 7628893..3beadf4 100644 --- a/htdocs/application/config/stikked.php +++ b/htdocs/application/config/stikked.php @@ -88,11 +88,16 @@ $config['per_page'] = 15; * * private_only: No recent pastes will be displayed. * enable_captcha: Users must enter a captcha to post. + * recaptcha_publickey & recaptcha_privatekey: If filled in correctly, reCaptcha will be used * blocked_words: Comma separated list, e.g. '.es.tl, mycraft.com, yourbadword' + * disable_api: Don't allow pasting via API (because we can't use a captcha there...) * **/ $config['private_only'] = false; -$config['enable_captcha'] = false; +$config['enable_captcha'] = true; +$config['recaptcha_publickey'] = '6LcNfOASAAAAAAP8AlckZgKxxvgzhHqFtfqnALG-'; +$config['recaptcha_privatekey'] = '6LcNfOASAAAAAMsddBL8WIQI-oc7Sh6vtJRYN9FK'; +$config['disable_api'] = false; $config['blocked_words'] = ''; //spamadmin: accessible via /spamadmin (only active when user + pass is set) diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php index 1e205a9..87bde7a 100644 --- a/htdocs/application/controllers/main.php +++ b/htdocs/application/controllers/main.php @@ -17,6 +17,7 @@ * - captcha() * - _valid_lang() * - _valid_captcha() + * - _valid_recaptcha() * - _valid_ip() * - _blockwords_check() * - _autofill_check() @@ -35,10 +36,15 @@ class Main extends CI_Controller parent::__construct(); $this->load->model('languages'); - if ($this->config->item('require_auth')) + if (config_item('require_auth')) { $this->load->library('auth_ldap'); } + + //recaptcha + $this->recaptcha_publickey = config_item('recaptcha_publickey'); + $this->recaptcha_privatekey = config_item('recaptcha_privatekey'); + $this->use_recaptcha = ($this->recaptcha_publickey != '' && $this->recaptcha_privatekey != '' ? true : false); if (!$this->db->table_exists('ci_sessions')) { @@ -249,7 +255,7 @@ class Main extends CI_Controller //codemirror languages $this->load->config('codemirror_languages'); - $codemirror_languages = $this->config->item('codemirror_languages'); + $codemirror_languages = config_item('codemirror_languages'); $data['codemirror_languages'] = $codemirror_languages; //codemirror modes @@ -269,7 +275,7 @@ class Main extends CI_Controller if (!$this->db_session->userdata('expire')) { - $default_expiration = $this->config->item('default_expiration'); + $default_expiration = config_item('default_expiration'); $this->db_session->set_userdata('expire', $default_expiration); } @@ -287,7 +293,7 @@ class Main extends CI_Controller if (!$lang) { - $lang = $this->config->item('default_language'); + $lang = config_item('default_language'); } $data['lang_set'] = $lang; } @@ -367,7 +373,7 @@ class Main extends CI_Controller else { - if ($this->config->item('private_only')) + if (config_item('private_only')) { $_POST['private'] = 1; } @@ -416,7 +422,7 @@ class Main extends CI_Controller $this->load->helper('text'); $paste = $this->pastes->getPaste(3); $data = $this->pastes->getReplies(3); - $data['page_title'] = $paste['title'] . ' - ' . $this->config->item('site_name'); + $data['page_title'] = $paste['title'] . ' - ' . config_item('site_name'); $data['feed_url'] = site_url('view/rss/' . $this->uri->segment(3)); $this->load->view('view/rss', $data); } @@ -464,7 +470,7 @@ class Main extends CI_Controller { $this->_valid_authentication(); - if ($this->config->item('private_only')) + if (config_item('private_only')) { show_404(); } @@ -476,7 +482,7 @@ class Main extends CI_Controller if ($this->uri->segment(2) == 'rss') { $this->load->helper('text'); - $data['page_title'] = $this->config->item('site_name'); + $data['page_title'] = config_item('site_name'); $data['feed_url'] = site_url('lists/rss'); $data['replies'] = $data['pastes']; unset($data['pastes']); @@ -493,7 +499,7 @@ class Main extends CI_Controller { $this->_valid_authentication(); - if ($this->config->item('private_only')) + if (config_item('private_only')) { show_404(); } @@ -534,7 +540,7 @@ class Main extends CI_Controller $this->load->model('pastes'); $key = $this->uri->segment(2); - if ($key != $this->config->item('cron_key')) + if ($key != config_item('cron_key')) { show_404(); } @@ -584,10 +590,18 @@ class Main extends CI_Controller function _valid_captcha($text) { - if ($this->config->item('enable_captcha')) + if (config_item('enable_captcha')) { $this->form_validation->set_message('_valid_captcha', lang('captcha')); - return strtolower($text) == strtolower($this->db_session->userdata('captcha')); + + if ($this->use_recaptcha) + { + return $this->_valid_recaptcha(); + } + else + { + return strtolower($text) == strtolower($this->db_session->userdata('captcha')); + } } else { @@ -595,6 +609,36 @@ class Main extends CI_Controller } } + function _valid_recaptcha() + { + $this->load->helper('recaptcha'); + + if ($this->input->post('recaptcha_response_field')) + { + $pk = $this->recaptcha_privatekey; + $ra = $_SERVER['REMOTE_ADDR']; + $cf = $this->input->post('recaptcha_challenge_field'); + $rf = $this->input->post('recaptcha_response_field'); + + //check + $resp = recaptcha_check_answer($pk, $ra, $cf, $rf); + + if ($resp->is_valid) + { + return true; + } + else + { + $this->form_validation->set_message('_valid_captcha', $resp->error); + return false; + } + } + else + { + return false; + } + } + function _valid_ip() { @@ -640,9 +684,16 @@ class Main extends CI_Controller $this->form_validation->set_message('_blockwords_check', lang('blocked_words')); //check - $blocked_words = $this->config->item('blocked_words'); + $blocked_words = config_item('blocked_words'); $post = $this->input->post(); $raw = $post['code']; + + if (!$blocked_words) + { + return true; + } + + //we have blocked words foreach (explode(',', $blocked_words) as $word) { $word = trim($word); @@ -668,7 +719,7 @@ class Main extends CI_Controller function _valid_authentication() { - if ($this->config->item('require_auth')) + if (config_item('require_auth')) { if (!$this->auth_ldap->is_authenticated()) @@ -683,7 +734,7 @@ class Main extends CI_Controller { $lang = $this->uri->segment(3); $this->load->config('codemirror_languages'); - $cml = $this->config->item('codemirror_languages'); + $cml = config_item('codemirror_languages'); //file path $file_path = 'themes/' . config_item('theme') . '/js/'; diff --git a/htdocs/application/helpers/recaptcha_helper.php b/htdocs/application/helpers/recaptcha_helper.php new file mode 100644 index 0000000..32c4f4d --- /dev/null +++ b/htdocs/application/helpers/recaptcha_helper.php @@ -0,0 +1,277 @@ + $value ) + $req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; + + // Cut the last '&' + $req=substr($req,0,strlen($req)-1); + return $req; +} + + + +/** + * Submits an HTTP POST to a reCAPTCHA server + * @param string $host + * @param string $path + * @param array $data + * @param int port + * @return array response + */ +function _recaptcha_http_post($host, $path, $data, $port = 80) { + + $req = _recaptcha_qsencode ($data); + + $http_request = "POST $path HTTP/1.0\r\n"; + $http_request .= "Host: $host\r\n"; + $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n"; + $http_request .= "Content-Length: " . strlen($req) . "\r\n"; + $http_request .= "User-Agent: reCAPTCHA/PHP\r\n"; + $http_request .= "\r\n"; + $http_request .= $req; + + $response = ''; + if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { + die ('Could not open socket'); + } + + fwrite($fs, $http_request); + + while ( !feof($fs) ) + $response .= fgets($fs, 1160); // One TCP-IP packet + fclose($fs); + $response = explode("\r\n\r\n", $response, 2); + + return $response; +} + + + +/** + * Gets the challenge HTML (javascript and non-javascript version). + * This is called from the browser, and the resulting reCAPTCHA HTML widget + * is embedded within the HTML form it was called from. + * @param string $pubkey A public key for reCAPTCHA + * @param string $error The error given by reCAPTCHA (optional, default is null) + * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false) + + * @return string - The HTML to be embedded in the user's form. + */ +function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) +{ + if ($pubkey == null || $pubkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($use_ssl) { + $server = RECAPTCHA_API_SECURE_SERVER; + } else { + $server = RECAPTCHA_API_SERVER; + } + + $errorpart = ""; + if ($error) { + $errorpart = "&error=" . $error; + } + return ' + + '; +} + + + + +/** + * A ReCaptchaResponse is returned from recaptcha_check_answer() + */ +class ReCaptchaResponse { + var $is_valid; + var $error; +} + + +/** + * Calls an HTTP POST function to verify if the user's guess was correct + * @param string $privkey + * @param string $remoteip + * @param string $challenge + * @param string $response + * @param array $extra_params an array of extra variables to post to the server + * @return ReCaptchaResponse + */ +function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) +{ + if ($privkey == null || $privkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($remoteip == null || $remoteip == '') { + die ("For security reasons, you must pass the remote ip to reCAPTCHA"); + } + + + + //discard spam submissions + if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { + $recaptcha_response = new ReCaptchaResponse(); + $recaptcha_response->is_valid = false; + $recaptcha_response->error = 'incorrect-captcha-sol'; + return $recaptcha_response; + } + + $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify", + array ( + 'privatekey' => $privkey, + 'remoteip' => $remoteip, + 'challenge' => $challenge, + 'response' => $response + ) + $extra_params + ); + + $answers = explode ("\n", $response [1]); + $recaptcha_response = new ReCaptchaResponse(); + + if (trim ($answers [0]) == 'true') { + $recaptcha_response->is_valid = true; + } + else { + $recaptcha_response->is_valid = false; + $recaptcha_response->error = $answers [1]; + } + return $recaptcha_response; + +} + +/** + * gets a URL where the user can sign up for reCAPTCHA. If your application + * has a configuration page where you enter a key, you should provide a link + * using this function. + * @param string $domain The domain where the page is hosted + * @param string $appname The name of your application + */ +function recaptcha_get_signup_url ($domain = null, $appname = null) { + return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname)); +} + +function _recaptcha_aes_pad($val) { + $block_size = 16; + $numpad = $block_size - (strlen ($val) % $block_size); + return str_pad($val, strlen ($val) + $numpad, chr($numpad)); +} + +/* Mailhide related code */ + +function _recaptcha_aes_encrypt($val,$ky) { + if (! function_exists ("mcrypt_encrypt")) { + die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); + } + $mode=MCRYPT_MODE_CBC; + $enc=MCRYPT_RIJNDAEL_128; + $val=_recaptcha_aes_pad($val); + return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); +} + + +function _recaptcha_mailhide_urlbase64 ($x) { + return strtr(base64_encode ($x), '+/', '-_'); +} + +/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ +function recaptcha_mailhide_url($pubkey, $privkey, $email) { + if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { + die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . + "you can do so at http://www.google.com/recaptcha/mailhide/apikey"); + } + + + $ky = pack('H*', $privkey); + $cryptmail = _recaptcha_aes_encrypt ($email, $ky); + + return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail); +} + +/** + * gets the parts of the email to expose to the user. + * eg, given johndoe@example,com return ["john", "example.com"]. + * the email is then displayed as john...@example.com + */ +function _recaptcha_mailhide_email_parts ($email) { + $arr = preg_split("/@/", $email ); + + if (strlen ($arr[0]) <= 4) { + $arr[0] = substr ($arr[0], 0, 1); + } else if (strlen ($arr[0]) <= 6) { + $arr[0] = substr ($arr[0], 0, 3); + } else { + $arr[0] = substr ($arr[0], 0, 4); + } + return $arr; +} + +/** + * Gets html to display an email address given a public an private key. + * to get a key, go to: + * + * http://www.google.com/recaptcha/mailhide/apikey + */ +function recaptcha_mailhide_html($pubkey, $privkey, $email) { + $emailparts = _recaptcha_mailhide_email_parts ($email); + $url = recaptcha_mailhide_url ($pubkey, $privkey, $email); + + return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); + +} + + +?>