Merge branch 'issue-12919' of https://0xacab.org/sutty/sutty into 17.3.alpine.panel.sutty.nl

Gemfile

@@ -73,6 +73,7 @@ gem 'redis-rails'
 gem 'rollups', git: 'https://github.com/fauno/rollup.git', branch: 'update'
 gem 'rubyzip'
 gem 'rugged'
+gem 'git_clone_url'
 gem 'concurrent-ruby-ext'
 gem 'que'
 gem 'symbol-fstring', require: 'fstring/all'

Gemfile.lock

@@ -211,6 +211,8 @@ GEM
       activerecord (>= 4.0.0)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
+    git_clone_url (2.0.0)
+      uri-ssh_git (>= 2.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
     groupdate (6.2.1)
@@ -541,6 +543,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2-x86_64-linux-musl)
     unicode-display_width (1.8.0)
+    uri-ssh_git (2.0.0)
     validates_hostname (1.0.13)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
@@ -593,6 +596,7 @@ DEPENDENCIES
   fast_jsonparser (~> 0.5.0)
   flamegraph
   friendly_id
+  git_clone_url
   hairtrigger
   haml-lint
   hamlit-rails

app/models/site/repository.rb

@@ -177,7 +177,21 @@ class Site
     def credentials
       return unless File.exist? private_key
 
-      @credentials ||= Rugged::Credentials::SshKey.new username: 'git', publickey: public_key, privatekey: private_key
+      @credentials ||=
+        begin
+          username = parse_url(origin.url)&.user || 'git'
+
+          Rugged::Credentials::SshKey.new username: username, publickey: public_key, privatekey: private_key
+        end
+    end
+
+    # @param :url [String]
+    # @return [URI, nil]
+    def parse_url(url)
+      GitCloneUrl.parse(url)
+    rescue URI::Error => e
+      ExceptionNotifier.notify_exception(e, data: { site: site.name, url: url })
+      nil
     end
 
     # @return [String]