Changeset 6943

Timestamp:

03/26/10 17:27:33 (3 years ago)

Author:

OlivierRaginel

Message:

Item2623: Improved doc for PROXY settings (about auth), and added proxy authentication to fallback mechanism (without LWP)

Location:

trunk/core/lib

Files:

• Foswiki.spec (modified) (2 diffs)
• Foswiki/Net.pm (modified) (1 diff)

trunk/core/lib/Foswiki.spec

@@ -1179 +1179 @@
 # Some environments require outbound HTTP traffic to go through a proxy
 # server. (e.g. http://proxy.your.company).
-# <b>CAUTION</b> This setting can be overridden by a %PROXYHOST% setting
-# in SitePreferences. Make sure you delete the setting from there.
+# <b>CAUTION</b> This setting can be overridden by a PROXYHOST setting
+# in SitePreferences. Make sure you delete the setting from there if
+# you are using a SitePreferences topic from a previous release of Foswiki.
+# If your proxy requires authentication, simply put it in the URL, as in:
+# http://username:password@proxy.your.company.
 $Foswiki::cfg{PROXY}{HOST} = '';
 
@@ -1186 +1189 @@
 # Some environments require outbound HTTP traffic to go through a proxy
 # server. Set the port number here (e.g: 8080).
-# <b>CAUTION</b> This setting can be overridden by a %PROXYPORT% setting
-# in SitePreferences. Make sure you delete the setting from there.
+# <b>CAUTION</b> This setting can be overridden by a PROXYPORT setting
+# in SitePreferences. Make sure you delete the setting from there if you
+# are using a SitePreferences topic from a previous release of Foswiki.
 $Foswiki::cfg{PROXY}{PORT} = '';
 

trunk/core/lib/Foswiki/Net.pm

@@ -165 +165 @@
             $proxyPort = $prefs->getPreference('PROXYPORT');
         }
-        $proxyHost ||= $Foswiki::cfg{PROXY}{HOST};
-        $proxyPort ||= $Foswiki::cfg{PROXY}{PORT};
+
+        # Do not use || so user can disable proxy using preferences
+        $proxyHost = $Foswiki::cfg{PROXY}{HOST} unless defined $proxyHost;
+        $proxyPort = $Foswiki::cfg{PROXY}{PORT} unless defined $proxyPort;
         if ( $proxyHost && $proxyPort ) {
+            my ( $proxyUser, $proxyPass );
+            if ( $proxyHost =~ m#^http://(?:(.*?)(?::(.*?))?@)?(.*)(?::(\d+))?/*# ) {
+                $proxyUser = $1;
+                $proxyPass = $2;
+                $proxyHost = $3;
+                $proxyPort = $4 if defined $4;
+            } else {
+                require Foswiki::Net::HTTPResponse;
+                return new Foswiki::Net::HTTPResponse(
+                    "Proxy settings are invalid, check configure ($proxyHost)");
+            }
             $req  = "GET http://$host:$port$url HTTP/1.0\r\n";
             $host = $proxyHost;
             $port = $proxyPort;
+            if ($proxyUser) {
+                require MIME::Base64;
+                import MIME::Base64();
+                my $base64 = encode_base64( "$proxyUser:$proxyPass", "\r\n" );
+                $req .= "Proxy-Authorization: Basic $base64";
+            }
         }