Backing out these patches as they cause a regression. More information

in the respective bug reports.

Bug 428659 â\80\93 Setting SSL param to 'authenticated sessions' only
protects logins and param doesn't protect WebService calls at all
Patch by Dave Lawrence <dkl@redhat.com> - r/a=mkanat

Bug 445104: ssl redirects come with a 200 OK HTTP code on mod_perl
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=dkl, a=mkanat

diff --git a/Bugzilla/Auth/Login/CGI.pm b/Bugzilla/Auth/Login/CGI.pm
index 0bc3ee1199930da90de01edd9e26968028328eb2..980e2712390062461e5cc97c7598cd79414f7129 100644 (file)
--- a/Bugzilla/Auth/Login/CGI.pm
+++ b/Bugzilla/Auth/Login/CGI.pm
@@ -66,9 +66,11 @@ sub fail_nodata {
     }
 
     # Redirect to SSL if required
-    Bugzilla->cgi->require_https(Bugzilla->params->{'sslbase'})
-        if ssl_require_redirect();
-
+    if (Bugzilla->params->{'sslbase'} ne '' 
+        and Bugzilla->params->{'ssl'} ne 'never') 
+    {
+        $cgi->require_https(Bugzilla->params->{'sslbase'});
+    }
     print $cgi->header();
     $template->process("account/auth/login.html.tmpl",
                        { 'target' => $cgi->url(-relative=>1) }) 

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 0de89408e4500f6daf7005dd568b85a8e352ca0b..8c8b590cc822652386b8f51b3cc722201c17d70f 100644 (file)
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -72,8 +72,9 @@ sub new {
     $self->charset(Bugzilla->params->{'utf8'} ? 'UTF-8' : '');
 
     # Redirect to SSL if required
-    if (i_am_cgi() && Bugzilla->usage_mode != USAGE_MODE_WEBSERVICE 
-        && ssl_require_redirect()) 
+    if (Bugzilla->params->{'sslbase'} ne ''
+        && Bugzilla->params->{'ssl'} eq 'always'
+        && i_am_cgi())
     {
         $self->require_https(Bugzilla->params->{'sslbase'});
     }
@@ -296,23 +297,18 @@ sub remove_cookie {
 
 # Redirect to https if required
 sub require_https {
-    my ($self, $url) = @_;
-    # Do not create query string if data submitted via XMLRPC
-    my $query = Bugzilla->usage_mode == USAGE_MODE_WEBSERVICE ? 0 : 1;
-    # XMLRPC clients (SOAP::Lite at least) requires 301 to redirect properly
-    my $status = Bugzilla->usage_mode == USAGE_MODE_WEBSERVICE ? 301 : 302;
-    if (defined $url) {
-        $url .= $self->url('-path_info' => 1, '-query' => $query, '-relative' => 1);
-    } else {
-        $url = $self->self_url;
-        $url =~ s/^http:/https:/i;
+     my $self = shift;
+     if ($self->protocol ne 'https') {
+         my $url = shift;
+         if (defined $url) {
+             $url .= $self->url('-path_info' => 1, '-query' => 1, '-relative' => 1);
+         } else {
+             $url = $self->self_url;
+             $url =~ s/^http:/https:/i;
+         }
+         print $self->redirect(-location => $url);
+         exit;
     }
-    print $self->redirect(-location => $url, -status => $status);
-    # When using XML-RPC with mod_perl, we need the headers sent immediately.
-    # We used to do this by appending a newline to $self->redirect, but
-    # that breaks normal web browser redirects.
-    $self->r->rflush if $ENV{MOD_PERL};
-    exit;
 }
 
 1;
@@ -382,7 +378,7 @@ As its only argument, it takes the name of the cookie to expire.
 This routine checks if the current page is being served over https, and
 redirects to the https protocol if required, retaining QUERY_STRING.
 
-It takes an optional argument which will be used as the base URL.  If $baseurl
+It takes an option argument which will be used as the base URL.  If $baseurl
 is not provided, the current URL is used.
 
 =back

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 8e521c24aeb58aebe6934d9abfe742a7919e778f..e7a76e21d1c8a2b5d10e9e1510233c6dd10c0c5b 100644 (file)
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -36,7 +36,7 @@ use base qw(Exporter);
                              html_quote url_quote xml_quote
                              css_class_quote html_light_quote url_decode
                              i_am_cgi get_netaddr correct_urlbase
-                             lsearch ssl_require_redirect
+                             lsearch
                              diff_arrays diff_strings
                              trim wrap_hard wrap_comment find_wrap_point
                              format_time format_time_decimal validate_date
@@ -218,26 +218,6 @@ sub i_am_cgi {
     return exists $ENV{'SERVER_SOFTWARE'} ? 1 : 0;
 }
 
-sub ssl_require_redirect {
-    my $method = shift;
-
-    # Redirect to SSL if required.
-    if (!(uc($ENV{HTTPS}) eq 'ON' || $ENV{'SERVER_PORT'} == 443)
-        && Bugzilla->params->{'sslbase'} ne '') 
-    {
-        if (Bugzilla->params->{'ssl'} eq 'always'
-            || (Bugzilla->params->{'ssl'} eq 'authenticated sessions'
-                && Bugzilla->user->id)
-            || (Bugzilla->params->{'ssl'} eq 'authenticated sessions'
-                && !Bugzilla->user->id && $method eq 'User.login')) 
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 sub correct_urlbase {
     my $ssl = Bugzilla->params->{'ssl'};
     return Bugzilla->params->{'urlbase'} if $ssl eq 'never';

diff --git a/Bugzilla/WebService.pm b/Bugzilla/WebService.pm
index 8e7d1c21fcd96fe69cfc1bb00175336f53f00876..94dbb621778ab2695a2ed3a65f8c0c8830c6c00c 100755 (executable)
--- a/Bugzilla/WebService.pm
+++ b/Bugzilla/WebService.pm
@@ -19,7 +19,6 @@ package Bugzilla::WebService;
 
 use strict;
 use Bugzilla::WebService::Constants;
-use Bugzilla::Util;
 use Date::Parse;
 
 sub fail_unimplemented {
@@ -54,15 +53,6 @@ sub handle_login {
     return;
 }
 
-sub handle_redirect {
-    my ($action, $uri, $method) = @_;
-    my $full_method = $uri . "." . $method;
-
-    # Redirect to SSL if required.
-    Bugzilla->cgi->require_https(Bugzilla->params->{'sslbase'})
-        if ssl_require_redirect($full_method);
-}
-
 # For some methods, we shouldn't call Bugzilla->login before we call them
 use constant LOGIN_EXEMPT => { };
 

diff --git a/index.cgi b/index.cgi
index 442617111209a233feec7997f1f6407013a1fb32..100941765d9c03e82659ab593e3186d8b4d8ac8e 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -35,7 +35,6 @@ use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Update;
-use Bugzilla::Util;
 
 # Check whether or not the user is logged in
 my $user = Bugzilla->login(LOGIN_OPTIONAL);
@@ -47,8 +46,9 @@ my $user = Bugzilla->login(LOGIN_OPTIONAL);
 my $cgi = Bugzilla->cgi;
 # Force to use HTTPS unless Bugzilla->params->{'ssl'} equals 'never'.
 # This is required because the user may want to log in from here.
-$cgi->require_https(Bugzilla->params->{'sslbase'}) 
-    if ssl_require_redirect();
+if (Bugzilla->params->{'sslbase'} ne '' and Bugzilla->params->{'ssl'} ne 'never') {
+    $cgi->require_https(Bugzilla->params->{'sslbase'});
+}
 
 my $template = Bugzilla->template;
 my $vars = {};

diff --git a/token.cgi b/token.cgi
index 71996bec00e383e1ae21f7547346a16196660eb9..c91c2f94ffbbbd8b82c2bd54eba8888cc3750899 100755 (executable)
--- a/token.cgi
+++ b/token.cgi
@@ -347,9 +347,11 @@ sub request_create_account {
     $vars->{'date'} = str2time($date);
 
     # We require a HTTPS connection if possible.
-    Bugzilla->cgi->require_https(Bugzilla->params->{'sslbase'}) 
-        if ssl_require_redirect();
-
+    if (Bugzilla->params->{'sslbase'} ne ''
+        && Bugzilla->params->{'ssl'} ne 'never')
+    {
+        $cgi->require_https(Bugzilla->params->{'sslbase'});
+    }
     print $cgi->header();
 
     $template->process('account/email/confirm-new.html.tmpl', $vars)

diff --git a/xmlrpc.cgi b/xmlrpc.cgi
index 5ca40bef09d46b2dc72e553ca29cb860b49f5bed..324382ea282938c57bc64df126222beac6a9e8c2 100755 (executable)
--- a/xmlrpc.cgi
+++ b/xmlrpc.cgi
@@ -53,9 +53,5 @@ my $dispatch = {
 
 my $response = Bugzilla::WebService::XMLRPC::Transport::HTTP::CGI
     ->dispatch_with($dispatch)
-    ->on_action(sub { 
-                    my ($action, $uri, $method) = @_;
-                    Bugzilla::WebService::handle_login($dispatch, @_);
-                    Bugzilla::WebService::handle_redirect(@_);
-                } )
+    ->on_action(sub { Bugzilla::WebService::handle_login($dispatch, @_) } )
     ->handle;