UPD: Restrict admin pages by "suuporter" group

diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java b/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java
index 5662fa1d261d7749cff5d462329c6859e5781719..b6921ad32d8d771281e9746ff144de832add7b32 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java
@@ -1,5 +1,7 @@
 package org.cacert.gigi.pages.admin.support;
 
+import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.pages.OneFormPage;
 
@@ -15,4 +17,12 @@ public class FindDomainPage extends OneFormPage {
     public String getSuccessPath(Form f) {
         return SupportUserDetailsPage.PATH + ((FindDomainForm) f).getUserId();
     }
+
+    @Override
+    public boolean isPermitted(User u) {
+        if (u == null) {
+            return false;
+        }
+        return u.isInGroup(Group.getByString("supporter"));
+    }
 }

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java b/src/org/cacert/gigi/pages/admin/support/FindUserPage.java
index 65d164d4dadb377e305e274cb74cde4bdc34c00e..40d28cd55f44f42149890137dd16db13517af770 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserPage.java
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.GigiApiException;
+import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
@@ -63,4 +64,12 @@ public class FindUserPage extends Page {
         }
     }
 
+    @Override
+    public boolean isPermitted(User u) {
+        if (u == null) {
+            return false;
+        }
+        return u.isInGroup(Group.getByString("supporter"));
+    }
+
 }

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
index 46b4aca292f0455631a29bf0d4320efc212b7997..b9368e42edbb44872729afdb2b002ffe465a4a1b 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.java
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.EmailAddress;
+import org.cacert.gigi.dbObjects.Group;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.DateSelector;
@@ -93,4 +94,12 @@ public class SupportUserDetailsPage extends Page {
         });
         getDefaultTemplate().output(resp.getWriter(), getLanguage(req), vars);
     }
+
+    @Override
+    public boolean isPermitted(User u) {
+        if (u == null) {
+            return false;
+        }
+        return u.isInGroup(Group.getByString("supporter"));
+    }
 }