fix SSL redirect by Google

daipratt · Sep 5, 2013 · 3e071c9 · 3e071c9
1 parent 312d60b
commit 3e071c9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Serposcope changelog
 
-## UPCOMING
+## 1.0.5 - 05/09/2013
 
+* fix SSL redirection introduced by Google in september
 * fix export image highcharts
 * fix import bug with format SERPOSCOPE_CSV
 * run cron for a specific group `/usr/bin/php cron.php _ID_GROUP_

diff --git a/inc/functions.php b/inc/functions.php
@@ -67,7 +67,8 @@ function buildCurlOptions($proxy){
         CURLOPT_HTTPHEADER => array(
             "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
             "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7"
-        )
+        ),
+        CURLOPT_SSL_VERIFYPEER => false
     );
 
     if(is_array($proxy)){

diff --git a/modules/Google/module.php b/modules/Google/module.php
@@ -154,11 +154,11 @@ public function check($group) {
             do{
 
                 if($start_index==0){
-                    $url="http://$domain/search?q=".urlencode($keyword);
-                    $referrer= "http://$domain/";                    
+                    $url="https://$domain/search?q=".urlencode($keyword);
+                    $referrer= "https://$domain/";                    
                 }else{
                     $referrer=$url;
-                    $url="http://$domain/search?q=".urlencode($keyword)."&start=".($start_index);
+                    $url="https://$domain/search?q=".urlencode($keyword)."&start=".($start_index);
                 }
 
                 if(!empty($group['options']['parameters'])){
@@ -184,11 +184,14 @@ public function check($group) {
                         case 302:{
 
                             $redir = $curlout['redir'];
-                            if(strncmp($redir, "http://www.google.com/sorry/?continue=", 38) !== 0){
-                                $this->w("Invalid redir ");
+                            if(
+                                strncmp($redir, "http://www.google.com/sorry/?continue=", 38) !== 0 &&
+                                strncmp($redir, "https://www.google.com/sorry/?continue=", 38) !== 0
+                            ){
+                                $this->w("Invalid redir"); 
                                 $error = true;
                             }else{
-                                $redir = str_replace("http://www.google.com/sorry/?continue=", "http://".$domain."/sorry/?continue=", $redir);
+                                $redir = str_replace("://www.google.com/sorry/?continue=", "://".$domain."/sorry/?continue=", $redir);
 
                                 $opts = array(
                                     CURLOPT_URL => $redir,
@@ -448,6 +451,7 @@ private function handleCaptcha($html, $proxy, $dc, $origUrl){
 
         if($data['status'] != 200 ){
             $this->w("Bad redirection after captcha solving");
+            print_r($data);
             return null;
         }else if(empty($data['data'])){
             $this->w("Bad content after captcha solving");