Fixed errors with Keytab object and its tests

perl/Wallet/Object/Keytab.pm was using the wrong value for the database
handle in some places (trying to load as a subroutine rather than part
of the object).  Also, the keytab.t tests were attempting to run against
the DBIx::Class object rather than a direct dbh handle that they
expected.

Change-Id: Ifbb8b110d559f3ba867fc5b0dc3933fd2d4fd484
Reviewed-on: https://gerrit.stanford.edu/731
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>

2 files changed, 40 insertions, 23 deletions

diff --git a/perl/Wallet/Object/Keytab.pm b/perl/Wallet/Object/Keytab.pm
index 083dae6..b50fb6e 100644
--- a/perl/Wallet/Object/Keytab.pm
+++ b/perl/Wallet/Object/Keytab.pm
@@ -140,8 +140,8 @@ sub sync_set {
         eval {
             my $name = $self->{name};
             my %search = (ks_name => $name);
-            my $sync_rs = $self->dbh->resultset('KeytabSync')
-                ->search (\%search);
+            my $sync_rs = $self->{dbh}->resultset('KeytabSync')
+                ->find (\%search);
             if (defined $sync_rs) {
                 my $target = $sync_rs->ks_target;
                 $sync_rs->delete;
@@ -167,8 +167,8 @@ sub sync_list {
     eval {
         my %search = (ks_name => $self->{name});
         my %attrs = (order_by => 'ks_target');
-        my @syncs = $self->dbh->resultset('KeytabSync')->search (\%search,
-                                                                 \%attrs);
+        my @syncs = $self->{dbh}->resultset('KeytabSync')->search (\%search,
+                                                                   \%attrs);
         for my $sync_rs (@syncs) {
             push (@targets, $sync_rs->ks_target);
         }
diff --git a/perl/t/keytab.t b/perl/t/keytab.t
index 01def75..c263f58 100755
--- a/perl/t/keytab.t
+++ b/perl/t/keytab.t
@@ -13,6 +13,7 @@ use Test::More tests => 139;
 
 BEGIN { $Wallet::Config::KEYTAB_TMP = '.' }
 
+use DBI;
 use Wallet::Admin;
 use Wallet::Config;
 use Wallet::Kadmin;
@@ -146,7 +147,8 @@ db_setup;
 my $admin = eval { Wallet::Admin->new };
 is ($@, '', 'Database connection succeeded');
 is ($admin->reinitialize ($user), 1, 'Database initialization succeeded');
-my $dbh = $admin->dbh;
+my $schema = $admin->dbh;
+my $dbh = $schema->storage->dbh;
 
 # Use this to accumulate the history traces so that we can check history.
 my $history = '';
@@ -173,7 +175,8 @@ SKIP: {
     # Test that object creation without KEYTAB_TMP fails.
     undef $Wallet::Config::KEYTAB_TMP;
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     is ($object, undef, 'Creating keytab without KEYTAB_TMP fails');
     is ($@, "KEYTAB_TMP configuration variable not set\n",
@@ -182,7 +185,8 @@ SKIP: {
 
     # Okay, now we can test.  First, create.
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', "wallet\nf", $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', "wallet\nf", $schema,
+                                        @trace)
       };
     is ($object, undef, 'Creating malformed principal fails');
     if ($Wallet::Config::KEYTAB_KRBTYPE eq 'MIT') {
@@ -192,7 +196,7 @@ SKIP: {
               ' with the right error');
     }
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', '', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', '', $schema, @trace)
       };
     is ($object, undef, 'Creating empty principal fails');
     if ($Wallet::Config::KEYTAB_KRBTYPE eq 'MIT') {
@@ -201,7 +205,8 @@ SKIP: {
         like ($@, qr/^error adding principal \@/, ' with the right error');
     }
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     if (defined ($object)) {
         ok (defined ($object), 'Creating good principal succeeds');
@@ -212,7 +217,8 @@ SKIP: {
     ok (created ('wallet/one'), ' and the principal was created');
     create ('wallet/two');
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/two', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/two', $schema,
+                                        @trace)
       };
     if (defined ($object)) {
         ok (defined ($object), 'Creating an existing principal succeeds');
@@ -224,13 +230,13 @@ SKIP: {
     is ($object->error, undef, ' with no error message');
     ok (! created ('wallet/two'), ' and now it does not exist');
     my @name = qw(keytab wallet-test/one);
-    $object = eval { Wallet::Object::Keytab->create (@name, $dbh, @trace) };
+    $object = eval { Wallet::Object::Keytab->create (@name, $schema, @trace) };
     is ($object, undef, 'Creation without permissions fails');
     like ($@, qr{^error adding principal wallet-test/one\@\Q$realm: },
           ' with the right error');
 
     # Now, try retrieving the keytab.
-    $object = Wallet::Object::Keytab->new ('keytab', 'wallet/one', $dbh);
+    $object = Wallet::Object::Keytab->new ('keytab', 'wallet/one', $schema);
     ok (defined ($object), 'Retrieving the object works');
     ok ($object->isa ('Wallet::Object::Keytab'), ' and is the right type');
     is ($object->flag_set ('locked', @trace), 1, ' and setting locked works');
@@ -283,7 +289,8 @@ EOO
 
     # Test principal deletion on object destruction.
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     ok (defined ($object), 'Creating good principal succeeds');
     ok (created ('wallet/one'), ' and the principal was created');
@@ -332,7 +339,8 @@ EOO
     # Test configuration errors.
     undef $Wallet::Config::KEYTAB_FILE;
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     is ($object, undef, 'Creating with bad configuration fails');
     is ($@, "keytab object implementation not configured\n",
@@ -340,7 +348,8 @@ EOO
     $Wallet::Config::KEYTAB_FILE = 't/data/test.keytab';
     undef $Wallet::Config::KEYTAB_PRINCIPAL;
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     is ($object, undef, ' likewise with another missing variable');
     is ($@, "keytab object implementation not configured\n",
@@ -348,7 +357,8 @@ EOO
     $Wallet::Config::KEYTAB_PRINCIPAL = contents ('t/data/test.principal');
     undef $Wallet::Config::KEYTAB_REALM;
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     is ($object, undef, ' and another');
     is ($@, "keytab object implementation not configured\n",
@@ -356,14 +366,16 @@ EOO
     $Wallet::Config::KEYTAB_REALM = contents ('t/data/test.realm');
     undef $Wallet::Config::KEYTAB_KRBTYPE;
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     is ($object, undef, ' and another');
     is ($@, "keytab object implementation not configured\n",
         ' with the right error');
     $Wallet::Config::KEYTAB_KRBTYPE = 'Active Directory';
     $object = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     is ($object, undef, ' and one set to an invalid value');
     is ($@, "unknown KEYTAB_KRBTYPE setting: Active Directory\n",
@@ -387,12 +399,14 @@ SKIP: {
 
     # Create the objects for testing and set the unchanging flag.
     my $one = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     ok (defined ($one), 'Creating wallet/one succeeds');
     is ($one->flag_set ('unchanging', @trace), 1, ' and setting unchanging');
     my $two = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/two', $dbh, @trace);
+        Wallet::Object::Keytab->create ('keytab', 'wallet/two', $schema,
+                                        @trace);
       };
     ok (defined ($two), 'Creating wallet/two succeeds');
     is ($two->flag_set ('unchanging', @trace), 1, ' and setting unchanging');
@@ -507,7 +521,8 @@ SKIP: {
     # Test setting synchronization attributes, which can also be done without
     # configuration.
     my $one = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     ok (defined ($one), 'Creating wallet/one succeeds');
     my $expected = <<"EOO";
@@ -584,7 +599,8 @@ SKIP: {
     # Create an object for testing and determine the enctypes we have to work
     # with.
     my $one = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     if (defined ($one)) {
         ok (1, 'Creating wallet/one succeeds');
@@ -730,7 +746,8 @@ EOO
         'Setting a single enctype works');
     is ($one->destroy (@trace), 1, ' and destroying the object works');
     $one = eval {
-        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $dbh, @trace)
+        Wallet::Object::Keytab->create ('keytab', 'wallet/one', $schema,
+                                        @trace)
       };
     ok (defined ($one), ' as does recreating it');
     @values = $one->attr ('enctypes');