Merge pull request #5458 from dodona-edu/fix/replace-http-urls

Convert github https clone urls to ssh clone urls

app/models/concerns/gitable.rb

@@ -1,8 +1,15 @@
 require 'open3'
 module Gitable
   extend ActiveSupport::Concern
+  # regex to detect github or gitlab https remotes
+  # group 1: protocol
+  # group 2: domain
+  # group 6: user + repo
+  HTTPS_GITHUB_REMOTE_REGEX = %r{^(https?://)(([^/]+\.)?(github|gitlab)([^/]*))/([^.]*)(\.git)?$}
 
   included do
+    before_create :fix_remote
+
     enum clone_status: { queued: 1, running: 2, complete: 3, failed: 4 }, _prefix: :clone
   end
 
@@ -60,4 +67,10 @@ def repo_is_accessible
   def github_remote?
     remote =~ %r{^(git@)|(https://)(github|gitlab)}
   end
+
+  def fix_remote
+    return unless remote =~ HTTPS_GITHUB_REMOTE_REGEX
+
+    self.remote = remote.gsub(HTTPS_GITHUB_REMOTE_REGEX, 'git@\2:\6.git')
+  end
 end

test/models/repository_test.rb

@@ -460,4 +460,36 @@ def teardown
 
     assert_not_includes Repository.featured, @repository
   end
+
+  test 'https remote should be converted to ssh' do
+    repository = create :repository, :git_stubbed, remote: 'https://github.com/dodona-edu/dodona.git'
+
+    assert_equal 'git@github.com:dodona-edu/dodona.git', repository.remote
+
+    repository = create :repository, :git_stubbed, remote: 'https://gitlab.com/dodona-edu/dodona.git'
+
+    assert_equal 'git@gitlab.com:dodona-edu/dodona.git', repository.remote
+
+    repository = create :repository, :git_stubbed, remote: 'http://github.ugent.be/dodona-edu/dodona'
+
+    assert_equal 'git@github.ugent.be:dodona-edu/dodona.git', repository.remote
+
+    repository = create :repository, :git_stubbed, remote: 'http://foo.gitlab.bar/bazz.git'
+
+    assert_equal 'git@foo.gitlab.bar:bazz.git', repository.remote
+  end
+
+  test 'non github/gitlab remote should not be converted to ssh' do
+    repository = create :repository, :git_stubbed, remote: 'https://foo.bar/bazz'
+
+    assert_equal 'https://foo.bar/bazz', repository.remote
+
+    repository = create :repository, :git_stubbed, remote: 'git@foo.bar/bazz.git'
+
+    assert_equal 'git@foo.bar/bazz.git', repository.remote
+
+    repository = create :repository, :git_stubbed, remote: 'git@github.ugent.be:dodona-edu/dodona.git'
+
+    assert_equal 'git@github.ugent.be:dodona-edu/dodona.git', repository.remote
+  end
 end