Merge branch 'bug/geo-oauth-routes' into 'master'

Geo: Make sure OAuth routes that we generate for Geo matches with the ones in Rails routes

This will prevent errors in OAuth authentication for Geo.

Fixes #650

See merge request !444

app/models/geo_node.rb

@@ -66,13 +66,11 @@ class GeoNode < ActiveRecord::Base
   end
 
   def oauth_callback_url
-    URI.join(uri, "#{uri.path}/", 'oauth/geo/callback').to_s
+    Gitlab::Routing.url_helpers.oauth_geo_callback_url(url_helper_args)
   end
 
   def oauth_logout_url(state)
-    logout_uri = URI.join(uri, "#{uri.path}/", 'oauth/geo/logout')
-    logout_uri.query = "state=#{state}"
-    logout_uri.to_s
+    Gitlab::Routing.url_helpers.oauth_geo_logout_url(url_helper_args.merge(state: state))
   end
 
   def missing_oauth_application?
@@ -81,6 +79,14 @@ class GeoNode < ActiveRecord::Base
 
   private
 
+  def url_helper_args
+    if relative_url_root
+      relative_url = relative_url_root.starts_with?('/') ? relative_url_root : "/#{relative_url_root}"
+    end
+
+    { protocol: schema, host: host, port: port, script_name: relative_url }
+  end
+
   def refresh_bulk_notify_worker_status
     if Gitlab::Geo.primary?
       Gitlab::Geo.bulk_notify_job.try(:enable!)

config/routes.rb

@@ -53,10 +53,12 @@ Rails.application.routes.draw do
                 authorizations: 'oauth/authorizations'
   end
 
-  namespace :oauth, path: 'geo', controller: 'geo_auth', as: 'oauth_geo' do
-    get 'auth'
-    get 'callback'
-    get 'logout'
+  namespace :oauth do
+    scope path: 'geo', controller: :geo_auth, as: :geo do
+      get 'auth'
+      get 'callback'
+      get 'logout'
+    end
   end
 
   # Autocomplete

spec/lib/gitlab/geo/oauth_session_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Gitlab::Geo::OauthSession do
   subject { described_class.new }
   let(:oauth_app) { FactoryGirl.create(:doorkeeper_application) }
-  let(:oauth_return_to) { 'http://localhost:3000/oath/geo/callback' }
+  let(:oauth_return_to) { 'http://localhost:3000/oauth/geo/callback' }
   let(:dummy_state) { 'salt:hmac:return_to' }
   let(:valid_state) { described_class.new(return_to: oauth_return_to).generate_oauth_state }
   let(:access_token) { FactoryGirl.create(:doorkeeper_access_token).token }

spec/models/geo_node_spec.rb

@@ -8,6 +8,7 @@ describe GeoNode, type: :model do
   subject(:node) { FactoryGirl.create(:geo_node) }
 
   let(:dummy_url) { 'https://localhost:3000/gitlab' }
+  let(:url_helpers) { Gitlab::Application.routes.url_helpers }
 
   context 'associations' do
     it { is_expected.to belong_to(:geo_node_key).dependent(:destroy) }
@@ -186,6 +187,25 @@ describe GeoNode, type: :model do
     it 'returns oauth callback url based on node uri' do
       expect(new_node.oauth_callback_url).to eq(oauth_callback_url)
     end
+
+    it 'returns url that matches rails url_helpers generated one' do
+      route = url_helpers.oauth_geo_callback_url(protocol: 'https:', host: 'localhost', port: 3000, script_name: '/gitlab')
+      expect(new_node.oauth_callback_url).to eq(route)
+    end
+  end
+
+  describe '#oauth_logout_url' do
+    let(:fake_state) { URI.encode('fakestate') }
+    let(:oauth_logout_url) { "https://localhost:3000/gitlab/oauth/geo/logout?state=#{fake_state}" }
+
+    it 'returns oauth logout url based on node uri' do
+      expect(new_node.oauth_logout_url(fake_state)).to eq(oauth_logout_url)
+    end
+
+    it 'returns url that matches rails url_helpers generated one' do
+      route = url_helpers.oauth_geo_logout_url(protocol: 'https:', host: 'localhost', port: 3000, script_name: '/gitlab', state: fake_state)
+      expect(new_node.oauth_logout_url(fake_state)).to eq(route)
+    end
   end
 
   describe '#missing_oauth_application?' do