From 87cc1ed60735a419a3ea23f20614fc0a3f9bab60 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 15 Apr 2011 17:18:51 -0400
Subject: [PATCH] Settings overhaul. Fixes to authentication. Bind interface feature.
---
src/com/gitblit/wicket/AuthorizationStrategy.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java
index b73e849..0a9d652 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/com/gitblit/wicket/AuthorizationStrategy.java
@@ -15,9 +15,15 @@
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
protected boolean isPageAuthorized(Class pageClass) {
- if (BasePage.class.isAssignableFrom(pageClass))
- return isAuthorized(pageClass);
- // Return contruction by default
+ if (BasePage.class.isAssignableFrom(pageClass)) {
+ GitBlitWebSession session = GitBlitWebSession.get();
+ if (!session.isLoggedIn())
+ return false;
+ User user = session.getUser();
+ if (pageClass.isAnnotationPresent(AdminPage.class)) {
+ return user.canAdmin();
+ }
+ }
return true;
}
@@ -30,16 +36,5 @@
else
throw new RestartResponseAtInterceptPageException(RepositoriesPage.class);
}
- }
-
- protected boolean isAuthorized(Class<? extends BasePage> pageClass) {
- GitBlitWebSession session = GitBlitWebSession.get();
- if (!session.isLoggedIn())
- return false;
- User user = session.getUser();
- if (pageClass.isAnnotationPresent(AdminPage.class)) {
-
- }
- return true;
}
}
--
Gitblit v1.9.1