[Bedework-commit] calendarapi r649 - trunk/calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2008-06-11 11:10:25 -0400 (Wed, 11 Jun 2008)
New Revision: 649

Modified:
   trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
Log:
Fix a CalDAV test

Add the bw script to the repository and link to it from the quickstart

Fixes so that using the list of superusers works correctly. The list now appears in the admin interface and can be updated.



Modified: trunk/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2008-06-04 15:00:53 UTC (rev 648)
+++ trunk/calsvc/src/org/bedework/calsvc/CalSvc.java	2008-06-11 15:10:25 UTC (rev 649)
@@ -137,6 +137,11 @@
    */
   private BwUser currentUser;
 
+  /* The account we logged in as - for user access equals currentUser, for admin
+   * access currentUser is the group we are managing.
+   */
+  private BwUser currentAuthUser;
+
   /* If we're doing admin this is the authorised user entry
    */
   BwAuthUser adminUser;
@@ -348,8 +353,9 @@
                                       true, PrivilegeDefs.privRead);
         }
 
-        if (pars.getPublicAdmin() || pars.getAllowSuperUser()) {
-          setSuperUser(getSysparsHandler().isRootUser(getUser()));
+        if ((pars.getPublicAdmin() || pars.getAllowSuperUser()) &&
+            (pars.getAuthUser() != null)) {
+          setSuperUser(getSysparsHandler().isRootUser(currentAuthUser));
         }
       } catch (CalFacadeException cfe) {
         cfe.printStackTrace();
@@ -997,6 +1003,7 @@
           }
 
           currentUser.setUnauthenticated(true);
+          currentAuthUser = currentUser;
         } else {
           currentUser = users.get(authenticatedUser);
           if (currentUser == null) {
@@ -1009,6 +1016,8 @@
             userCreated = true;
           }
 
+          currentAuthUser = currentUser;
+
           if (authenticatedUser.equals(account)) {
             getLogger().info("Authenticated user " + authenticatedUser +
                              " logged on");