diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in index ecf15bba20089eb352b4c3167b6c65734330da3d..7ff29ca071524a7ea6c1b7d5991348b4600c619a 100755 --- a/bin/account-manager.pl.in +++ b/bin/account-manager.pl.in @@ -21,7 +21,7 @@ use AccountManager::Service; use AccountManager::Service::Manager; use AccountManager::Account; use AccountManager::Account::Manager; -use AccountManager::SAMLMetadata; +use AccountManager::Metadata; use AccountManager::Tools; my %options; @@ -166,7 +166,7 @@ sub parse_metadata { my $federation_metadata; eval { - $federation_metadata = AccountManager::SAMLMetadata->new( + $federation_metadata = AccountManager::Metadata->new( file => $configuration->{_}->{federation_metadata_file} ); }; diff --git a/lib/AccountManager/SAMLMetadata.pm b/lib/AccountManager/Metadata.pm similarity index 99% rename from lib/AccountManager/SAMLMetadata.pm rename to lib/AccountManager/Metadata.pm index 4978c7b04712171093e7c8efe11adb6cddd6a6b9..2b73fc4469915b3a7c0810004a282eb9adc14383 100644 --- a/lib/AccountManager/SAMLMetadata.pm +++ b/lib/AccountManager/Metadata.pm @@ -1,4 +1,4 @@ -package AccountManager::SAMLMetadata; +package AccountManager::Metadata; use strict; use warnings; diff --git a/lib/AccountManager/WebRequest.pm b/lib/AccountManager/WebRequest.pm index 008126639863ad05a7936058c1cabbb31a3f6b49..78b98ee79cc5ca563096633892c95d36cfd88d78 100644 --- a/lib/AccountManager/WebRequest.pm +++ b/lib/AccountManager/WebRequest.pm @@ -14,7 +14,7 @@ use AccountManager::Account; use AccountManager::Account::Manager; use AccountManager::Token; use AccountManager::Service; -use AccountManager::SAMLMetadata; +use AccountManager::Metadata; use AccountManager::Tools; ## Defining parameters format @@ -186,7 +186,7 @@ sub req_account_wizard { my $metadata; eval { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => $self->{configuration}->{_}->{federation_metadata_file} ); }; @@ -227,7 +227,7 @@ sub req_select_sp { my $metadata; eval { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => $self->{configuration}->{_}->{federation_metadata_file} ); }; diff --git a/lib/Makefile.am b/lib/Makefile.am index e8a51439f2e1bd20fc190627c9cb993748e7844c..3ef9a03a1c6bccabf5611e70ff3f2619f8cad43a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -5,7 +5,7 @@ nobase_modules_DATA = \ AccountManager/Token/Manager.pm \ AccountManager/DB.pm \ AccountManager/DB/Object.pm \ - AccountManager/SAMLMetadata.pm \ + AccountManager/Metadata.pm \ AccountManager/Service.pm \ AccountManager/Service/Manager.pm \ AccountManager/Account.pm \ diff --git a/t/samlmetadata.t b/t/metadata.t similarity index 86% rename from t/samlmetadata.t rename to t/metadata.t index 55161740bdd7dd7890f6f9bd4f51c67db2527374..cecd79abc735602abbe2d2fda0a1bb8cef5d55f2 100755 --- a/t/samlmetadata.t +++ b/t/metadata.t @@ -8,19 +8,19 @@ use File::Temp; use Test::More; use Test::Exception; -use AccountManager::SAMLMetadata; +use AccountManager::Metadata; plan tests => 21; my $metadata; throws_ok { - $metadata = AccountManager::SAMLMetadata->new(); + $metadata = AccountManager::Metadata->new(); } qr/^missing argument 'file'/, 'instanciation: no file argument'; throws_ok { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => '/no/such/file', ); } qr/^non-existing file/, @@ -31,7 +31,7 @@ my $file1 = File::Temp->new(UNLINK => $ENV{TEST_DEBUG} ? 0 : 1); chmod 0000, $file1; throws_ok { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => $file1->filename() ); } qr/^non-readable file/, @@ -40,7 +40,7 @@ throws_ok { chmod 0644, $file1; throws_ok { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => $file1->filename() ); } qr/^Failed to parse file: \S+ parser error : Document is empty/, @@ -54,7 +54,7 @@ EOF close($file2); throws_ok { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => $file2->filename() ); } qr/^Failed to parse file: \S+ parser error : Start tag expected/, @@ -69,14 +69,14 @@ EOF close($file3); throws_ok { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => $file3->filename() ); } qr/^incorrect root element type 'root'/, 'instanciation: incorrect xml file'; lives_ok { - $metadata = AccountManager::SAMLMetadata->new( + $metadata = AccountManager::Metadata->new( file => 't/edugain.xml' ); } 'instanciation: edugain metadata';