Changeset 390 for trunk

Timestamp:

09/21/12 13:41:48 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Extend handling of setting permissions to keep "chained"
permissions straight. Needed mainly for locations; if the user
can manipulate them (add/edit/delete/change-on-record) then they
should be able to view them. See #10.
Also sets self_edit if user_edit is set.

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (2 diffs)

trunk/DNSDB.pm

@@ -59 +59 @@
         &mailNotify
         %typemap %reverse_typemap %config
-        %permissions @permtypes $permlist
+        %permissions @permtypes $permlist %permchains
         );
 
@@ -86 +86 @@
                 &mailNotify
                 %typemap %reverse_typemap %config
-                %permissions @permtypes $permlist
+                %permissions @permtypes $permlist %permchains
                 )]
         );
@@ -120 +120 @@
 );
 our $permlist = join(',',@permtypes);
+
+# Some permissions more or less require certain others.
+our %permchains = (
+        user_edit       => 'self_edit',
+        location_edit   => 'location_view',
+        location_create => 'location_view',
+        location_delete => 'location_view',
+        record_locchg   => 'location_view',
+);
 
 # DNS record type map and reverse map.

trunk/dns.cgi

@@ -956 +956 @@
       }
     }
+    # "Chained" permissions.  Some permissions imply others;  make sure they get set.
+    foreach (keys %permchains) {
+      if ($chperms{$_} && !$chperms{$permchains{$_}}) {
+        $chperms{$permchains{$_}} = 1;
+      }
+    }
     my ($code,$msg) = changePermissions($dbh, 'group', $webvar{gid}, \%chperms);
     if ($code eq 'OK') {
@@ -1180 +1186 @@
       } else {
         $permstring = 'i';
+      }
+      # "Chained" permissions.  Some permissions imply others;  make sure they get set.
+      foreach (keys %permchains) {
+        if ($newperms{$_} && !$newperms{$permchains{$_}}) {
+          $newperms{$permchains{$_}} = 1;
+          $permstring .= ",$permchains{$_}";
+        }
       }
       if ($webvar{useraction} eq 'add') {