From: dklawren <dklawren@users.noreply.github.com>
Date: Mon, 19 Aug 2019 18:28:33 +0000 (-0400)
Subject: Bug 1574792 - Bugzilla has suffered an internal error:  Bugzilla cannot log you into... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=431709c2684e24339b39895b77f3b0b87359c0e9;p=thirdparty%2Fbugzilla.git

Bug 1574792 - Bugzilla has suffered an internal error:  Bugzilla cannot log you into an external site via GitHub
---

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index e4245a862..dc279be46 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -123,21 +123,6 @@ sub new {
   return $self;
 }
 
-sub target_uri {
-  my ($self) = @_;
-
-  my $base = Bugzilla->localconfig->urlbase;
-  if (my $request_uri = $self->request_uri) {
-    my $base_uri = URI->new($base);
-    $base_uri->path('');
-    $base_uri->query(undef);
-    return $base_uri . $request_uri;
-  }
-  else {
-    return $base . ($self->url(-relative => 1, -query => 1) || 'index.cgi');
-  }
-}
-
 # We want this sorted plus the ability to exclude certain params
 sub canonicalize_query {
   my ($self, @exclude) = @_;
diff --git a/extensions/GitHubAuth/lib/Client.pm b/extensions/GitHubAuth/lib/Client.pm
index bc429f379..a084b1444 100644
--- a/extensions/GitHubAuth/lib/Client.pm
+++ b/extensions/GitHubAuth/lib/Client.pm
@@ -37,14 +37,6 @@ sub new {
   return $self;
 }
 
-sub login_uri {
-  my ($class, $target_uri) = @_;
-
-  my $uri = URI->new(Bugzilla->localconfig->urlbase . "github.cgi");
-  $uri->query_form(target_uri => $target_uri);
-  return $uri;
-}
-
 sub authorize_uri {
   my ($class, $state) = @_;
 
diff --git a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
index f5e5ab11b..8795d7a4a 100644
--- a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
+++ b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-additional_methods.html.tmpl
@@ -9,7 +9,7 @@
 [% IF Param('user_info_class').split(',').contains('GitHubAuth') %]
   <form method="post" action="[% basepath FILTER html %]github.cgi">
     <input type="hidden" name="github_secret" value="[% Bugzilla.github_secret FILTER html %]">
-    <input type="hidden" name="target_uri" value="[% Bugzilla.cgi.target_uri FILTER html %]">
+    <input type="hidden" name="target_uri" value="[% urlbase FILTER html %]index.cgi">
     <input type="image" src="[% basepath FILTER none %]extensions/GitHubAuth/web/images/github_sign_in.png"
            alt="Sign in with GitHub"
            title="Sign in with GitHub"
diff --git a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
index ba6991175..fb1d6866b 100644
--- a/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
+++ b/extensions/GitHubAuth/template/en/default/hook/account/auth/login-small-additional_methods.html.tmpl
@@ -11,7 +11,7 @@
   <span id="github_mini_login[% qs_suffix FILTER html %]" class="mini_login[% qs_suffix FILTER html %]">
     <form method="post" action="[% basepath FILTER html %]github.cgi">
       <input type="hidden" name="github_secret" value="[% Bugzilla.github_secret FILTER html %]">
-      <input type="hidden" name="target_uri" value="[% Bugzilla.cgi.target_uri FILTER html %]">
+      <input type="hidden" name="target_uri" value="[% urlbase FILTER html %]index.cgi">
       <input type="image" src="[% basepath FILTER none %]extensions/GitHubAuth/web/images/sign_in.png" height="22" width="75" align="absmiddle"
              alt="Sign in with GitHub"
              title="Sign in with GitHub"> or