SAML:

* perltidy
* use XML::Simple instead of XML::LibXML to parse XML
* Add initializeFromConfHash method to use directly configuration hash object
* Create Lasso server with metadata in buffers rather than XML files

modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/AuthSAML.pm

@@ -8,15 +8,13 @@ package Lemonldap::NG::Portal::AuthSAML;
 use strict;
 use Lemonldap::NG::Portal::Simple;
 use Lemonldap::NG::Portal::_SAML;    #inherits
+use Lemonldap::NG::Common::Conf::SAML::Metadata;
 
 our $VERSION = '0.1';
 
-our $metadata_dir             = "/tmp";
-our $service_metadata_file    = $metadata_dir . "/metadata.xml";
-our $service_private_key_file = $metadata_dir . "/private-key.pem";
-
 ## @apmethod int authInit()
 # Load Lasso and metadata
+# TODO - cache Lasso::Server
 # @return Lemonldap::NG::Portal error code
 sub authInit {
     my $self = shift;
@@ -27,15 +25,27 @@ sub authInit {
     # Activate SOAP
     $self->{Soap} = 1;
 
-    # Load service metadata
-    unless ( -r $service_metadata_file || -r $service_private_key_file ) {
-
-        # TODO - serialize XML from configuration data
-        # TODO - use a test to rebuild XML if file is too old
+    # Check presence of service metadata in configuration
+    return PE_ERROR unless $self->{samlServiceMetaData};
+
+    # Get metadata from configuration
+    my $service_metadata = Lemonldap::NG::Common::Conf::SAML::Metadata->new();
+    unless (
+        $service_metadata->initializeFromConfHash(
+            $self->{samlServiceMetaData}
+        )
+      )
+    {
+        $self->lmLog( "Fail to read Service Metadata from configuration",
+            'error' );
+        return PE_ERROR;
     }
 
-    my $server =
-      $self->createServer( $service_metadata_file, $service_private_key_file );
+    # Create Lasso server with service metadata
+    # Provate key has to be inside service metadata
+    my $xml = $service_metadata->toXML();
+
+    my $server = $self->createServer($xml);
 
     return PE_ERROR unless $server;
 

modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_SAML.pm

@@ -18,6 +18,9 @@ our $VERSION = '0.01';
 sub loadLasso {
     my $self = shift;
 
+    # Do not load Lasso twice
+    return 1 if $self->{_lasso};
+
     # Load Lasso.pm
     eval { use Lasso; };
     if ($@) {
@@ -26,21 +29,21 @@ sub loadLasso {
         return 0;
     }
 
-    # Check version
+    # Check Lasso version >= 2.2.91
     my $lasso_check_version_mode = Lasso::Constants::CHECK_VERSION_NUMERIC;
-
-# TODO - wait for perl binding correction
-# See http://perso.entrouvert.org/~bdauvergne/git/cgit.cgi?url=lasso-perso/commit/&h=release-2.2.91&id=2da646f9629f3e148fce619ff7de322dbb34cd8d
-    my $check_version = 1;
-
-#    my $check_version = Lasso::check_version( 2, 2, 91, $lasso_check_version_mode );
+    my $check_version =
+      Lasso::check_version( 2, 2, 91, $lasso_check_version_mode );
 
     unless ($check_version) {
-        $self->lmLog( 'Lasso version too old', 'error' );
+        $self->lmLog( 'Lasso version >= 2.2.91 required', 'error' );
         return 0;
     }
 
     $self->lmLog( "Module Lasso loaded", 'debug' );
+
+    # Remember we have loaded Lasso
+    $self->{_lasso} = 1;
+
     return 1;
 }
 
@@ -69,24 +72,24 @@ sub checkLassoError {
 
 ## @method Lasso::Server createServer(string metadata, string private key, string private key password, string certificate)
 # Load service metadata and create Lasso::Server object
-# @param string metadata file
-# @param string private key
-# @param string private key password
-# @param string certificate
+# @param string metadata
+# @param string optional private key
+# @param string optional private key password
+# @param string optional certificate
 # @return Lasso::Server object
 sub createServer {
     my $self                 = shift;
     my $metadata             = shift;
-    my $private_key          = shift;
-    my $private_key_password = shift;
-    my $certificate          = shift;
+    my $private_key          = shift || '';
+    my $private_key_password = shift || '';
+    my $certificate          = shift || '';
 
-    my $server =
-      new Lasso::Server( $metadata, $private_key, $private_key_password,
-        $certificate );
+    my $server = Lasso::Server::new_from_buffers( $metadata, $private_key,
+        $private_key_password, $certificate );
 
     unless ($server) {
         $self->lmLog( 'Unable to create Lasso server', 'error' );
+        return;
     }
 
     $self->lmLog( 'Lasso server dump ' . Lasso::Server::dump($server),