From 0256e6aa26ebb51416d290d772897caf84a1cd82 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jan 2012 08:16:40 -0500
Subject: [PATCH] Merge branch 'master' into issues
---
src/com/gitblit/AuthenticationFilter.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/AuthenticationFilter.java b/src/com/gitblit/AuthenticationFilter.java
index 277b220..caa8a07 100644
--- a/src/com/gitblit/AuthenticationFilter.java
+++ b/src/com/gitblit/AuthenticationFilter.java
@@ -171,7 +171,7 @@
super(req);
user = new UserModel("anonymous");
}
-
+
UserModel getUser() {
return user;
}
@@ -190,6 +190,9 @@
if (role.equals(Constants.ADMIN_ROLE)) {
return user.canAdmin;
}
+ // Gitblit does not currently use actual roles in the traditional
+ // servlet container sense. That is the reason this is marked
+ // deprecated, but I may want to revisit this.
return user.canAccessRepository(role);
}
--
Gitblit v1.9.1