Browse Source

Merge pull request #282 from mrjoel/mrjoel-fixhttpurlperms

fix permission capping for HTTP/HTTPS
tags/v1.7.0
James Moger 9 years ago
parent
commit
124fd6e639
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      src/main/java/com/gitblit/manager/ServicesManager.java

+ 3
- 2
src/main/java/com/gitblit/manager/ServicesManager.java View File

settings.getBoolean(Keys.web.showHttpServletUrls, true)) { settings.getBoolean(Keys.web.showHttpServletUrls, true)) {
AccessPermission permission = user.getRepositoryPermission(repository).permission; AccessPermission permission = user.getRepositoryPermission(repository).permission;
if (permission.exceeds(AccessPermission.NONE)) { if (permission.exceeds(AccessPermission.NONE)) {
Transport transport = Transport.fromString(request.getScheme());
String repoUrl = getRepositoryUrl(request, username, repository);
Transport transport = Transport.fromUrl(repoUrl);
if (permission.atLeast(AccessPermission.PUSH) && !acceptsPush(transport)) { if (permission.atLeast(AccessPermission.PUSH) && !acceptsPush(transport)) {
// downgrade the repo permission for this transport // downgrade the repo permission for this transport
// because it is not an acceptable PUSH transport // because it is not an acceptable PUSH transport
permission = AccessPermission.CLONE; permission = AccessPermission.CLONE;
} }
list.add(new RepositoryUrl(getRepositoryUrl(request, username, repository), permission));
list.add(new RepositoryUrl(repoUrl, permission));
} }
} }



Loading…
Cancel
Save