From 2a7306a1d92522569a8bb6e5a7c0bcdd5cf4cfaa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:11:38 -0400
Subject: [PATCH] Findbugs. CodePro Audit. Checkstyle. Unit test refactoring.
---
src/com/gitblit/wicket/AuthorizationStrategy.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java
index 892153e..42d2522 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/com/gitblit/wicket/AuthorizationStrategy.java
@@ -25,7 +25,8 @@
import com.gitblit.wicket.models.UserModel;
import com.gitblit.wicket.pages.RepositoriesPage;
-public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy implements IUnauthorizedComponentInstantiationListener {
+public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy implements
+ IUnauthorizedComponentInstantiationListener {
public AuthorizationStrategy() {
}
@@ -34,16 +35,16 @@
@Override
protected boolean isPageAuthorized(Class pageClass) {
if (BasePage.class.isAssignableFrom(pageClass)) {
- boolean authenticateView = GitBlit.self().settings().getBoolean(Keys.web.authenticateViewPages, true);
- boolean authenticateAdmin = GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true);
- boolean allowAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, true);
-
- GitBlitWebSession session = GitBlitWebSession.get();
+ boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true);
+ boolean authenticateAdmin = GitBlit.getBoolean(Keys.web.authenticateAdminPages, true);
+ boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, true);
+
+ GitBlitWebSession session = GitBlitWebSession.get();
if (authenticateView && !session.isLoggedIn()) {
// authentication required
return false;
}
-
+
UserModel user = session.getUser();
if (pageClass.isAnnotationPresent(AdminPage.class)) {
// admin page
@@ -51,7 +52,7 @@
if (authenticateAdmin) {
// authenticate admin
if (user != null) {
- return user.canAdmin();
+ return user.canAdmin;
}
return false;
} else {
@@ -59,7 +60,7 @@
return true;
}
} else {
- //admin prohibited
+ // admin prohibited
return false;
}
}
@@ -71,10 +72,11 @@
public void onUnauthorizedInstantiation(Component component) {
if (component instanceof BasePage) {
GitBlitWebSession session = GitBlitWebSession.get();
- if (!session.isLoggedIn())
+ if (!session.isLoggedIn()) {
throw new RestartResponseAtInterceptPageException(LoginPage.class);
- else
+ } else {
throw new RestartResponseAtInterceptPageException(RepositoriesPage.class);
+ }
}
}
}
--
Gitblit v1.9.1