9 files changed, 44 insertions, 15 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index eb3be08df56..7940b5cb3f4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   helper_method :abilities, :can?, :current_application_settings
+  helper_method :github_import_enabled?, :gitlab_import_enabled?, :bitbucket_import_enabled?
 
   rescue_from Encoding::CompatibilityError do |exception|
     log_exception(exception)
@@ -313,4 +314,16 @@ class ApplicationController < ActionController::Base
     set_filter_values(merge_requests)
     merge_requests
   end
+
+  def github_import_enabled?
+    OauthHelper.enabled_oauth_providers.include?(:github)
+  end
+
+  def gitlab_import_enabled?
+    OauthHelper.enabled_oauth_providers.include?(:gitlab)
+  end
+
+  def bitbucket_import_enabled?
+    OauthHelper.enabled_oauth_providers.include?(:bitbucket) && Gitlab::BitbucketImport.public_key.present?
+  end
 end
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index 27e91f49f2b..89de5c5205f 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -1,4 +1,5 @@
 class Import::BitbucketController < Import::BaseController
+  before_filter :verify_bitbucket_import_enabled
   before_filter :bitbucket_auth, except: :callback
 
   # rescue_from OAuth::Error, with: :bitbucket_unauthorized
@@ -55,6 +56,10 @@ class Import::BitbucketController < Import::BaseController
     @client ||= Gitlab::BitbucketImport::Client.new(current_user.bitbucket_access_token, current_user.bitbucket_access_token_secret)
   end
 
+  def verify_bitbucket_import_enabled
+    not_found! unless bitbucket_import_enabled?
+  end
+
   def bitbucket_auth
     if current_user.bitbucket_access_token.blank?
       go_to_bitbucket_for_permissions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index c869c7c86f3..dc7668ee6fd 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -1,4 +1,5 @@
 class Import::GithubController < Import::BaseController
+  before_filter :verify_github_import_enabled
   before_filter :github_auth, except: :callback
 
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
@@ -44,6 +45,10 @@ class Import::GithubController < Import::BaseController
     @client ||= Gitlab::GithubImport::Client.new(current_user.github_access_token)
   end
 
+  def verify_github_import_enabled
+    not_found! unless github_import_enabled?
+  end
+
   def github_auth
     if current_user.github_access_token.blank?
       go_to_github_for_permissions
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index a51ea36aff8..74f992b4699 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -1,4 +1,5 @@
 class Import::GitlabController < Import::BaseController
+  before_filter :verify_gitlab_import_enabled
   before_filter :gitlab_auth, except: :callback
 
   rescue_from OAuth2::Error, with: :gitlab_unauthorized
@@ -41,6 +42,10 @@ class Import::GitlabController < Import::BaseController
     @client ||= Gitlab::GitlabImport::Client.new(current_user.gitlab_access_token)
   end
 
+  def verify_gitlab_import_enabled
+    not_found! unless gitlab_import_enabled?
+  end
+
   def gitlab_auth
     if current_user.gitlab_access_token.blank?
       go_to_gitlab_for_permissions
diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb
index 848d74c18c3..1a0ad17b607 100644
--- a/app/helpers/oauth_helper.rb
+++ b/app/helpers/oauth_helper.rb
@@ -20,4 +20,6 @@ module OauthHelper
   def additional_providers
     enabled_oauth_providers.reject{|provider| provider.to_s.starts_with?('ldap')}
   end
+  
+  extend self
 end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 8a48a9d3946..c85ad12634d 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -265,16 +265,4 @@ module ProjectsHelper
       "success"
     end
   end
-
-  def github_import_enabled?
-    enabled_oauth_providers.include?(:github)
-  end
-
-  def gitlab_import_enabled?
-    enabled_oauth_providers.include?(:gitlab)
-  end
-
-  def bitbucket_import_enabled?
-    enabled_oauth_providers.include?(:bitbucket)
-  end
 end
diff --git a/config/initializers/public_key.rb b/config/initializers/public_key.rb
new file mode 100644
index 00000000000..d27e6519d1c
--- /dev/null
+++ b/config/initializers/public_key.rb
@@ -0,0 +1,2 @@
+path = File.expand_path("~/.ssh/id_rsa.pub")
+Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path)
+\ No newline at end of file
diff --git a/lib/gitlab/bitbucket_import.rb b/lib/gitlab/bitbucket_import.rb
new file mode 100644
index 00000000000..0e53972ac50
--- /dev/null
+++ b/lib/gitlab/bitbucket_import.rb
@@ -0,0 +1,6 @@
+module Gitlab
+  module BitbucketImport
+    mattr_accessor :public_key
+    @public_key = nil
+  end
+end
+\ No newline at end of file
diff --git a/lib/gitlab/bitbucket_import/key_adder.rb b/lib/gitlab/bitbucket_import/key_adder.rb
index 207811237ba..7d0b5fbc8ae 100644
--- a/lib/gitlab/bitbucket_import/key_adder.rb
+++ b/lib/gitlab/bitbucket_import/key_adder.rb
@@ -9,13 +9,16 @@ module Gitlab
       end
 
       def execute
+        return false unless BitbucketImport.public_key.present?
+        
         project_identifier = "#{repo["owner"]}/#{repo["slug"]}"
         return true if client.deploy_key(project_identifier)
-
-        # TODO: Point to actual public key.
-        client.add_deploy_key(project_identifier, File.read("/Users/douwemaan/.ssh/id_rsa.pub"))
+        
+        client.add_deploy_key(project_identifier, BitbucketImport.public_key)
 
         true
+      rescue
+        false
       end
     end
   end