[Mapbender-commits] r9841 - trunk/mapbender/http_auth/http

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-01-11 06:36:11 -0800 (Thu, 11 Jan 2018)
New Revision: 9841

Modified:
   trunk/mapbender/http_auth/http/index.php
Log:
force https when using basic auth to secure pwd

Modified: trunk/mapbender/http_auth/http/index.php
===================================================================
--- trunk/mapbender/http_auth/http/index.php	2018-01-05 12:27:47 UTC (rev 9840)
+++ trunk/mapbender/http_auth/http/index.php	2018-01-11 14:36:11 UTC (rev 9841)
@@ -97,7 +97,7 @@
 //parse query 
 $query = new QueryHandler($postData);
 
-// an array with keys and values toLoserCase -> caseinsensitiv
+// an array with keys and values toLowerCase -> caseinsensitiv
 $reqParams = $query->getRequestParams();
 //$e = new mb_exception($reqParams['version']);
 
@@ -1100,6 +1100,16 @@
 	    $namespaces = array("wfs" => "http://www.opengis.net/wfs");
 		break;
 	default:
+		//default exchange all like 2.0.0
+		$operations = array("GetCapabilities", "DescribeFeatureType", "GetFeature", "Transaction", "GetPropertyValue", "ListStoredQueries", "DescribeStoredQueries", "CreateStoredQuery", "DropStoredQuery");
+	    	foreach($operations as $operation) {
+			$urlsToChange[] = '/wfs:WFS_Capabilities/ows:OperationsMetadata/ows:Operation[@name="'.$operation.'"]/ows:DCP/ows:HTTP/ows:Get/@xlink:href';
+			$urlsToChange[] = '/wfs:WFS_Capabilities/ows:OperationsMetadata/ows:Operation[@name="'.$operation.'"]/ows:DCP/ows:HTTP/ows:Post/@xlink:href';
+	    	}
+	    	$namespaces = array("ows" => "http://www.opengis.net/ows/1.1",
+				"wfs" => "http://www.opengis.net/wfs/2.0",
+				"xlink" => "http://www.w3.org/1999/xlink"
+	    	);
 		break;
 	
     }
@@ -1113,6 +1123,8 @@
     $new = $owsproxyUrl['scheme'] . "://" .$owsproxyUrl['host']. $port . "/registry/wfs/" . $wfsId;# ."?";
     if ($extraParameter !== false) {
 	$new .= '?'.$extraParameter;
+	//force https if authType is basic!
+	$new = str_replace("http://", "https://", $new);
     }
     if ($postData == false) {
     	if (func_num_args() == 3) { //new for HTTP Authentication