=================================================================== RCS file: /cvs/palm/Palm-Keyring/t/keyring5.t,v retrieving revision 1.1 retrieving revision 1.5 diff -u -r1.1 -r1.5 --- palm/Palm-Keyring/t/keyring5.t 2007/02/19 00:28:28 1.1 +++ palm/Palm-Keyring/t/keyring5.t 2007/02/23 22:05:17 1.5 @@ -1,9 +1,9 @@ -#!/usr/bin/perl -# $RedRiver: keyring.t,v 1.9 2007/02/19 00:22:42 andrew Exp $ +#!/usr/bin/perl -T +# $RedRiver: keyring5.t,v 1.4 2007/02/22 04:57:37 andrew Exp $ use strict; use warnings; -use Test::More tests => 44; +use Test::More tests => 126; use YAML; BEGIN { @@ -15,99 +15,177 @@ my $password = '12345'; my $new_password = '54321'; -my @o = ( - { - version => 4, - password => $password, - }, - { - version => 5, - password => $password, - cipher => 1, - v4compatible => 1, - }, -); - -foreach my $options (@o) { +foreach my $cipher (0..3) { my $pdb; + my @recs; my $record; my $decrypted; - my $acct = { - name => 'test3', - account => 'atestaccount', - password => $password, - notes => 'now that really roxorZ!', - lastchange => { - day => 2, - month => 2, - year => 99, - }, + my $crypt = Palm::Keyring::crypts($cipher); + + my $options = { + version => 5, + password => $password, + cipher => $cipher, }; - ok( $pdb = new Palm::Keyring($options), 'New Palm::Keyring v' . $options->{version} ); + my $rec1_name = 'test'; - ok( $record = $pdb->append_Record(), 'Append Record' ); + my $original_accts = [ + [ + { + 'label_id' => 2, + 'data' => 'only password is set', + 'label' => 'password', + 'font' => 0, + }, + { + 'label_id' => 3, + 'data' => { + 'month' => 1, + 'day' => 1, + 'year' => 107 + }, + 'label' => 'lastchange', + 'font' => 0, + } + ], + [ + { + 'label_id' => 2, + 'data' => 'abcd1234', + 'label' => 'password', + 'font' => 0, + }, + { + 'label_id' => 3, + 'data' => { + 'month' => 1, + 'day' => 11, + 'year' => 107 + }, + 'label' => 'lastchange', + 'font' => 0, + }, + { + 'label_id' => 255, + 'data' => 'This is a short note.', + 'label' => 'notes', + 'font' => 0, + } + ], + [ + { + 'label_id' => 2, + 'data' => 'password (date is 2/2/07)', + 'label' => 'password', + 'font' => 0, + }, + { + 'label_id' => 3, + 'data' => { + 'month' => 1, + 'day' => 2, + 'year' => 107 + }, + 'label' => 'lastchange', + 'font' => 0, + } + ] + ]; - ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' ); + SKIP: { + if ($cipher > 0) { + skip 'Crypt::CBC not installed', 31 unless + eval "require Crypt::CBC"; + skip 'Crypt::' . $crypt->{name} . ' not installed', 31 unless + eval "require Crypt::$crypt->{name}"; + } + skip 'Digest::HMAC_SHA1 not installed', 31 unless + eval " require Digest::HMAC_SHA1 "; - ok( $pdb->Write($file), 'Write file' ); + ok( $pdb = new Palm::Keyring($options), 'New Palm::Keyring v' + . $options->{version} + . ' Cipher ' + . $options->{cipher} + ); - $pdb = undef; + my $rec_id = 0; + foreach my $acct (@{ $original_accts} ) { + ok( $record = $pdb->append_Record(), 'Append Record' ); + if ($rec_id == 1) { + ok( $record->{name} = $rec1_name, 'Setting record name' ); + } + ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' ); + $rec_id++; + } + ok( $pdb->Write($file), 'Write file' ); - my $rec_num = 1; - if ($options->{version} == 4) { + $pdb = undef; + ok( $pdb = new Palm::PDB(), 'New Palm::PDB' ); - } else { - ok( $pdb = new Palm::Keyring(-v4compatible => 1), 'New Palm::Keyring' ); - $rec_num = 0; - } - ok( $pdb->Load($file), 'Load File' ); + ok( $pdb->Load($file), 'Load File' ); - ok( $pdb->Password($password), 'Verify Password' ); + ok( $pdb->Password($password), 'Verify Password' ); - ok( $decrypted = $pdb->Decrypt($pdb->{records}->[$rec_num]), 'Decrypt record' ); + $rec_id = 0; + foreach my $rec (@{ $pdb->{records} }) { + ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' ); + if ($rec_id == 1) { + is( $rec->{name}, $rec1_name, 'Checking record name' ); + } + push @recs, $decrypted; + $rec_id++; + } - is( $decrypted->{password}, $password, 'Got password' ); + is_deeply( \@recs, $original_accts, 'Account Matches' ); - is_deeply( $decrypted, $acct, 'Account Matches' ); + @recs = (); + my $rec_num = 1; - my $old_date = $decrypted->{'lastchange'}; + ok( $pdb->Password($password, $new_password), 'Change PDB Password' ); - ok( $pdb->Password($password, $new_password), 'Change PDB Password' ); + foreach my $rec (@{ $pdb->{records} }) { + ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' ); + push @recs, $decrypted; + } - ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt with new password' ); + is_deeply( \@recs, $original_accts, 'Account Matches' ); - my $new_date = $decrypted->{'lastchange'}; + my $acct; + ok( $acct = $pdb->Decrypt( $pdb->{records}->[$rec_num]), 'decrypt record ' . $rec_num); - is_deeply( $old_date, $new_date, 'Date didn\'t change' ); + foreach my $field (@{ $acct }) { + next unless $field->{label} eq 'password'; + ok($field->{data} = $new_password, 'Change password'); + } - $acct->{'password'} = $new_password; + ok( $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 'Change record' ); - ok( $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 'Change record' ); + ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt changed record' ); - ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt new record' ); + is_deeply($acct, $decrypted, 'Compare changed record'); - $new_date = $decrypted->{'lastchange'}; + $decrypted = []; + ok( $pdb->Password(), 'Forget password' ); - my $od = join '/', map { $old_date->{$_} } sort keys %{ $old_date }; - my $nd = join '/', map { $new_date->{$_} } sort keys %{ $new_date }; + eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]) }; + ok($@, 'Don\'t decrypt'); - isnt( $od, $nd, 'Date changed'); + my $got_password = 'Got nothing'; + if ($decrypted) { + foreach my $field (@{ $decrypted }) { + next unless $field->{label} eq 'password'; + $got_password = $field->{data}; + } + } - is( $decrypted->{password}, $new_password, 'Got new password' ); + isnt( $got_password, $new_password, 'Didn\'t get new password' ); - $decrypted = {}; - ok( $pdb->Password(), 'Forget password' ); - - eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[1]) }; - ok( $@, 'Don\'t decrypt' ); - - isnt( $decrypted->{password}, $new_password, 'Didn\'t get new password' ); - - ok( unlink($file), 'Remove test pdb v' . $options->{version} ); + ok( unlink($file), 'Remove test pdb v' . $options->{version} ); + } } 1;