Changeset 5024

Timestamp:

2003-07-25T04:57:48+12:00 (21 years ago)

Author:

sjboddie

Message:

Changed the authentication directives to more easier to use ones.
authenticate option replaces auth_collection and takes the same options. The
options public_documents and private_documents replace the allowallexcept
and denyallexcept ACLs. The allow_acls has been removed. The auth_group remains
the same.

Location:

trunk/gsdl/src

Files:

• colservr/collectserver.cpp (modified) (4 diffs)
• recpt/comtypes.cpp (modified) (1 diff)
• recpt/comtypes.h (modified) (1 diff)
• recpt/documentaction.cpp (modified) (4 diffs)
• recpt/receptionist.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/collectserver.cpp

@@ -101 +101 @@
 
     // What have we set in our collect.cfg file :  document or collection ?
-    else if (key == "auth_collection") collectinfo.auth_collection = value;
+    else if (key == "authenticate") collectinfo.authenticate = value;
 
     // What have we set for our group list
@@ -115 +115 @@
       
       joinchar(cfgline,',',collectinfo.auth_group);
-      //      outconvertclass t;
+      
+      //outconvertclass t;
       //cerr << t << collectinfo.auth_group << "\n";
        }
 
-    // Have we set our security switch for use of acl to ON ?
-
-    else if (key == "allow_acls")
-       {
-      if(value=="true")
-         collectinfo.allow_acls = true;
-      else
-         collectinfo.allow_acls = false;
-       }
-
     // In the map the key-value pair contain the same
-    // data
-    
-    // What have we set for our allowallexcept ACL
-    else if (key == "allowallexcept")
+    // data i.e key == data, if key is 2 then data is 2
+    
+    // What have we set for our public_documents ACL
+    else if (key == "public_documents")
        {
       text_tarray::const_iterator begin = cfgline.begin();
@@ -139 +130 @@
       while(begin != end)
          {
-        collectinfo.allowallexcept[*begin] = *begin;
+        // key = data i.e if key is 2 then data is 2
+        // collectinfo.public_documents[*begin] is the key
+        // *begin is the data value
+
+        collectinfo.public_documents[*begin] = *begin;
         begin++;
          }
        }
     
-    // What have we set for our group list
-    else if (key == "denyallexcept")
+    // What have we set for our private_documents ACL
+    else if (key == "private_documents")
        {
       text_tarray::const_iterator begin = cfgline.begin();
@@ -151 +146 @@
       while(begin != end)
          {
-        collectinfo.denyallexcept[*begin] = *begin;
+        // key = data i.e if key is 2 then data is 2
+        // collectinfo.public_documents[*begin] is the key
+        // *begin is the data value
+        
+        collectinfo.private_documents[*begin] = *begin;
         begin++;
          }

trunk/gsdl/src/recpt/comtypes.cpp

@@ -71 +71 @@
   // various parts of the code.
   
-  auth_collection.clear();         // turned off by default, individual collection authentication
+  authenticate.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>
-  
-  
+  public_documents.clear();          // turned off by default, allow access to these documents <list>
+  private_documents.clear();           // turned off by default, disallow access to these documents <list>
+    
 }
 

trunk/gsdl/src/recpt/comtypes.h

@@ -103 +103 @@
    text_t         httpprefix;
    text_t         receptionist;
-   text_t         buildType;       // 'mg' or 'mgpp'
-   text_t         auth_collection; // 'document' or 'collection'
-   text_t         auth_group;      // 'mygroup' 'yourgroup'
-   bool           allow_acls;      // to make sure that the user wants to use this ACL feature
-   text_tmap      allowallexcept;  // the acl to allow stuff or deny things
-   text_tmap      denyallexcept;   // the opposite of the one above
+   text_t         buildType;           // 'mg' or 'mgpp'
+   text_t         authenticate;      // 'document' or 'collection'
+   text_t         auth_group;          // 'mygroup' 'yourgroup'
+   text_tmap      public_documents;    // the acl to allow access to listed documents
+   text_tmap      private_documents;   // the acl to disallow access to listed documents
    text_tarray    searchTypes; // form, plain, empty if collection uses mg, or has no searching facility
 };

trunk/gsdl/src/recpt/documentaction.cpp

@@ -178 +178 @@
            ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, args["c"], logout);
            
-           if(cinfo->auth_collection == "document" && cinfo->allow_acls) 
+           if(cinfo->authenticate == "document") 
           {
              // both are either commented out or uncomment and are empty
-             if (cinfo->allowallexcept.empty() && cinfo->denyallexcept.empty())
+             if (cinfo->public_documents.empty() && cinfo->private_documents.empty())
             {
                //deny everything
@@ -188 +188 @@
             }
 
-             // both allowallexcept and denyallexcept are turned on !
-             else if (!cinfo->allowallexcept.empty() && !cinfo->denyallexcept.empty())
+             // both public_documents and private_documents are turned on !
+             else if (!cinfo->public_documents.empty() && !cinfo->private_documents.empty())
             {
                //deny everything
@@ -196 +196 @@
             }
              
-             // only allowallexcept is set, so ask to authenticate for that article/doc
-             else if (cinfo->allowallexcept.find(docTop) != cinfo->allowallexcept.end() )
+             // only public_documents is set, so ask to authenticate for that article/doc
+             else if (cinfo->public_documents.find(docTop) != cinfo->public_documents.end() )
             {
                
@@ -204 +204 @@
             }
              
-             // only denyallexcept is set, so ask to authenticate for that article/doc
-             else if (cinfo->denyallexcept.find(docTop) == cinfo->denyallexcept.end() )
+             // only private_documents is set, so ask to authenticate for that article/doc
+             else if (cinfo->private_documents.find(docTop) == cinfo->private_documents.end() )
             {
                args["uan"] = "1";

trunk/gsdl/src/recpt/receptionist.cpp

@@ -1120 +1120 @@
      ColInfoResponse_t *cinfo = get_collectinfo_ptr (collectproto, arg_c, logout);
      
-     if(cinfo->auth_collection == "collection")
+     if(cinfo->authenticate == "collection")
         {
            args["uan"] = "1";