Changeset 24304

Timestamp:

Jun 2, 2009, 4:29:49 PM (17 years ago)

Author:

jhoblitt

Message:

add params checking to Nebulous::Key::parse_neb_key()

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Key.pm (modified) (1 diff)
• t/75_parse_neb_key.t (modified) (2 diffs)

trunk/Nebulous-Server/Changes

@@ -2 +2 @@
 
 0.17
+    - add params checking to Nebulous::Key::parse_neb_key()
     - restrict creation/modification/remove of xattrs to the user.* namespace
     - add chmod_object() method

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

@@ -27 +27 @@
 {
     my ($key, $volume) = @_;
-    return unless defined $key;
+
+    die "key param is not optional" unless defined $key;
+    die "too many params" if scalar @_ > 2;
 
     # white space is not allowed

trunk/Nebulous-Server/t/75_parse_neb_key.t

@@ -10 +10 @@
 use Test::More;
 
-plan tests => 99;
+plan tests => 103;
 
 use lib qw( ./t ./lib );
@@ -322 +322 @@
 };
 like( $@, qr/requires a path/, "no path" );
+
+# params
+eval {
+    my $key = parse_neb_key();
+};
+like( $@, qr/key param is not optional/, "no params" );
+
+eval {
+    my $key = parse_neb_key(undef);
+};
+like( $@, qr/key param is not optional/, "key is undef" );
+
+eval {
+    my $key = parse_neb_key(undef, 'bar');
+};
+like( $@, qr/key param is not optional/, "key is undef" );
+
+eval {
+    my $key = parse_neb_key('foo', 'bar', 'foo');
+};
+like( $@, qr/too many params/, "too many params" );