Merge branch 'master' of gitlab.ow2.org:lemonldap-ng/lemonldap-ng

fastcgi-server/man/llng-fastcgi-server.1p

@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "llng-fastcgi-server 1"
-.TH llng-fastcgi-server 1 "2018-05-22" "perl v5.26.2" "User Contributed Perl Documentation"
+.TH llng-fastcgi-server 1 "2018-05-29" "perl v5.26.2" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

lemonldap-ng-handler/MANIFEST

@@ -8,6 +8,7 @@ lib/Lemonldap/NG/Handler/ApacheMP2.pm
 lib/Lemonldap/NG/Handler/ApacheMP2/AuthBasic.pm
 lib/Lemonldap/NG/Handler/ApacheMP2/CDA.pm
 lib/Lemonldap/NG/Handler/ApacheMP2/DevOps.pm
+lib/Lemonldap/NG/Handler/ApacheMP2/DevOpsST.pm
 lib/Lemonldap/NG/Handler/ApacheMP2/FCGIClient.pm
 lib/Lemonldap/NG/Handler/ApacheMP2/Main.pm
 lib/Lemonldap/NG/Handler/ApacheMP2/Menu.pm
@@ -40,6 +41,7 @@ lib/Lemonldap/NG/Handler/Server.pm
 lib/Lemonldap/NG/Handler/Server/AuthBasic.pm
 lib/Lemonldap/NG/Handler/Server/CDA.pm
 lib/Lemonldap/NG/Handler/Server/DevOps.pm
+lib/Lemonldap/NG/Handler/Server/DevOpsST.pm
 lib/Lemonldap/NG/Handler/Server/Main.pm
 lib/Lemonldap/NG/Handler/Server/Nginx.pm
 lib/Lemonldap/NG/Handler/Server/SecureToken.pm

lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/DevOpsST.pm

@@ -0,0 +1,14 @@
+# LLNG wrapper class to enable DevOps+ServiceToken handler with Apache-2/ModPerl-2
+#
+# See http://lemonldap-ng.org/documentation/latest/handlerarch
+package Lemonldap::NG::Handler::ApacheMP2::DevOpsST;
+
+use strict;
+
+use base 'Lemonldap::NG::Handler::Lib::DevOps',
+  'Lemonldap::NG::Handler::Lib::ServiceToken',
+  'Lemonldap::NG::Handler::ApacheMP2::Main';
+
+our $VERSION = '2.0.0';
+
+1;

lemonldap-ng-handler/lib/Lemonldap/NG/Handler/ApacheMP2/FCGIClient.pm

@@ -118,6 +118,7 @@ In apache2.conf:
     PerlHeaderParserHandler Lemonldap::NG::Handler::ApacheMP2::FCGIClient
     PerlSetVar LLNG_SERVER 127.0.0.1:9090
     PerlSetVar VHOSTTYPE DevOps
+    # or PerlSetVar VHOSTTYPE DevOpsST
     PerlSetVar RULES_URL http://app.tld/rules.json
     ...
   </VirtualHost>

lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Server/DevOpsST.pm

@@ -0,0 +1,14 @@
+# LLNG wrapper class to enable DevOps+ServiceToken handler with FastCGI handler
+#
+# See http://lemonldap-ng.org/documentation/latest/handlerarch
+package Lemonldap::NG::Handler::Server::DevOpsST;
+
+use strict;
+
+use base 'Lemonldap::NG::Handler::Lib::DevOps',
+  'Lemonldap::NG::Handler::Lib::ServiceToken',
+  'Lemonldap::NG::Handler::Server::Main';
+
+our $VERSION = '2.0.0';
+
+1;

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -3410,6 +3410,10 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                     'k' => 'DevOps',
                     'v' => 'DevOps'
                 },
+                {
+                    'k' => 'DevOpsST',
+                    'v' => 'DevOpsST'
+                },
                 {
                     'k' => 'ServiceToken',
                     'v' => 'ServiceToken'

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -1482,6 +1482,7 @@ sub attributes {
                 { k => 'SecureToken',  v => 'SecureToken' },
                 { k => 'CDA',          v => 'CDA' },
                 { k => 'DevOps',       v => 'DevOps' },
+                { k => 'DevOpsST',     v => 'DevOpsST' },
                 { k => 'ServiceToken', v => 'ServiceToken' },
             ],
             default       => 'Main',

lemonldap-ng-manager/site/htdocs/static/js/conftree.js

@@ -1111,6 +1111,10 @@ function templates(tpl,key) {
                   "k" : "DevOps",
                   "v" : "DevOps"
                },
+               {
+                  "k" : "DevOpsST",
+                  "v" : "DevOpsST"
+               },
                {
                   "k" : "ServiceToken",
                   "v" : "ServiceToken"