Просмотр исходного кода

Merge pull request #282 from mrjoel/mrjoel-fixhttpurlperms

fix permission capping for HTTP/HTTPS
tags/v1.7.0
James Moger 9 лет назад
Родитель
Сommit
124fd6e639
1 измененных файлов: 3 добавлений и 2 удалений
  1. 3
    2
      src/main/java/com/gitblit/manager/ServicesManager.java

+ 3
- 2
src/main/java/com/gitblit/manager/ServicesManager.java Просмотреть файл

@@ -166,13 +166,14 @@ public class ServicesManager implements IServicesManager {
settings.getBoolean(Keys.web.showHttpServletUrls, true)) {
AccessPermission permission = user.getRepositoryPermission(repository).permission;
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)) {
// downgrade the repo permission for this transport
// because it is not an acceptable PUSH transport
permission = AccessPermission.CLONE;
}
list.add(new RepositoryUrl(getRepositoryUrl(request, username, repository), permission));
list.add(new RepositoryUrl(repoUrl, permission));
}
}


Загрузка…
Отмена
Сохранить