[MMBASE CVS] src/org/mmbase/module/tools MMAdmin.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/module/tools
In directory james.mmbase.org:/tmp/cvs-serv18797

Modified Files:
        MMAdmin.java 
Log Message:
  MMB-1729


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/tools
See also: http://www.mmbase.org/jira/browse/MMB-1729


Index: MMAdmin.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/tools/MMAdmin.java,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- MMAdmin.java        3 Sep 2008 23:18:01 -0000       1.165
+++ MMAdmin.java        1 Oct 2008 19:57:12 -0000       1.166
@@ -41,7 +41,7 @@
  * @application Admin, Application
  * @author Daniel Ockeloen
  * @author Pierre van Rooden
- * @version $Id: MMAdmin.java,v 1.165 2008/09/03 23:18:01 michiel Exp $
+ * @version $Id: MMAdmin.java,v 1.166 2008/10/01 19:57:12 michiel Exp $
  */
 public class MMAdmin extends ProcessorModule {
     private static final Logger log = Logging.getLoggerInstance(MMAdmin.class);
@@ -128,7 +128,7 @@
     /**
      * @javadoc
      */
-    public void init() {
+    @Override public void init() {
         String dtmp = System.getProperty("mmbase.kiosk");
         if (dtmp != null && dtmp.equals("yes")) {
             kioskmode = true;
@@ -158,7 +158,7 @@
      * @param command the LIST command for which to retrieve the builder
      * @param params contains the attributes for the list
      */
-    public MMObjectBuilder getListBuilder(String command, Map<String,Object> 
params) {
+    @Override public MMObjectBuilder getListBuilder(String command, 
Map<String, ?> params) {
         return new VirtualBuilder(mmb);
     }
 
@@ -263,6 +263,7 @@
         // check if the we are using jsp, and logged on as user with rank is 
admin, this means that
         // there is some user with rank Administrator in the session...
 
+        if (sp.req != null) {
         HttpSession session = sp.req.getSession(false);
         Enumeration e = session.getAttributeNames();
         while (e.hasMoreElements()) {
@@ -278,15 +279,20 @@
                 }
             }
         }
-
-        return false;
+        }
+        log.warn("No cloud specified, using class security");
+        Map<String, Object> loginInfo = new HashMap<String, Object>();
+        loginInfo.put("rank", "administrator");
+        Cloud cloud = 
ContextProvider.getDefaultCloudContext().getCloud("mmbase", "class", loginInfo);
+        log.warn("Found " + cloud);
+        return cloud.getUser().getRank().getInt() >= Rank.ADMIN.getInt();
     }
 
     /**
      * Execute the commands provided in the form values
      * @javadoc
      */
-    public boolean process(PageInfo sp, Hashtable<String,Object> cmds, 
Hashtable<String,Object> vars) {
+    @Override public boolean process(PageInfo sp, Hashtable<String,Object> 
cmds, Hashtable<String,Object> vars) {
         String cmdline, token;
         for (Enumeration<String> h = cmds.keys(); h.hasMoreElements();) {
             cmdline = h.nextElement();
@@ -416,7 +422,7 @@
      * Handle a $MOD command
      * @javadoc
      */
-    public String replace(PageInfo sp, String cmds) {
+    @Override public String replace(PageInfo sp, String cmds) {
         if (!checkUserLoggedOn(sp, cmds, false)) return "";
         StringTokenizer tok = new StringTokenizer(cmds, "-\n\r");
         if (tok.hasMoreTokens()) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs