Merge pull request #3 from toban/main

Add host headers to request methods in

Author: addshore

classes/Common.php

@@ -1,6 +1,7 @@
 <?PHP
 
 namespace Toolforge ;
+use WbstackMagnusOauth;
 
 # declare(strict_types=1); # PHP7
 
@@ -359,7 +360,7 @@ public function getMultipleURLsInParallel ( $urls , $batch_size = 50 ) {
 			if ( count($batches[count($batches)-1]) >= $batch_size ) $batches[] = [] ;
 			$batches[count($batches)-1][$k] = $v ;
 		}
-	
+
 		foreach ( $batches AS $batch_urls ) {
 
 			$mh = curl_multi_init();
@@ -374,6 +375,9 @@ public function getMultipleURLsInParallel ( $urls , $batch_size = 50 ) {
 				curl_setopt($ch[$key], CURLOPT_RETURNTRANSFER, true);
 				curl_setopt($ch[$key], CURLOPT_SSL_VERIFYPEER, false);
 				curl_setopt($ch[$key], CURLOPT_SSL_VERIFYHOST, false);
+
+				WbstackMagnusOauth::setCurlHttpHeaders( $ch[$key] );
+
 				curl_multi_add_handle($mh,$ch[$key]);
 			}
 
@@ -389,7 +393,7 @@ public function getMultipleURLsInParallel ( $urls , $batch_size = 50 ) {
 
 			curl_multi_close($mh);
 		}
-	
+
 		return $ret ;
 	}
 

public_html/php/WbstackMagnusOauth.php

@@ -223,4 +223,21 @@ public static function getSite(
         return $site;
     }
 
+	/**
+	 * Set the HTTP Headers for the curl handle
+	 *
+	 * Sets the HOST parameter when internally talking to wbstack platform ingress
+	 *
+	 */
+	public static function setCurlHttpHeaders( $curlHandle, $headers = [] ) {
+
+		if( WbstackMagnusOauth::isLocalHost() ) {
+			$domain = $_SERVER['SERVER_NAME'];
+			$headers[] = 'HOST: ' . $domain;
+		}
+	
+		if( !empty($headers) ) {
+			curl_setopt( $curlHandle, CURLOPT_HTTPHEADER, $headers );
+		}
+	}
 }

public_html/php/oauth.php

@@ -151,7 +151,7 @@ function fetchAccessToken() {
 		curl_setopt( $ch, CURLOPT_USERAGENT, $this->gUserAgent );
 
 		curl_setopt( $ch, CURLOPT_HEADER, 0 );
-		$this->setCurlHttpHeaders( $ch );
+		WbstackMagnusOauth::setCurlHttpHeaders( $ch );
 
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 		$data = curl_exec( $ch );
@@ -242,24 +242,6 @@ function sign_request( $method, $url, $params = [] ) {
 		return base64_encode( hash_hmac( 'sha1', $toSign, $key, true ) );
 	}
 
-	/**
-	 * Set the HTTP Headers for the curl handle
-	 *
-	 * Sets the HOST parameter when internally talking to wbstack platform ingress
-	 *
-	 */
-	function setCurlHttpHeaders( $curlHandle, $headers = [] ) {
-
-		if( WbstackMagnusOauth::isLocalHost() ) {
-			$domain = $_SERVER['SERVER_NAME'];
-			$headers[] = 'HOST: ' . $domain;
-		}
-	
-		if( !empty($headers) ) {
-			curl_setopt( $curlHandle, CURLOPT_HTTPHEADER, $headers );
-		}
-	}
-
 	/**
 	 * Request authorization
 	 * @return void
@@ -292,7 +274,7 @@ function doAuthorizationRedirect($callback='') {
 		//curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
 		curl_setopt( $ch, CURLOPT_USERAGENT, $this->gUserAgent );
 		curl_setopt( $ch, CURLOPT_HEADER, 0 );
-		$this->setCurlHttpHeaders( $ch );
+		WbstackMagnusOauth::setCurlHttpHeaders( $ch );
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 		$data = curl_exec( $ch );
 		if ( !$data ) {
@@ -509,7 +491,7 @@ function doApiQuery( $post, &$ch = null , $mode = '' , $iterations_left = 5 , $l
 		curl_setopt( $ch, CURLOPT_USERAGENT, $this->gUserAgent );
 
 		curl_setopt( $ch, CURLOPT_HEADER, 0 );
-		$this->setCurlHttpHeaders( $ch, [ $header ] );
+		WbstackMagnusOauth::setCurlHttpHeaders( $ch, [ $header ] );
 
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 

public_html/php/wikidata.php

@@ -180,6 +180,9 @@ protected function getMultipleURLsInParallel ( $urls ) {
 				curl_setopt($ch[$key], CURLOPT_RETURNTRANSFER, true);
 				curl_setopt($ch[$key], CURLOPT_SSL_VERIFYPEER, false);
 				curl_setopt($ch[$key], CURLOPT_SSL_VERIFYHOST, false);
+
+				WbstackMagnusOauth::setCurlHttpHeaders( $ch[$key] );
+
 				curl_multi_add_handle($mh,$ch[$key]);
 			}