From 9bc17d16ea48a7978b198126d346828b1d24fe4e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 18 Apr 2011 22:29:20 -0400
Subject: [PATCH] Color-coded change type indicator with tooltip for changed paths.
---
src/com/gitblit/wicket/AuthorizationStrategy.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java
index b73e849..3e7df36 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/com/gitblit/wicket/AuthorizationStrategy.java
@@ -5,6 +5,8 @@
import org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
import org.apache.wicket.authorization.strategies.page.AbstractPageAuthorizationStrategy;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.wicket.pages.RepositoriesPage;
public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy implements IUnauthorizedComponentInstantiationListener {
@@ -15,9 +17,37 @@
@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)) {
+ 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();
+ if (authenticateView && !session.isLoggedIn()) {
+ // authentication required
+ return false;
+ }
+
+ User user = session.getUser();
+ if (pageClass.isAnnotationPresent(AdminPage.class)) {
+ // admin page
+ if (allowAdmin) {
+ if (authenticateAdmin) {
+ // authenticate admin
+ if (user != null) {
+ return user.canAdmin();
+ }
+ return false;
+ } else {
+ // no admin authentication required
+ return true;
+ }
+ } else {
+ //admin prohibited
+ return false;
+ }
+ }
+ }
return true;
}
@@ -30,16 +60,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