From 1517272ca7dbb5e571fd3064e3d4d339d4d01d9b Mon Sep 17 00:00:00 2001
From: Xavier Guimard <x.guimard@free.fr>
Date: Tue, 19 Jun 2018 20:56:13 +0200
Subject: [PATCH] Remove WARNING_BITS (#595)

---
 .../lib/Lemonldap/NG/Manager/Attributes.pm    | 124 ++++++------------
 .../lib/Lemonldap/NG/Manager/Build.pm         |   1 +
 2 files changed, 38 insertions(+), 87 deletions(-)

diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
index 7218818ac..f07dcc70e 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
@@ -8,12 +8,12 @@ sub types {
         'authParamsText' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'blackWhiteList' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'bool' => {
             'msgFail' => '__notABoolean__',
@@ -24,11 +24,6 @@ sub types {
             'test'    => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -36,17 +31,17 @@ sub types {
                         split( /\n/, $@, 0 ) )
                 );
                 return $err ? ( 1, "__badExpression__: $err" ) : 1;
-              }
+            }
         },
         'catAndAppList' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'file' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'hostname' => {
             'form'    => 'text',
@@ -80,48 +75,48 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                       if $_ =~ /exportedvars$/i and defined $conf->{$_}{$val};
                 }
                 return 1, "__unknownAttrOrMacro__: $val";
-              }
+            }
         },
         'longtext' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'menuApp' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'menuCat' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'oidcmetadatajson' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'oidcmetadatajwks' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'oidcOPMetaDataNode' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'oidcRPMetaDataNode' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'password' => {
             'msgFail' => '__malformedValue__',
             'test'    => sub {
                 1;
-              }
+            }
         },
         'pcre' => {
             'form' => 'text',
@@ -132,7 +127,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                       }
                 };
                 return $@ ? ( 0, "__badRegexp__: $@" ) : 1;
-              }
+            }
         },
         'PerlModule' => {
             'form'    => 'text',
@@ -142,17 +137,17 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
         'portalskin' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'portalskinbackground' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'post' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'RSAPrivateKey' => {
             'test' => sub {
@@ -160,7 +155,7 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
 m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\nDEK-Info:.*\r?\n[\r\n]*)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:RSA\s+)PRIVATE\s+KEY\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-              }
+            }
         },
         'RSAPublicKey' => {
             'test' => sub {
@@ -168,7 +163,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:RSA\s+)?PRIVATE\s+KEY\s*\-+\r?\n)?(?:Proc-Type:.*\r?\n
 m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+PUBLIC\s+KEY\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-              }
+            }
         },
         'RSAPublicKeyOrCertificate' => {
             'test' => sub {
@@ -176,37 +171,37 @@ m[^(?:(?:\-+\s*BEGIN\s+PUBLIC\s+KEY\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\
 m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\n]+={0,2}(?:\r?\n\-+\s*END\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+)?[\r\n]*)?$]s
                   ? 1
                   : ( 1, '__badPemEncoding__' );
-              }
+            }
         },
         'rule' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'samlAssertion' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'samlAttribute' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'samlIDPMetaDataNode' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'samlService' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'samlSPMetaDataNode' => {
             'test' => sub {
                 1;
-              }
+            }
         },
         'select' => {
             'test' => sub {
@@ -216,19 +211,19 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\
                 return $test
                   ? 1
                   : ( 1, "Invalid value '$_[0]' for this select" );
-              }
+            }
         },
         'subContainer' => {
             'keyTest' => qr/\w/,
             'test'    => sub {
                 1;
-              }
+            }
         },
         'text' => {
             'msgFail' => '__malformedValue__',
             'test'    => sub {
                 1;
-              }
+            }
         },
         'trool' => {
             'msgFail' => '__authorizedValues__: -1, 0, 1',
@@ -659,11 +654,6 @@ sub attributes {
             'test' => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -1033,11 +1023,6 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                 'test'       => sub {
                     my ( $val, $conf ) = @_;
                     my $s = $val;
-
-                    BEGIN {
-                        ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                    }
                     eval $s;
                     my $err = join(
                         '',
@@ -1045,7 +1030,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                             split( /\n/, $@, 0 ) )
                     );
                     return $err ? ( 1, "__badExpression__: $err" ) : 1;
-                  }
+                }
             },
             'type' => 'keyTextContainer'
         },
@@ -1118,11 +1103,6 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
             'keyTest' => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -1141,11 +1121,6 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
             'test'    => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -1220,7 +1195,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0-
                           and defined $conf->{$_}{$val};
                     }
                     return 1, "__unknownAttrOrMacro__: $val";
-                  }
+                }
             },
             'type' => 'doubleHash'
         },
@@ -1496,11 +1471,6 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                           : ( 0, '__badUrl__' );
                     }
                     $s =~ s/\b(accept|deny|unprotect|skip)\b/1/g;
-
-                    BEGIN {
-                        ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                    }
                     eval $s;
                     my $err = join(
                         '',
@@ -1508,7 +1478,7 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
                             split( /\n/, $@, 0 ) )
                     );
                     return $err ? ( 1, "__badExpression__: $err" ) : 1;
-                  }
+                }
             },
             'type' => 'ruleContainer'
         },
@@ -1542,11 +1512,6 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
             'test'       => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -1901,11 +1866,6 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
             'test' => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -2238,11 +2198,6 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
             'keyTest'    => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -2955,11 +2910,6 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'test' => sub {
                 my ( $val, $conf ) = @_;
                 my $s = '';
-
-                BEGIN {
-                    ${^WARNING_BITS} =
-"\x54\x55\x55\x55\x15\x55\x55\x55\x55\x55\x51\x55\x55\x55\x55\x55\x55";
-                }
                 eval "$s $val";
                 my $err = join(
                     '',
@@ -3037,19 +2987,19 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'default' => 0,
             'select'  => [
                 {
-                    'k' => 0,
+                    'k' => '0',
                     'v' => 'unsecuredCookie'
                 },
                 {
-                    'k' => 1,
+                    'k' => '1',
                     'v' => 'securedCookie'
                 },
                 {
-                    'k' => 2,
+                    'k' => '2',
                     'v' => 'doubleCookie'
                 },
                 {
-                    'k' => 3,
+                    'k' => '3',
                     'v' => 'doubleCookieForSingleSession'
                 }
             ],
diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
index 9c9c9fe9e..e07a33dbb 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build.pm
@@ -418,6 +418,7 @@ sub mydump {
     my ( $obj, $subname ) = @_;
     my $t = Dumper($obj);
     $t =~ s/^\s*(?:use strict;|package .*?;|)\n//gm;
+    $t =~ s/\n\s*BEGIN.*?\}\n/\n/sg;
     $t =~ s/^\$VAR1\s*=/sub $subname {\n    return/;
     return $t;
 }