Fix incorrect displayed SSH transport permission

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index a15bed893fb5645fc2eb955a2ad004ce7215bf45..817d18cbeb48e8b0b44b1a006c7d4b59b2caf1a9 100644 (file)
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -133,7 +133,7 @@ public class GitBlit extends GitblitManager {
                // ssh daemon url
                String sshDaemonUrl = servicesManager.getSshDaemonUrl(request, user, repository);
                if (!StringUtils.isEmpty(sshDaemonUrl)) {
-                       AccessPermission permission = servicesManager.getSshDaemonAccessPermission(user, repository);
+                       AccessPermission permission = user.getRepositoryPermission(repository).permission;
                        if (permission.exceeds(AccessPermission.NONE)) {
                                list.add(new RepositoryUrl(sshDaemonUrl, permission));
                        }

diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java
index 1f4940557aec5a8fbda50de6e02fb1ae19c568f1..17724f2b9a01a83b192af2746cfc0cab233578ff 100644 (file)
--- a/src/main/java/com/gitblit/manager/ServicesManager.java
+++ b/src/main/java/com/gitblit/manager/ServicesManager.java
@@ -244,29 +244,11 @@ public class ServicesManager implements IManager {
                return null;
        }
 
-       public AccessPermission getSshDaemonAccessPermission(UserModel user, RepositoryModel repository) {
-               if (sshDaemon != null && user.canClone(repository)) {
-                       AccessPermission sshDaemonPermission = user.getRepositoryPermission(repository).permission;
-                       if (sshDaemonPermission.atLeast(AccessPermission.CLONE)) {
-                               if (repository.accessRestriction.atLeast(AccessRestrictionType.CLONE)) {
-                                       // can not authenticate clone via anonymous ssh protocol
-                                       sshDaemonPermission = AccessPermission.NONE;
-                               } else if (repository.accessRestriction.atLeast(AccessRestrictionType.PUSH)) {
-                                       // can not authenticate push via anonymous ssh protocol
-                                       sshDaemonPermission = AccessPermission.CLONE;
-                               } else {
-                                       // normal user permission
-                               }
-                       }
-                       return sshDaemonPermission;
-               }
-               return AccessPermission.NONE;
-       }
-       
+
        /**
         * Extract the hostname from the canonical url or return the
         * hostname from the servlet request.
-        * 
+        *
         * @param request
         * @return
         */