Changeset 5501 for trunk/Nebulous-Server

Timestamp:

Nov 10, 2005, 11:51:06 AM (21 years ago)

Author:

jhoblitt

Message:

add _is_valid_volume_name()

Location:

trunk/Nebulous-Server

Files:

• lib/Nebulous/Server.pm (modified) (4 diffs)
• lib/Nebulous/Server/SQL.pm (modified) (2 diffs)
• t/09_server_is_valid_volume_name.t (added)

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.14 2005-11-10 21:31:26 jhoblitt Exp $
+# $Id: Server.pm,v 1.15 2005-11-10 21:51:06 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -82 +82 @@
         {
             type        => SCALAR,
+            callbacks   => {
+                # check that the volume requested is valid
+                'is valid volume name' => sub { _is_valid_volume_name($_[0]) },
+            },
             optional    => 1,
         },
@@ -97 +101 @@
 
     # check that the comment isn't too long
-    # check that the volume requested is valid
 
     my $uri;
@@ -702 +705 @@
 }
 
+sub _is_valid_volume_name  {
+    my $vol_name = shift;
+
+    my $volume;
+    eval {
+        my $query = $db->prepare_cached( $sql->get_volume_by_name  ); 
+        $query->execute( $vol_name );
+        ( $volume ) = $query->fetchrow_array;
+
+        $query->finish;
+    };
+    if ( $@ ) {
+        $db->rollback;
+        $log->logdie( "database error: $@" );
+    }
+
+    return ( defined $volume ) ? 1 : undef;
+}
+
 1;
 

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.15 2005-11-10 21:21:14 jhoblitt Exp $
+# $Id: SQL.pm,v 1.16 2005-11-10 21:51:06 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -128 +128 @@
         FROM class
         WHERE class_id = ?
+    },
+    get_volume_by_name => qq{
+        SELECT vol_id, name, uri
+        FROM volume
+        WHERE name = ?
     },
 );