Fix redmine-git-hosting#584

Author: root

app/models/concerns/gitolitable/authorizations.rb

@@ -42,7 +42,7 @@ def urls_are_viewable?
 
 
     def ssh_access_available?
-      User.current.allowed_to_commit?(self) && !git_annex_enabled?
+      git_ssh_enabled? && !git_annex_enabled? && User.current.allowed_to_commit?(self)
     end
 
 
@@ -62,7 +62,7 @@ def git_access_available?
 
 
     def go_access_available?
-      (public_project? || public_repo?) && smart_http_enabled?
+      (public_project? || public_repo?) && smart_http_enabled? && git_go_enabled?
     end
 
 

app/models/concerns/gitolitable/features.rb

@@ -39,28 +39,38 @@ def git_notification_enabled?
     end
 
 
-    def smart_http_enabled?
-      extra[:git_http] != 0
+    def git_ssh_enabled?
+      extra[:git_ssh]
+    end
+
+
+    def git_go_enabled?
+      extra[:git_go]
     end
 
 
     def https_access_enabled?
-      extra[:git_http] == 1 || extra[:git_http] == 2
+      extra[:git_https]
     end
 
 
     def http_access_enabled?
-      extra[:git_http] == 3 || extra[:git_http] == 2
+      extra[:git_http]
+    end
+
+
+    def smart_http_enabled?
+      https_access_enabled? || http_access_enabled?
     end
 
 
     def only_https_access_enabled?
-      extra[:git_http] == 1
+      https_access_enabled? && !http_access_enabled?
     end
 
 
     def only_http_access_enabled?
-      extra[:git_http] == 3
+      http_access_enabled? && !https_access_enabled?
     end
 
 

app/models/repository_git_extra.rb

@@ -7,11 +7,6 @@ class RepositoryGitExtra < ActiveRecord::Base
     [l(:label_https_and_http), '2']
   ]
 
-  DISABLED = 0
-  HTTP     = 3
-  HTTPS    = 1
-  BOTH     = 2
-
   ALLOWED_URLS = %w[ssh http https go git git_annex]
 
   URLS_ICONS = {
@@ -24,15 +19,14 @@ class RepositoryGitExtra < ActiveRecord::Base
   }
 
   ## Attributes
-  attr_accessible :git_http, :git_daemon, :git_notify, :git_annex, :default_branch, :protected_branch,
+  attr_accessible :git_http, :git_https, :git_ssh, :git_go, :git_daemon, :git_notify, :git_annex, :default_branch, :protected_branch,
                   :public_repo, :key, :urls_order, :notification_sender, :notification_prefix
 
   ## Relations
   belongs_to :repository
 
   ## Validations
   validates :repository_id,       presence: true, uniqueness: true
-  validates :git_http,            presence: true, numericality: { only_integer: true }, inclusion: { in: [DISABLED, HTTP, HTTPS, BOTH] }
   validates :default_branch,      presence: true
   validates :key,                 presence: true
   validates :notification_sender, format: { with: RedmineGitHosting::Validators::EMAIL_REGEX, allow_blank: true }
@@ -82,31 +76,27 @@ def check_if_default_branch_changed
     def check_urls_order_consistency
       check_ssh_url
       check_git_http_urls
-      # Add go url only for existing record to avoid chicken/egg issue
-      check_go_url unless new_record?
+      check_go_url
       check_git_url
       check_git_annex_url
     end
 
 
-    # SSH url should always be present in urls_order Array
-    #
     def check_ssh_url
-      add_url('ssh')
+      git_ssh? ? add_url('ssh') : remove_url('ssh')
     end
 
 
     def check_git_http_urls
-      case git_http
-      when HTTP
+      if git_http? && git_https?
         add_url('http')
-        remove_url('https')
-      when HTTPS
         add_url('https')
-        remove_url('http')
-      when BOTH
+      elsif git_http?
         add_url('http')
+        remove_url('https')
+      elsif git_https?
         add_url('https')
+        remove_url('http')
       else
         remove_url('http')
         remove_url('https')
@@ -115,7 +105,7 @@ def check_git_http_urls
 
 
     def check_go_url
-      repository.go_access_available? ? add_url('go') : remove_url('go')
+      git_go? ? add_url('go') : remove_url('go')
     end
 
 

app/use_cases/repositories/create.rb

@@ -28,13 +28,26 @@ def enable_git_annex?
 
       def standard_repository_options
         {
-          git_http:       RedmineGitHosting::Config.gitolite_http_by_default?,
           git_daemon:     RedmineGitHosting::Config.gitolite_daemon_by_default?,
           git_notify:     RedmineGitHosting::Config.gitolite_notify_by_default?,
           git_annex:      false,
           default_branch: 'master',
           key:            RedmineGitHosting::Utils::Crypto.generate_secret(64)
-        }
+        }.merge(smart_http_options)
+      end
+
+
+      def smart_http_options
+        case RedmineGitHosting::Config.gitolite_http_by_default?
+        when '1' # HTTPS only
+          { git_https: true }
+        when '2' # HTTPS and HTTP
+          { git_http: true, git_https: true }
+        when '3' # HTTP only
+          { git_http: true }
+        else
+          {}
+        end
       end
 
 

app/views/repositories/_xitolite_options.html.haml

@@ -30,14 +30,19 @@
 
               %p
                 = label_tag 'repository_git_extra[git_http]', l(:label_enable_smart_http)
-                = f.select :git_http, options_for_select(RepositoryGitExtra::SMART_HTTP_OPTIONS, selected: repository.extra[:git_http].to_s)
+                = f.check_box :git_http
 
               %p
-                = label_tag 'repository_git_extra[default_branch]', l(:label_repository_default_branch)
-                - if !repository.branches.empty?
-                  = f.select :default_branch, repository_branches_list(repository.branches)
-                - else
-                  %span{ class: 'label label-info' }= repository.git_default_branch
+                = label_tag 'repository_git_extra[git_https]', l(:label_enable_smart_https)
+                = f.check_box :git_https
+
+              %p
+                = label_tag 'repository_git_extra[git_go]', l(:label_enable_go_url)
+                = f.check_box :git_go
+
+              %p
+                = label_tag 'repository_git_extra[git_ssh]', l(:label_enable_ssh_url)
+                = f.check_box :git_ssh
 
           .col-md-4
             - unless repository.git_annex_enabled?
@@ -57,6 +62,13 @@
           .col-md-4
 
             - unless repository.git_annex_enabled?
+              %p
+                = label_tag 'repository_git_extra[default_branch]', l(:label_repository_default_branch)
+                - if !repository.branches.empty?
+                  = f.select :default_branch, repository_branches_list(repository.branches)
+                - else
+                  %span{ class: 'label label-info' }= repository.git_default_branch
+
               %p
                 %label= l(:label_mirroring_keys_installed)
                 = image_tag (RedmineGitHosting::Config.mirroring_keys_installed? ? 'true.png' : 'exclamation.png')

config/locales/models/repository_xitolite/fr.yml

@@ -24,7 +24,10 @@ fr:
   label_repository_options: Options du dépôt
   label_enable_git_notify: Activer la liste de diffusion
   label_enable_git_daemon: Activer le daemon Git
-  label_enable_smart_http: Mode Smart HTTP
+  label_enable_smart_http: Activer SmartHTTP
+  label_enable_smart_https: Activer SmartHTTPS
+  label_enable_ssh_url: Afficher l'url SSH
+  label_enable_go_url: Activer l'url Go
   label_enable_protected_branches: Activer les branches protégées
   label_enable_public_repo: Rendre le dépôt public
   label_git_daemon: Daemon Git

db/migrate/20170102234000_split_smart_http.rb

@@ -0,0 +1,51 @@
+class SplitSmartHttp < ActiveRecord::Migration
+
+  def self.up
+    add_column :repository_git_extras, :git_https, :boolean, default: false, after: :git_http
+    add_column :repository_git_extras, :git_ssh,   :boolean, default: true,  after: :git_https
+    add_column :repository_git_extras, :git_go,    :boolean, default: false, after: :git_https
+
+    add_column :repository_git_extras, :git_http_temp, :boolean, default: false, after: :git_http
+
+    RepositoryGitExtra.reset_column_information
+
+    RepositoryGitExtra.all.each do |git_extra|
+      case git_extra[:git_http]
+      when 1 # HTTPS only
+        git_extra.update_column(:git_https, true)
+      when 2 # HTTPS and HTTP
+        git_extra.update_column(:git_https, true)
+        git_extra.update_column(:git_http_temp, true)
+      when # HTTP only
+        git_extra.update_column(:git_http_temp, true)
+      end
+    end
+
+    remove_column :repository_git_extras, :git_http
+    rename_column :repository_git_extras, :git_http_temp, :git_http
+  end
+
+  def self.down
+    add_column :repository_git_extras, :git_http_temp, :integer, after: :git_http
+
+    RepositoryGitExtra.reset_column_information
+
+    RepositoryGitExtra.all.each do |git_extra|
+      if git_extra[:git_https] && git_extra[:git_http]
+        git_extra.update_column(:git_http_temp, 2)
+      elsif git_extra[:git_https]
+        git_extra.update_column(:git_http_temp, 1)
+      elsif git_extra[:git_http]
+        git_extra.update_column(:git_http_temp, 3)
+      end
+    end
+
+    remove_column :repository_git_extras, :git_https
+    remove_column :repository_git_extras, :git_ssh
+    remove_column :repository_git_extras, :git_go
+
+    remove_column :repository_git_extras, :git_http
+    rename_column :repository_git_extras, :git_http_temp, :git_http
+  end
+
+end