Changeset 5017 for trunk/gsdl/src/recpt/receptionist.cpp

Timestamp:

2003-07-24T04:04:00+12:00 (21 years ago)

Author:

sjboddie

Message:

Added site configuration directives site_auth and site_groups for site wide
authentication using the existing groups and password authentication structure

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -208 +208 @@
 // it contains. The configuration should take place after everything
 // has been added but before the initialisation.
+
 void receptionist::configure (const text_t &key, const text_tarray &cfgline) {
   // configure the receptionist
 
+   
+   
   if (cfgline.size() >= 1) {
     cgiarginfo *info = NULL;
@@ -272 +275 @@
     }
 
+    // Read in the value for the site_auth directive either true or false
+    else if (key == "site_auth") configinfo.site_auth = (cfgline[0] == "true");
+
+    else if (key == "site_group")
+       joinchar(cfgline,',',configinfo.site_group);
+       
     else if (key == "SiteFormat") {
        if (cfgline[0] == "HomePageType") {
@@ -1080 +1089 @@
 
 bool receptionist::check_mainargs (cgiargsclass &args, ostream &logout) {
-  // if this receptionist is running in collection dependant mode
-  // then it should always set the collection argument to the
-  // collection
-  if (!configinfo.collection.empty()) args["c"] = configinfo.collection;
-
-  // if current collection uses ccscols make sure
-  // "ccs" argument is set and make "cc" default to
-  // all collections in "ccs"
-  if (args["a"] != "config" && !args["c"].empty()) {
-
-    text_t &arg_c = args["c"];
-    recptproto *collectproto = protocols.getrecptproto (arg_c, logout);
-    if (collectproto == NULL) {
-      // oops, this collection isn't valid
-      outconvertclass text_t2ascii;
-      logout << text_t2ascii << "ERROR: Invalid collection: " << arg_c << "\n";
-      args["c"].clear();
-
-    } else {
-
-       ColInfoResponse_t *cinfo = get_collectinfo_ptr (collectproto, arg_c, logout);
-
-       if(cinfo->auth_collection == "collection")
-      {
-         args["uan"] = "1";
-         args["ug"] = cinfo->auth_group;
-      }
-       
-       
+   
+   if(configinfo.site_auth)
+      {
+     args["uan"] = "1";
+     args["ug"] = configinfo.site_group;
+      }
+   
+   
+   // if this receptionist is running in collection dependant mode
+   // then it should always set the collection argument to the
+   // collection
+   if (!configinfo.collection.empty()) args["c"] = configinfo.collection;
+   
+   // if current collection uses ccscols make sure
+   // "ccs" argument is set and make "cc" default to
+   // all collections in "ccs"
+   if (args["a"] != "config" && !args["c"].empty()) {
+      
+      text_t &arg_c = args["c"];
+      recptproto *collectproto = protocols.getrecptproto (arg_c, logout);
+      if (collectproto == NULL) {
+     // oops, this collection isn't valid
+     outconvertclass text_t2ascii;
+     logout << text_t2ascii << "ERROR: Invalid collection: " << arg_c << "\n";
+     args["c"].clear();
+     
+      } else {
+     
+     ColInfoResponse_t *cinfo = get_collectinfo_ptr (collectproto, arg_c, logout);
+     
+     if(cinfo->auth_collection == "collection")
+        {
+           args["uan"] = "1";
+           args["ug"] = cinfo->auth_group;
+        }
+     
+     
       if (cinfo != NULL) {
-    if (!cinfo->ccsCols.empty()) {
-      args["ccs"] = 1;
-      if (args["cc"].empty()) {
-        text_tarray::const_iterator col_here = cinfo->ccsCols.begin();
-        text_tarray::const_iterator col_end = cinfo->ccsCols.end();
-        bool first = true;
-        while (col_here != col_end) {
-          // make sure it's a valid collection
-          if (protocols.getrecptproto (*col_here, logout) != NULL) {
-        if (!first) args["cc"].push_back (',');
-        args["cc"] += *col_here;
-        first = false;
-          }
+     if (!cinfo->ccsCols.empty()) {
+        args["ccs"] = 1;
+        if (args["cc"].empty()) {
+           text_tarray::const_iterator col_here = cinfo->ccsCols.begin();
+           text_tarray::const_iterator col_end = cinfo->ccsCols.end();
+           bool first = true;
+           while (col_here != col_end) {
+          // make sure it's a valid collection
+          if (protocols.getrecptproto (*col_here, logout) != NULL) {
+             if (!first) args["cc"].push_back (',');
+             args["cc"] += *col_here;
+             first = false;
+          }
           col_here ++;
         }