From 5ffd909d7d8a03e3c7fb47b2e61de5f831e99b5d Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Tue, 16 Nov 2021 22:45:25 +0100
Subject: [PATCH] Harmonize regex (#2657)

---
 lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm  | 4 ++--
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugins.pm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm
index 61fafca02..4a1bef58b 100644
--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm
@@ -45,7 +45,7 @@ sub build_jail {
     $self->useSafeJail(1) unless defined $self->useSafeJail;
 
     if ($require) {
-        foreach my $f ( split /[, ]+/, $require ) {
+        foreach my $f ( split /[,\s]+/, $require ) {
             if ( $f =~ /^[\w\:]+$/ ) {
                 eval "require $f";
             }
@@ -63,7 +63,7 @@ sub build_jail {
 
     if ($build) {
         @builtCustomFunctions =
-          $self->customFunctions ? split( /\s+/, $self->customFunctions ) : ();
+          $self->customFunctions ? split( /[,\s]+/, $self->customFunctions ) : ();
         foreach (@builtCustomFunctions) {
             no warnings 'redefine';
             $api->logger->debug("Custom function: $_");
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugins.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugins.pm
index dd3657b5d..cbebe74cd 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugins.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Plugins.pm
@@ -96,7 +96,7 @@ sub enabledPlugins {
     # Check if custom plugins are required
     if ( $conf->{customPlugins} ) {
         $self->logger->debug( 'Custom plugins: ' . $conf->{customPlugins} );
-        push @res, grep ( /\w+/, split( /,\s*/, $conf->{customPlugins} ) );
+        push @res, grep ( /\w+/, split( /[,\s]+/, $conf->{customPlugins} ) );
     }
 
     # Impersonation overwrites req->step and pops 'afterData' EP.