Changeset 24291 for trunk/Nebulous-Server/lib/Nebulous/Server.pm

Timestamp:

Jun 1, 2009, 3:53:59 PM (17 years ago)

Author:

jhoblitt

Message:

restrict creation/modification/remove of xattrs to the user.* namespace

File:

• trunk/Nebulous-Server/lib/Nebulous/Server.pm (modified) (5 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -740 +740 @@
     }
 
+    # check to see if the user.mode xattr exists
+
     $log->debug("leaving");
 
@@ -982 +984 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'xattr is in user. namespace'
+                    => sub { ($_[0]) =~ qr/^user\./ },
+            },
         },
         {
@@ -1065 +1071 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'xattr is in user. namespace'
+                    => sub { ($_[0]) =~ qr/^user\./ },
+            },
         },
     );
@@ -1161 +1171 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                'xattr is in user. namespace'
+                    => sub { ($_[0]) =~ qr/^user\./ },
+            },
         },
     );
@@ -1180 +1194 @@
             $query->finish;
 
+            # no rows affected means the xattr did not exist
+            if ($rows == 0) {
+                $log->logdie( "xattr $key:$name does not exist" );
+            }
+
             # if we affected more then one row something very bad has happened.
-            unless ($rows == 1) {
+            if ($rows > 1) {
                 $log->logdie( "affected row count is $rows instead of 1" );
             }