88f2e9615c
To prevent an OAuth2 covert redirect vulnerability, this commit adds and uses an alias for the GitHub and BitBucket OAuth2 callback URLs to the following paths: GitHub: /users/auth/-/import/github Bitbucket: /users/auth/-/import/bitbucket This allows admins to put a more restrictive callback URL in the OAuth2 configuration settings. Instead of https://example.com, admins can now use: https://example.com/users/auth It's possible but not trivial to change Devise and OmniAuth to use a different prefix for callback URLs instead of /users/auth. For now, aliasing the import URLs under the /users/auth namespace should suffice. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56663
107 lines
3.4 KiB
Ruby
107 lines
3.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Import::BitbucketController < Import::BaseController
|
|
before_action :verify_bitbucket_import_enabled
|
|
before_action :bitbucket_auth, except: :callback
|
|
|
|
rescue_from OAuth2::Error, with: :bitbucket_unauthorized
|
|
rescue_from Bitbucket::Error::Unauthorized, with: :bitbucket_unauthorized
|
|
|
|
def callback
|
|
response = client.auth_code.get_token(params[:code], redirect_uri: users_import_bitbucket_callback_url)
|
|
|
|
session[:bitbucket_token] = response.token
|
|
session[:bitbucket_expires_at] = response.expires_at
|
|
session[:bitbucket_expires_in] = response.expires_in
|
|
session[:bitbucket_refresh_token] = response.refresh_token
|
|
|
|
redirect_to status_import_bitbucket_url
|
|
end
|
|
|
|
# rubocop: disable CodeReuse/ActiveRecord
|
|
def status
|
|
bitbucket_client = Bitbucket::Client.new(credentials)
|
|
repos = bitbucket_client.repos
|
|
|
|
@repos, @incompatible_repos = repos.partition { |repo| repo.valid? }
|
|
|
|
@already_added_projects = find_already_added_projects('bitbucket')
|
|
already_added_projects_names = @already_added_projects.pluck(:import_source)
|
|
|
|
@repos.to_a.reject! { |repo| already_added_projects_names.include?(repo.full_name) }
|
|
end
|
|
# rubocop: enable CodeReuse/ActiveRecord
|
|
|
|
def jobs
|
|
render json: find_jobs('bitbucket')
|
|
end
|
|
|
|
def create
|
|
bitbucket_client = Bitbucket::Client.new(credentials)
|
|
|
|
repo_id = params[:repo_id].to_s
|
|
name = repo_id.gsub('___', '/')
|
|
repo = bitbucket_client.repo(name)
|
|
project_name = params[:new_name].presence || repo.name
|
|
|
|
repo_owner = repo.owner
|
|
repo_owner = current_user.username if repo_owner == bitbucket_client.user.username
|
|
namespace_path = params[:new_namespace].presence || repo_owner
|
|
target_namespace = find_or_create_namespace(namespace_path, current_user)
|
|
|
|
if current_user.can?(:create_projects, target_namespace)
|
|
# The token in a session can be expired, we need to get most recent one because
|
|
# Bitbucket::Connection class refreshes it.
|
|
session[:bitbucket_token] = bitbucket_client.connection.token
|
|
|
|
project = Gitlab::BitbucketImport::ProjectCreator.new(repo, project_name, target_namespace, current_user, credentials).execute
|
|
|
|
if project.persisted?
|
|
render json: ProjectSerializer.new.represent(project)
|
|
else
|
|
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
|
|
end
|
|
else
|
|
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def client
|
|
@client ||= OAuth2::Client.new(provider.app_id, provider.app_secret, options)
|
|
end
|
|
|
|
def provider
|
|
Gitlab::Auth::OAuth::Provider.config_for('bitbucket')
|
|
end
|
|
|
|
def options
|
|
OmniAuth::Strategies::Bitbucket.default_options[:client_options].deep_symbolize_keys
|
|
end
|
|
|
|
def verify_bitbucket_import_enabled
|
|
render_404 unless bitbucket_import_enabled?
|
|
end
|
|
|
|
def bitbucket_auth
|
|
go_to_bitbucket_for_permissions if session[:bitbucket_token].blank?
|
|
end
|
|
|
|
def go_to_bitbucket_for_permissions
|
|
redirect_to client.auth_code.authorize_url(redirect_uri: users_import_bitbucket_callback_url)
|
|
end
|
|
|
|
def bitbucket_unauthorized
|
|
go_to_bitbucket_for_permissions
|
|
end
|
|
|
|
def credentials
|
|
{
|
|
token: session[:bitbucket_token],
|
|
expires_at: session[:bitbucket_expires_at],
|
|
expires_in: session[:bitbucket_expires_in],
|
|
refresh_token: session[:bitbucket_refresh_token]
|
|
}
|
|
end
|
|
end
|