From 08b25f5f167f6635b5b79a5f75d872d9c64af02a Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Fri, 3 Nov 2017 17:02:31 +0100
Subject: [PATCH] simplification: no exception thrown in parse() method
---
bin/account-manager-client.pl | 10 +++-------
lib/IdPAccountManager/WebRequest.pm | 16 +++-------------
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index 84dd2ad..945ea26 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -159,13 +159,9 @@ sub parse_federation_metadata {
};
die "unable to load federation metadata: $EVAL_ERROR" if $EVAL_ERROR;
- my $data;
- eval {
- $data = $federation_metadata->parse(
- entity_id => $options{sp_entityid},
- );
- };
- die "unable to parse federation metadata: $EVAL_ERROR\n" if $EVAL_ERROR;
+ my $data = $federation_metadata->parse(
+ entity_id => $options{sp_entityid},
+ );
printf "Document %s parsed\n",
$configuration->{federation_metadata_file_path};
diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index 08677e8..e0f5390 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -285,19 +285,9 @@ sub req_select_sp {
return undef;
}
- eval {
- $federation_metadata->parse(
- filter_entity_id => $self->{in}->{sp_entityid}
- );
- };
- if ($EVAL_ERROR) {
- push @{ $self->{out}->{errors} }, "internal";
- $self->{logger}->log(
- level => LOG_ERROR,
- message => "Failed to parse federation metadata: $EVAL_ERROR"
- );
- return undef;
- }
+ $federation_metadata->parse(
+ filter_entity_id => $self->{in}->{sp_entityid}
+ );
## Create a serviceprovider object to store major parameters for this SP in DB
my $service_provider = IdPAccountManager::Data::ServiceProvider->new(
--
GitLab