WIP - refactored migration and updated project_import_data with encrypted att

app/models/project.rb

@@ -91,7 +91,6 @@ class Project < ActiveRecord::Base
 
   attr_accessor :new_default_branch
   attr_accessor :old_path_with_namespace
-  attr_encrypted :import_credentials, key: Gitlab::Application.secrets.db_key_base
 
   # Relations
   belongs_to :creator, foreign_key: 'creator_id', class_name: 'User'

app/models/project_import_data.rb

@@ -12,6 +12,7 @@ require 'file_size_validator'
 
 class ProjectImportData < ActiveRecord::Base
   belongs_to :project
+  attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base
 
   serialize :data, JSON
 

db/migrate/20160302151724_add_import_credentials_to_projects.rb → db/migrate/20160302151724_add_import_credentials_to_project_import_data.rb

-class AddImportCredentialsToProjects < ActiveRecord::Migration
+class AddImportCredentialsToProjectImportData < ActiveRecord::Migration
   def change
-    add_column :projects, :encrypted_import_credentials, :text
-    add_column :projects, :encrypted_import_credentials_iv, :text
+    add_column :project_import_data, :encrypted_credentials, :text
+    add_column :project_import_data, :encrypted_credentials_iv, :text
   end
 end

db/migrate/20160302152808_remove_wrong_import_url_from_projects.rb

 class RemoveWrongImportUrlFromProjects < ActiveRecord::Migration
-  def up
-    projects_with_wrong_import_url.each do |project|
-      project.update_columns(import_url: nil) # TODO Check really nil?
-      # TODO: migrate current credentials to import_credentials?
-      # TODO: Notify user ?
+
+  class ImportUrlSanitizer
+    def initialize(url)
+      @url = url
     end
+
+    def sanitized_url
+      @sanitized_url ||= @url[regex_extractor, 1] + @url[regex_extractor, 3]
+    end
+
+    def credentials
+      @credentials ||= @url[regex_extractor, 2]
     end
 
     private
 
+    # Regex matches 1 <first part of URL>, 2 <token or to be encrypted stuff>,
+    # 3 <last part of URL>
+    def regex_extractor
+      /(.*\/\/)(.*)(\@.*)/
+    end
+  end
+
+  def up
+    projects_with_wrong_import_url.each do |project|
+      sanitizer = ImportUrlSanitizer.new(project.import_urls)
+      project.update_columns(import_url: sanitizer.sanitized_url)
+      if project.import_data
+        project.import_data.update_columns(credentials: sanitizer.credentials)
+      end
+    end
+  end
 
-  def projects_with_dot_atom
+  def projects_with_wrong_import_url
     # TODO Check live with #operations for possible false positives. Also, consider regex? But may have issues MySQL/PSQL
     select_all("SELECT p.id from projects p WHERE p.import_url LIKE '%//%:%@%' or p.import_url like '#{"_"*40}@github.com%'")
   end