Merge pull request #2 from toban/main

Some fixes for running in local cluster

Author: addshore

public_html/php/WbstackMagnusOauth.php

@@ -2,6 +2,8 @@
 
 class WbstackMagnusOauth {
 
+    public const platformIngressHostAndPort = "platform-nginx.default.svc.cluster.local:8080";
+
     /**
      * @var bool
      */
@@ -156,6 +158,10 @@ public static function getOauthParams(
         return $params;
     }
 
+    public static function isLocalHost(): bool {
+        return substr($_SERVER['SERVER_NAME'], -10, 10) === '.localhost';
+    }
+
     /**
      * @param string $toolUrlTail Example: "/tools/widar"
      * @return mixed
@@ -165,37 +171,29 @@ public static function getSite(
     ) {
         // XXX: this same logic is in quickstatements.php and platform api WikiController backend
         $domain = $_SERVER['SERVER_NAME'];
-        if ( substr($domain,-10, 10) === '.localhost' ){
-            // XXX: this wont actually work on localhost currently as this is talking to mediawiki via
-            // the public hostname which doesnt exist.
-            // If we wanted this to work we would have to also add a way for the host header to be sent with
-            // the requests...
-
-            die('Will not currently work for localhost dev...');
+        if ( self::isLocalHost() ){
 
             // localhost development, with a full domain prefixing .localhost
             // eg. wiki.addshore.com.localhost
-            $wbRoot = $domain . ":8083";
-            $toolRoot = $domain . ":8086";
+            $wbRoot = $domain;
+            $toolRoot = 'http://' . $domain . $toolUrlTail;
 
             // Directly for config
-            $publicMwOAuthUrl = $wbRoot . '/w/index.php?title=Special:OAuth';
-            $mwOAuthUrl = $wbRoot . '/w/index.php?title=Special:OAuth';
+            $publicMwOAuthUrl = 'http://' . $domain . '/w/index.php?title=Special:OAuth';
+            $mwOAuthUrl = 'http://' . self::platformIngressHostAndPort . '/w/index.php?title=Special:OAuth';
             $wbPublicHostAndPort = $wbRoot;
-            $wbApi = $wbRoot . '/w/api.php';
+            $wbApi = 'http://' . self::platformIngressHostAndPort . '/w/api.php';
             $wbPageBase = $wbRoot . '/wiki/';
             $toolbase = $toolRoot;
-        } else if ( $domain === 'localhost' ) {
-            die('Should be accessed with a subdomain of localhost..');
         } else {
             $wbRoot = $domain;
             $toolRoot = $domain . $toolUrlTail;
 
             // Directly for config
-            $publicMwOAuthUrl = 'https://' . $wbRoot . '/w/index.php?title=Special:OAuth';
+            $publicMwOAuthUrl = 'https://' . $wbRoot . '/w/index.php?title=Special:OAuth'; // TODO this could use the internal network
             $mwOAuthUrl = 'https://' . $wbRoot . '/w/index.php?title=Special:OAuth';
             $wbPublicHostAndPort = $wbRoot;
-            $wbApi = 'https://' . $wbRoot . '/w/api.php';
+            $wbApi = 'https://' . $wbRoot . '/w/api.php'; // TODO this could use the internal network
             $wbPageBase = 'https://' . $wbRoot . '/wiki/';
             $toolbase = 'https://' . $toolRoot;
         }

public_html/php/oauth.php

@@ -149,7 +149,10 @@ function fetchAccessToken() {
 		curl_setopt( $ch, CURLOPT_URL, $url );
 		//curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
 		curl_setopt( $ch, CURLOPT_USERAGENT, $this->gUserAgent );
+
 		curl_setopt( $ch, CURLOPT_HEADER, 0 );
+		$this->setCurlHttpHeaders( $ch );
+
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 		$data = curl_exec( $ch );
 
@@ -200,6 +203,7 @@ function fetchAccessToken() {
 	function sign_request( $method, $url, $params = [] ) {
 //		global $gConsumerSecret, $gTokenSecret;
 
+		$url = str_replace( WbstackMagnusOauth::platformIngressHostAndPort, $_SERVER['SERVER_NAME'], $url );
 		$parts = parse_url( $url );
 
 		// We need to normalize the endpoint URL
@@ -238,6 +242,24 @@ 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
@@ -270,6 +292,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 );
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 		$data = curl_exec( $ch );
 		if ( !$data ) {
@@ -482,10 +505,12 @@ function doApiQuery( $post, &$ch = null , $mode = '' , $iterations_left = 5 , $l
 		curl_setopt( $ch, CURLOPT_POST, true );
 		curl_setopt( $ch, CURLOPT_URL, $url );
 		curl_setopt( $ch, CURLOPT_POSTFIELDS, $post_fields );
-		curl_setopt( $ch, CURLOPT_HTTPHEADER, [ $header ] );
 		//curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
 		curl_setopt( $ch, CURLOPT_USERAGENT, $this->gUserAgent );
+
 		curl_setopt( $ch, CURLOPT_HEADER, 0 );
+		$this->setCurlHttpHeaders( $ch, [ $header ] );
+
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 
 		$data = curl_exec( $ch );