UTOTP manager part (#1391)

ToDo: self-registration + tests

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

@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "llng-fastcgi-server 1"
-.TH llng-fastcgi-server 1 "2018-02-22" "perl v5.26.1" "User Contributed Perl Documentation"
+.TH llng-fastcgi-server 1 "2018-03-14" "perl v5.26.1" "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-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

@@ -255,6 +255,7 @@ sub defaultValues {
         'userDB'                                  => 'Same',
         'useRedirectOnError'                      => 1,
         'useSafeJail'                             => 1,
+        'utotp2fActivation'                       => 0,
         'webIDAuthnLevel'                         => 1,
         'webIDExportedVars'                       => {},
         'whatToTrace'                             => 'uid',

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

@@ -1066,6 +1066,9 @@ qr/^(?:\*\.)?(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][
         'ext2fAuthnLevel' => {
             'type' => 'int'
         },
+        'ext2fLogo' => {
+            'type' => 'text'
+        },
         'ext2FSendCommand' => {
             'type' => 'text'
         },
@@ -2387,6 +2390,9 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
         'rest2fInitUrl' => {
             'type' => 'url'
         },
+        'rest2fLogo' => {
+            'type' => 'text'
+        },
         'rest2fVerifyArgs' => {
             'type' => 'keyTextContainer'
         },
@@ -3309,6 +3315,17 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
             'default' => 1,
             'type'    => 'bool'
         },
+        'utotp2fActivation' => {
+            'default' => 0,
+            'type'    => 'boolOrExpr'
+        },
+        'utotp2fAuthnLevel' => {
+            'type' => 'int'
+        },
+        'utotp2fSelfRegistration' => {
+            'default' => 0,
+            'type'    => 'bool'
+        },
         'vhostAliases' => {
             'type' => 'text'
         },

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

@@ -1109,6 +1109,23 @@ sub attributes {
             documentation => 'Number of digits for TOTP code',
         },
 
+        # UTOTP 2F
+        utotp2fActivation => {
+            type          => 'boolOrExpr',
+            default       => 0,
+            documentation => 'UTOTP activation (mixed U2F/TOTP module)',
+        },
+        utotp2fSelfRegistration => {
+            type          => 'bool',
+            default       => 0,
+            documentation => 'UTOTP self registration activation',
+        },
+        utotp2fAuthnLevel => {
+            type => 'int',
+            documentation =>
+'Authentication level for users authentified by password+(U2F or TOTP)'
+        },
+
         # External second factor
         ext2fActivation => {
             type          => 'boolOrExpr',

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

@@ -649,6 +649,16 @@ sub tree {
                 {
                     title => 'secondFactors',
                     nodes => [
+                        {
+                            title => 'utotp2f',
+                            help  => 'utotp2f.html',
+                            form  => 'simpleInputContainer',
+                            nodes => [
+                                'utotp2fActivation',
+                                'utotp2fSelfRegistration',
+                                'utotp2fAuthnLevel'
+                            ]
+                        },
                         {
                             title => 'u2f',
                             help  => 'u2f.html',

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -752,11 +752,15 @@
 "useRedirectOnError":"إعادة التوجيه على الخطأ",
 "useRedirectOnForbidden":"ممنوع إعادة التوجيه ",
 "useSafeJail":"استخدام السجن الآمن",
+"utotp2f":"TOTP-or-U2F",
+"utotp2fActivation":"Activation",
+"utotp2fAuthnLevel":"Authentication level",
+"utotp2fSelfRegistration":"Self registration",
 "value":"القيمة",
 "values":"القيم",
 "variables":"المتغيرات",
-"version":"الإصدار",
 "verifyU2FKey":"Verify U2F key",
+"version":"الإصدار",
 "vhostAliases":"اسماء مستعارة",
 "vhostAuthnLevel":"مستوى إثبات الهوية  واجب",
 "vhostHttps":"إتش تي تي بي س",

lemonldap-ng-manager/site/htdocs/static/languages/en.json

@@ -752,11 +752,15 @@
 "useRedirectOnError":"Redirect on error",
 "useRedirectOnForbidden":"Redirect on forbidden",
 "useSafeJail":"Use Safe jail",
+"utotp2f":"TOTP-or-U2F",
+"utotp2fActivation":"Activation",
+"utotp2fAuthnLevel":"Authentication level",
+"utotp2fSelfRegistration":"Self registration",
 "value":"Value",
 "values":"Values",
 "variables":"Variables",
-"version":"Version",
 "verifyU2FKey":"Verify U2F key",
+"version":"Version",
 "vhostAliases":"Aliases",
 "vhostAuthnLevel":"Required authentication level",
 "vhostHttps":"HTTPS",

lemonldap-ng-manager/site/htdocs/static/languages/fr.json

@@ -752,6 +752,10 @@
 "useRedirectOnError":"Redirection pour les erreurs",
 "useRedirectOnForbidden":"Redirection pour les accès interdits",
 "useSafeJail":"Utiliser la cage Safe",
+"utotp2f":"TOTP-ou-U2F",
+"utotp2fActivation":"Activation",
+"utotp2fAuthnLevel":"Niveau d'authentification",
+"utotp2fSelfRegistration":"Auto-enregistrement",
 "value":"Valeur",
 "values":"Valeurs",
 "variables":"Variables",

lemonldap-ng-manager/site/htdocs/static/languages/it.json

@@ -752,11 +752,15 @@
 "useRedirectOnError":"Redirect su errore",
 "useRedirectOnForbidden":"Redirect su proibito",
 "useSafeJail":"Utilizza Safe jail",
+"utotp2f":"TOTP-or-U2F",
+"utotp2fActivation":"Activation",
+"utotp2fAuthnLevel":"Authentication level",
+"utotp2fSelfRegistration":"Self registration",
 "value":"Valore",
 "values":"Valori",
 "variables":"Variabili",
-"version":"Versioni",
 "verifyU2FKey":"Verify U2F key",
+"version":"Versioni",
 "vhostAliases":"Alias",
 "vhostAuthnLevel":"Livello di autenticazione richiesto",
 "vhostHttps":"HTTPS",

lemonldap-ng-manager/site/htdocs/static/languages/vi.json

@@ -752,11 +752,15 @@
 "useRedirectOnError":"Chuyển hướng về lỗi",
 "useRedirectOnForbidden":"Chuyển hướng trên trang bị cấm",
 "useSafeJail":"Sử dụng Safe jail",
+"utotp2f":"TOTP-or-U2F",
+"utotp2fActivation":"Activation",
+"utotp2fAuthnLevel":"Authentication level",
+"utotp2fSelfRegistration":"Self registration",
 "value":"Giá trị",
 "values":"Giá trị",
 "variables":"biến",
-"version":"Phiên bản",
 "verifyU2FKey":"Verify U2F key",
+"version":"Phiên bản",
 "vhostAliases":"Bí danh",
 "vhostAuthnLevel":"Mức xác thực bắt buộc",
 "vhostHttps":"HTTPS",