diff options
| author | James Moger <james.moger@gitblit.com> | 2012-10-19 22:45:30 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-10-19 22:45:30 -0400 |
| commit | 6d23cab9f5387ca2b57f60b26936ff8af0acc8fa (patch) | |
| tree | 0007074a26fb6b70a710ea04779092d6e31bbb3a /src | |
| parent | 85f639aa3eee0b4e02eba20e6a5197b684941544 (diff) | |
| download | gitblit-6d23cab9f5387ca2b57f60b26936ff8af0acc8fa.tar.gz gitblit-6d23cab9f5387ca2b57f60b26936ff8af0acc8fa.zip | |
Added UserModel null check
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/gitblit/wicket/pages/RepositoryPage.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index fd2cbccc..bacf233d 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -95,10 +95,12 @@ public abstract class RepositoryPage extends BasePage { if (objectId != null) {
RefModel branch = null;
if ((branch = JGitUtils.getBranch(getRepository(), objectId)) != null) {
- boolean canAccess = GitBlitWebSession
- .get()
- .getUser()
- .hasBranchPermission(getRepositoryModel().name,
+ UserModel user = GitBlitWebSession.get().getUser();
+ if (user == null) {
+ // workaround until get().getUser() is reviewed throughout the app
+ user = UserModel.ANONYMOUS;
+ }
+ boolean canAccess = user.hasBranchPermission(repositoryName,
branch.reference.getName());
if (!canAccess) {
error("Access denied", true);
|