Changeset 5017

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

Location:

trunk/gsdl/src/recpt

Files:

• comtypes.cpp (modified) (1 diff)
• receptionist.cpp (modified) (3 diffs)
• receptionist.h (modified) (1 diff)

trunk/gsdl/src/recpt/comtypes.cpp

@@ -67 +67 @@
   httpprefix.clear();
   receptionist.clear();
-  auth_collection.clear();         // turned off by default
-  auth_group.clear();              // turned off by default
-  allow_acls= false;              // turned off by default
-  allowallexcept.clear();          // turned off by default
-  denyallexcept.clear();           // turned off by default
-
+
+  // Setting some authentication parameters use with
+  // various parts of the code.
+  
+  auth_collection.clear();         // turned off by default, individual collection authentication
+  auth_group.clear();              // turned off by default, authentication by groups method
+  allow_acls= false;               // turned off by default, our ACL switch either on or off in collect.cfg
+  allowallexcept.clear();          // turned off by default, our allow-all-except <grouplist>
+  denyallexcept.clear();           // turned off by default, out deny-all-except <grouplist>
+  
+  
 }
 

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 ++;
         }

trunk/gsdl/src/recpt/receptionist.h

@@ -76 +76 @@
 
 struct recptconf {
-  text_t gsdlhome;
-  text_t gdbmhome;   // will equal gsdlhome if not set
-  text_t collection; // will equal "" in 'general' mode
-  text_t collectdir; // will equal gsdlhome in 'general' mode
-  colinfo_tmap collectinfo;
-  text_t httpprefix;
-  text_t httpimg;    // will equal /images if not set
-  text_t gwcgi;
-  text_tset macrofiles;
-  text_t saveconf;
-  bool usecookies;  // true if we want cookies set
-  bool logcgiargs;  // true if we want to log cgi arguments
-
-  ldformat_t LogDateFormat;
-
-  text_t maintainer; // email address of maintainer
-  text_t MailServer; // SMTP mail server to use when sending event messages by email
+   text_t gsdlhome;
+   text_t gdbmhome;   // will equal gsdlhome if not set
+   text_t collection; // will equal "" in 'general' mode
+   text_t collectdir; // will equal gsdlhome in 'general' mode
+   colinfo_tmap collectinfo;
+   text_t httpprefix;
+   text_t httpimg;    // will equal /images if not set
+   text_t gwcgi;
+   text_tset macrofiles;
+   text_t saveconf;
+   bool usecookies;  // true if we want cookies set
+   bool logcgiargs;  // true if we want to log cgi arguments
+   
+   ldformat_t LogDateFormat;
+   
+   text_t maintainer; // email address of maintainer
+   text_t MailServer; // SMTP mail server to use when sending event messages by email
                      // defaults to mail.maintainer-domain
-  events_t LogEvents;
-  events_t EmailEvents;
-  bool EmailUserEvents;
-
-  text_t HomePageType; 
-  int HomePageCols;
-   
-  text_tmap pageparams;
-  text_t macroprecedence;
-  
-  languageinfo_tmap languages;
-
-  // encodings is just a simple mapping from encoding longnames to
-  // shortnames.  It's useful for now for creating the pulldown menu of
-  // encodings on the preferences page but isn't intended to be permanent.
-  text_tmap encodings;
-
-  void clear ();
-  recptconf () {clear();}
+   events_t LogEvents;
+   events_t EmailEvents;
+   bool EmailUserEvents;
+
+   bool    site_auth;   // Complete site authentication, useful to lockout site for example.
+   text_t  site_group;  // Similar to the auth_groups functionality, infact exactly the same
+   
+   text_t HomePageType; 
+   int HomePageCols;
+   
+   text_tmap pageparams;
+   text_t macroprecedence;
+   
+   languageinfo_tmap languages;
+   
+   // encodings is just a simple mapping from encoding longnames to
+   // shortnames.  It's useful for now for creating the pulldown menu of
+   // encodings on the preferences page but isn't intended to be permanent.
+   text_tmap encodings;
+   
+   void clear ();
+   recptconf () {clear();}
 };
 
 class receptionist : public configurable {
 protected:
-  recptconf configinfo;
-
-  cgiargsinfoclass argsinfo;
-  actionmapclass actions;
-  browsermapclass browsers;
-  recptprotolistclass protocols;
-  displayclass disp;
-  convertinfoclass converters;
-  ColInfoResponse_t collectinfo;
-  
-  // prepare_page sets up page parameters, sets display macros
-  // and opens the page ready for output 
-  virtual void prepare_page (action *a, cgiargsclass &args, 
-                 outconvertclass &outconvert, 
+
+   recptconf configinfo;
+   
+   cgiargsinfoclass argsinfo;
+   actionmapclass actions;
+   browsermapclass browsers;
+   recptprotolistclass protocols;
+   displayclass disp;
+   convertinfoclass converters;
+   ColInfoResponse_t collectinfo;
+   
+   // prepare_page sets up page parameters, sets display macros
+   // and opens the page ready for output 
+   virtual void prepare_page (action *a, cgiargsclass &args, 
+                  outconvertclass &outconvert, 
                  ostream &logout);
-  
-  virtual void translate_OIDs (cgiargsclass &args, recptproto *collectproto,
-                   ostream &logout);
-
-  bool get_cookie (text_t &cookie, text_tmap &fcgienv);
-  bool get_cookie (text_tmap &fcgienv);
-
-  // get the default encoding for the given language - if it fails for any
-  // reason, return ""
-  text_t get_default_encoding (const text_t &language);
-
-  virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert, 
-                      ostream &logout);
-
-  bool append_logstr (const text_t &filename, const text_t &logstr,
-              ostream &logout);
-
-  virtual void configure_encoding (const text_tarray &cfgline);
-
-public:
-  receptionist ();
-  virtual ~receptionist() {}
-
-  // add_action makes another action available to the receptionist
-  // the action remains the property of the calling code and that
-  // code should destroy the action after the recptionist has been
-  // destroyed.
-  void add_action (action *theaction);
-  actionmapclass *get_actionmap_ptr () {return &actions;}
-
-  // add_browser makes another browser available to the receptionist
-  // the browser remains the property of the calling code and that
-  // code should destroy it after the recptionist has been
-  // destroyed.
-  void add_browser (browserclass *thebrowser);
-  browsermapclass *get_browsermap_ptr () {return &browsers;}
-  void setdefaultbrowser (const text_t &browsername);
-
-  // add_protocol makes another protocol available to the receptionist
-  // without any protocols, no collections will be available. The
-  // protocols remain the property of the calling code.
-  void add_protocol (recptproto *theprotocol) {protocols.addrecptproto(theprotocol);}
-  recptprotolistclass *get_recptprotolist_ptr () {return &protocols;}
-  
-  // add_converter makes another converter available to the receptionist.
-  // Converters are needed to display pages using different encodings.
-  // The converters remain the property of the calling code.
-  void add_converter (const text_t &name, inconvertclass *inconverter,
-              rzwsoutconvertclass *outconverter) {
-    converters.add_converter(name, inconverter, outconverter);}
-  convertinfoclass *get_convertinfo_ptr () {return &converters;}
-  
-  
-  // configure should be called for each line in the
+   
+   virtual void translate_OIDs (cgiargsclass &args, recptproto *collectproto,
+                ostream &logout);
+   
+   bool get_cookie (text_t &cookie, text_tmap &fcgienv);
+   bool get_cookie (text_tmap &fcgienv);
+   
+   // get the default encoding for the given language - if it fails for any
+   // reason, return ""
+   text_t get_default_encoding (const text_t &language);
+   
+   virtual void define_general_macros (cgiargsclass &args, outconvertclass &outconvert, 
+                       ostream &logout);
+   
+   bool append_logstr (const text_t &filename, const text_t &logstr,
+               ostream &logout);
+
+   virtual void configure_encoding (const text_tarray &cfgline);
+   
+ public:
+   receptionist ();
+   virtual ~receptionist() {}
+   
+   // add_action makes another action available to the receptionist
+   // the action remains the property of the calling code and that
+   // code should destroy the action after the recptionist has been
+   // destroyed.
+   void add_action (action *theaction);
+   actionmapclass *get_actionmap_ptr () {return &actions;}
+   
+   // add_browser makes another browser available to the receptionist
+   // the browser remains the property of the calling code and that
+   // code should destroy it after the recptionist has been
+   // destroyed.
+   void add_browser (browserclass *thebrowser);
+   browsermapclass *get_browsermap_ptr () {return &browsers;}
+   void setdefaultbrowser (const text_t &browsername);
+   
+   // add_protocol makes another protocol available to the receptionist
+   // without any protocols, no collections will be available. The
+   // protocols remain the property of the calling code.
+   void add_protocol (recptproto *theprotocol) {protocols.addrecptproto(theprotocol);}
+   recptprotolistclass *get_recptprotolist_ptr () {return &protocols;}
+   
+   // add_converter makes another converter available to the receptionist.
+   // Converters are needed to display pages using different encodings.
+   // The converters remain the property of the calling code.
+   void add_converter (const text_t &name, inconvertclass *inconverter,
+               rzwsoutconvertclass *outconverter) {
+      converters.add_converter(name, inconverter, outconverter);}
+   convertinfoclass *get_convertinfo_ptr () {return &converters;}
+   
+   
+   // configure should be called for each line in the
   // configuration files to configure the receptionist and everything
   // it contains. The configuration should take place after everything