Changeset 175

Timestamp:

Jun 21, 2006 4:48:45 AM (18 years ago)

Author:

scdev

Message:

${1}

Location:

trunk

Files:

• bin/acl.cli.php (modified) (7 diffs)
• lib/ACL.inc.php (modified) (3 diffs)

trunk/bin/acl.cli.php

@@ -110 +110 @@
     if (!isset($object)) {
         echo "'add*' commands require at least one argument. Try 'help' if you are lost.\n";
+        break;
     }
     echo $acl->add($object, $parent, str_replace('add', '', $op)) ? "Ok\n" : "Error!\n";
@@ -121 +122 @@
     if (!isset($object)) {
         echo "'mv*' commands require at least one argument. Try 'help' if you are lost.\n";
+        break;
     }
     echo $acl->move($object, $parent, str_replace('mv', '', $op)) ? "Ok\n" : "Error!\n";
@@ -131 +133 @@
     if (!isset($object)) {
         echo "'add*' commands require at least one argument. Try 'help' if you are lost.\n";
+        break;
     }
     echo $acl->remove($object, str_replace('rm', '', $op)) ? "Ok\n" : "Error!\n";
@@ -145 +148 @@
     if (!isset($aro)) {
         echo "'grant' command require at least one argument. Try 'help' if you are lost.\n";
+        break;
     }
     echo $acl->grant($aro, $aco, $axo) ? "Ok\n" : "Error!\n";
@@ -155 +159 @@
     if (!isset($aro)) {
         echo "'revoke' command require at least one argument. Try 'help' if you are lost.\n";
+        break;
     }
     echo $acl->revoke($aro, $aco, $axo) ? "Ok\n" : "Error!\n";
+    break;
+
+case 'delete' :
+    $aro = isset($_SERVER['argv'][2]) && 'null' != $_SERVER['argv'][2] ? $_SERVER['argv'][2] : null;
+    $aco = isset($_SERVER['argv'][3]) && 'null' != $_SERVER['argv'][3] ? $_SERVER['argv'][3] : null;
+    $axo = isset($_SERVER['argv'][4]) && 'null' != $_SERVER['argv'][4] ? $_SERVER['argv'][4] : null;
+    if (!isset($_SERVER['argv'][2]) || !isset($_SERVER['argv'][3]) || !isset($_SERVER['argv'][4])) {
+        echo "'delete' command require all three arguments to be specified. Try 'help' if you are lost.\n";
+        break;
+    }
+    echo $acl->delete($aro, $aco, $axo) ? "Ok\n" : "Error!\n";
     break;
 
@@ -165 +181 @@
     if (!isset($aro)) {
         echo "'check' command require at least one argument. Try 'help' if you are lost.\n";
+        break;
     }
     echo $acl->check($aro, $aco, $axo) ? "allow\n" : "deny\n";
@@ -227 +244 @@
     grant <aro_object> [aco_object] [axo_object]
     revoke <aro_object> [aco_object] [axo_object]
+    delete [aro_object] [aco_object] [axo_object]
+    
 
 For the add*, mv*, grant, and revoke commands if any of the optional 
-args are not provided, 'root' is assumed.
+args are not provided, 'root' is assumed. For the delete command 
+'null' is considered a wildcard to delete all objects of that type.
+
 
 Strangecode :: www.strangecode.com

trunk/lib/ACL.inc.php

@@ -487 +487 @@
     *
     * @access   public
-    * @param    string $aro Identifier of an existing ARO object.
-    * @param    string $aco Identifier of an existing ACO object (or null to use root).
-    * @param    string $axo Identifier of an existing AXO object (or null to use root).
+    * @param    string|null $aro Identifier of an existing ARO object (or null to use root).
+    * @param    string|null $aco Identifier of an existing ACO object (or null to use root).
+    * @param    string|null $axo Identifier of an existing AXO object (or null to use root).
     * @return   bool False on error, true on success.
     * @author   Quinn Comendant <quinn@strangecode.com>
@@ -539 +539 @@
     *
     * @access   public
-    * @param    string $aro Identifier of an existing ARO object.
-    * @param    string $aco Identifier of an existing ACO object (or null to use root).
-    * @param    string $axo Identifier of an existing AXO object (or null to use root).
+    * @param    string|null $aro Identifier of an existing ARO object (or null to use root).
+    * @param    string|null $aco Identifier of an existing ACO object (or null to use root).
+    * @param    string|null $axo Identifier of an existing AXO object (or null to use root).
     * @return   bool False on error, true on success.
     * @author   Quinn Comendant <quinn@strangecode.com>
@@ -550 +550 @@
     {
         return $this->grant($aro, $aco, $axo, 'deny');
+    }
+    
+    /*
+    * Delete an entry from the acl_tbl completely to allow other permissions to cascade down.
+    * Null values act as a "wildcard" and will cause ALL matches in that column to be deleted.
+    *
+    * @access   public
+    * @param    string|null $aro Identifier of an existing ARO object (or null for *).
+    * @param    string|null $aco Identifier of an existing ACO object (or null for *).
+    * @param    string|null $axo Identifier of an existing AXO object (or null for *).
+    * @return   bool False on error, true on success.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    20 Jun 2006 20:16:12
+    */
+    function delete($aro=null, $aco=null, $axo=null)
+    {
+        $app =& App::getInstance();
+        $db =& DB::getInstance();
+
+        $this->initDB();
+
+        // If any access objects are null, assume using root values.
+        // However if they're empty we don't want to escalate the grant command to root!
+        $where = array();
+        $where[] = is_null($aro) ? "aro_tbl.name IS NOT NULL" : "aro_tbl.name = '" . $db->escapeString($aro) . "' ";
+        $where[] = is_null($aco) ? "aco_tbl.name IS NOT NULL" : "aco_tbl.name = '" . $db->escapeString($aco) . "' ";
+        $where[] = is_null($axo) ? "axo_tbl.name IS NOT NULL" : "axo_tbl.name = '" . $db->escapeString($axo) . "' ";
+
+        $final_where = join(' AND ', $where);
+        if (substr_count($final_where, 'IS NOT NULL') == 3) {
+            // Null on all three tables will delete ALL entries including the root -> root -> root = deny.
+            $app->logMsg(sprintf('Cannot allow deletion of all acl entries.', null), LOG_NOTICE, __FILE__, __LINE__);
+            return false;
+        }
+        
+        $qid = $db->query("
+            DELETE acl_tbl
+            FROM acl_tbl
+            LEFT JOIN aro_tbl ON (acl_tbl.aro_id = aro_tbl.aro_id)
+            LEFT JOIN aco_tbl ON (acl_tbl.aco_id = aco_tbl.aco_id)
+            LEFT JOIN axo_tbl ON (acl_tbl.axo_id = axo_tbl.axo_id)
+            WHERE $final_where
+        ");
+
+        $app->logMsg(sprintf('Deleted %s acl_tbl links: %s -> %s -> %s', mysql_affected_rows($db->getDBH()), $aro, $aco, $axo), LOG_INFO, __FILE__, __LINE__);
+        
+        return true;
     }