From 85f639aa3eee0b4e02eba20e6a5197b684941544 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Tue, 14 Aug 2012 09:07:42 +0200 Subject: Allows integration of GitBlit as plug-in in other projects. There are now three new targets on the ANT build: - buildJAR: creates a GitBlit JAR including the GitBlit biz logic - installMaven: install GitBlit JAR as Maven module - uploadMaven: uploads GitBlit JAR to a Maven repository Additional extensions have been made to allow: a) GitBlit to load his resources outside of Wicket domain b) GitBlit to use an injected UserService c) Generic authentication of HTTP Request using 3rd party logic d) Load settings programmatically from an InputStream e) Use cookie authentication OR generic HTTP Request authentication for Wicket pages f) UserModel with branch-level security logic --- src/com/gitblit/models/UserModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/com/gitblit/models') diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java index 8b3fe826..f14c1ae8 100644 --- a/src/com/gitblit/models/UserModel.java +++ b/src/com/gitblit/models/UserModel.java @@ -217,7 +217,7 @@ public class UserModel implements Principal, Serializable, Comparable return permission; } - private boolean canAccess(RepositoryModel repository, AccessRestrictionType ifRestriction, AccessPermission requirePermission) { + protected boolean canAccess(RepositoryModel repository, AccessRestrictionType ifRestriction, AccessPermission requirePermission) { if (repository.accessRestriction.atLeast(ifRestriction)) { AccessPermission permission = getRepositoryPermission(repository); return permission.atLeast(requirePermission); @@ -433,4 +433,9 @@ public class UserModel implements Principal, Serializable, Comparable } return nameVerified && emailVerified; } + + public boolean hasBranchPermission(String repositoryName, String branch) { + // Default UserModel doesn't implement branch-level security. Other Realms (i.e. Gerrit) may override this method. + return hasRepositoryPermission(repositoryName); + } } -- cgit v1.2.3