Add new options for new location plugin (#2325)

doc/sources/admin/newlocationwarning.rst

@@ -31,7 +31,7 @@ Just enable it in the Manager (section ``General Parameters`` > ``Advanced param
 
    Following variables are available in:
 
-   \* Warning email body => ``$newLocationIP``, ``$newLocationDate``, ``$newLocationHost``, ``$newLocationUserAgent``
+   \* Warning email body => ``$newLocation``, ``$newLocationDate``, ``$newLocationUserAgent``
 
 .. |image0| image:: /documentation/beta.png
    :width: 100px

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

@@ -186,7 +186,9 @@ sub defaultValues {
         'multiValuesSeparator'   => '; ',
         'mySessionAuthorizedRWKeys' =>
           [ '_appsListOrder', '_oidcConnectedRP', '_oidcConsents' ],
-        'newLocationWarningMailAttribute' => 'mail',
+        'newLocationWarningLocationAttribute'        => 'ipAddr',
+        'newLocationWarningLocationDisplayAttribute' => '',
+        'newLocationWarningMaxValues'                => '0',
         'notificationDefaultCond'                    => '',
         'notificationServerPOST'                     => 1,
         'notificationServerSentAttributes' =>

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

@@ -2071,8 +2071,15 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
             'default' => 0,
             'type'    => 'bool'
         },
+        'newLocationWarningLocationAttribute' => {
+            'default' => 'ipAddr',
+            'type'    => 'text'
+        },
+        'newLocationWarningLocationDisplayAttribute' => {
+            'default' => '',
+            'type'    => 'text'
+        },
         'newLocationWarningMailAttribute' => {
-            'default' => 'mail',
             'type' => 'text'
         },
         'newLocationWarningMailBody' => {
@@ -2081,6 +2088,10 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
         'newLocationWarningMailSubject' => {
             'type' => 'text'
         },
+        'newLocationWarningMaxValues' => {
+            'default' => '0',
+            'type'    => 'int'
+        },
         'nginxCustomHandlers' => {
             'keyTest' => qr/^\w+$/,
             'msgFail' => '__badPerlPackageName__',

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

@@ -584,9 +584,23 @@ sub attributes {
             type          => 'bool',
             documentation => 'Enable New Location Warning', 
         },
+        newLocationWarningLocationAttribute => {
+            type          => 'text',
+            default       => 'ipAddr',
+            documentation => 'New location session attribute',
+        },
+        newLocationWarningLocationDisplayAttribute => {
+            type          => 'text',
+            default       => '',
+            documentation => 'New location session attribute for user display',
+        },
+        newLocationWarningMaxValues => {
+            type          => 'int',
+            default       => '0',
+            documentation => 'How many previous locations should be compared',
+        },
         newLocationWarningMailAttribute => {
             type          => 'text',
-            default       => 'mail',
             documentation => 'New location warning mail session attribute',
         },
         newLocationWarningMailBody => {

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

@@ -1050,6 +1050,9 @@ sub tree {
                                     form  => 'simpleInputContainer',
                                     nodes => [
                                         'newLocationWarning',
+                                        'newLocationWarningLocationAttribute',
+                                        'newLocationWarningLocationDisplayAttribute',
+                                        'newLocationWarningMaxValues',
                                         'newLocationWarningMailAttribute',
                                         'newLocationWarningMailSubject',
                                         'newLocationWarningMailBody'

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

@@ -180,8 +180,8 @@
 "cfgLog":"Summary",
 "cfgVersion":"عملية ضبط الإصدارات",
 "checkDevOps":"تفعيل",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"تفعيل",
 "checkStateSecret":"سر مشترك",
 "checkUser":"تفعيل",
@@ -569,10 +569,13 @@
 "newGrantRule":"قاعدة منح جديدة",
 "newHost":"خادم جديد",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"استمارة وظيفة replay جديدة",
 "newPostVar":"متغير جديد",
 "newRSAKey":"مفاتيح جديدة",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Summary",
 "cfgVersion":"Configuration version",
 "checkDevOps":"Activation",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"Activation",
 "checkStateSecret":"Shared secret",
 "checkUser":"Activation",
@@ -569,10 +569,13 @@
 "newGrantRule":"New grant rule",
 "newHost":"New host",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"New form replay",
 "newPostVar":"New variable",
 "newRSAKey":"New keys",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Summary",
 "cfgVersion":"Configuration version",
 "checkDevOps":"Activation",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"Activation",
 "checkStateSecret":"Shared secret",
 "checkUser":"Activation",
@@ -569,10 +569,13 @@
 "newGrantRule":"New grant rule",
 "newHost":"New host",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"New form replay",
 "newPostVar":"New variable",
 "newRSAKey":"New keys",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Sumario",
 "cfgVersion":"Configuration version",
 "checkDevOps":"Activación",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"Activación",
 "checkStateSecret":"Secreto compartido",
 "checkUser":"Activación",
@@ -569,10 +569,13 @@
 "newGrantRule":"Nueva regla de admisión",
 "newHost":"Nuevo host",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"New form replay",
 "newPostVar":"Nueva variable",
 "newRSAKey":"Nuevas claves",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Résumé",
 "cfgVersion":"Version de la configuration",
 "checkDevOps":"Activation",
-"checkDevOpsDownload":"Télécharger un fichier",
 "checkDevOpsDisplayNormalizedHeaders":"Afficher les entêtes normalisés",
+"checkDevOpsDownload":"Télécharger un fichier",
 "checkState":"Activation",
 "checkStateSecret":"Secret partagé",
 "checkUser":"Activation",
@@ -569,10 +569,13 @@
 "newGrantRule":"Nouvelle règle d'accès",
 "newHost":"Nouvel hôte",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"Avertissement de nouvelle connexion",
+"newLocationWarningLocationAttribute":"Attribut de session contenant la localisation",
+"newLocationWarningLocationDisplayAttribute":"Attribut de session à afficher",
 "newLocationWarningMailAttribute":"Attribut utilisateur contenant le mail ",
 "newLocationWarningMailBody":"Contenu du mail d'avertissement",
 "newLocationWarningMailSubject":"Sujet du mail d'avertissement",
+"newLocationWarningMaxValues":"Nombre maximum de localisations à mémoriser",
+"newLocationWarnings":"Avertissement de nouvelle connexion",
 "newPost":"Nouveau rejeu de formulaire",
 "newPostVar":"Nouvelle variable",
 "newRSAKey":"Nouvelles clefs",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Summary",
 "cfgVersion":"Versione configurazione",
 "checkDevOps":"Activation",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"Attivazione",
 "checkStateSecret":"Segreto condiviso",
 "checkUser":"Attivazione",
@@ -569,10 +569,13 @@
 "newGrantRule":"Nuova regola di autorizzazione",
 "newHost":"Nuovo host",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"Nuovo formulario di risposta",
 "newPostVar":"Nuova variabile",
 "newRSAKey":"Nuove chiavi",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Podsumowanie",
 "cfgVersion":"Wersja konfiguracji",
 "checkDevOps":"Aktywacja",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"Aktywacja",
 "checkStateSecret":"Współdzielony sekret",
 "checkUser":"Aktywacja",
@@ -569,10 +569,13 @@
 "newGrantRule":"Nowa reguła przyznawania",
 "newHost":"Nowy host",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"Nowy formularz powtórzenia",
 "newPostVar":"Nowa zmienna",
 "newRSAKey":"Nowe klucze",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Özet",
 "cfgVersion":"Yapılandırma sürümü",
 "checkDevOps":"Aktivasyon",
-"checkDevOpsDownload":"Dosyayı indir",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Dosyayı indir",
 "checkState":"Aktivasyon",
 "checkStateSecret":"Paylaşılan sır",
 "checkUser":"Aktivasyon",
@@ -569,10 +569,13 @@
 "newGrantRule":"Yeni imtiyaz kuralı",
 "newHost":"Yeni konak",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"Yeni form tekrarı",
 "newPostVar":"Yeni değişken",
 "newRSAKey":"Yeni anahtarlar",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Summary",
 "cfgVersion":"Phiên bản cấu hình",
 "checkDevOps":"Activation",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"Kích hoạt",
 "checkStateSecret":"Chia sẻ bí mật",
 "checkUser":"Kích hoạt",
@@ -569,10 +569,13 @@
 "newGrantRule":"Quy tắc cấp mới",
 "newHost":"Máy chủ mới",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"Phát lại mẫu mới",
 "newPostVar":"Biến mới",
 "newRSAKey":"Khóa mới",

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

@@ -180,8 +180,8 @@
 "cfgLog":"Summary",
 "cfgVersion":"配置信息",
 "checkDevOps":"Activation",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"激活",
 "checkStateSecret":"Shared secret",
 "checkUser":"激活",
@@ -569,10 +569,13 @@
 "newGrantRule":"New grant rule",
 "newHost":"New host",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"New form replay",
 "newPostVar":"New variable",
 "newRSAKey":"New keys",

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

@@ -180,8 +180,8 @@
 "cfgLog":"概要",
 "cfgVersion":"設定版本",
 "checkDevOps":"啟用",
-"checkDevOpsDownload":"Download file",
 "checkDevOpsDisplayNormalizedHeaders":"Display normalized headers",
+"checkDevOpsDownload":"Download file",
 "checkState":"啟用",
 "checkStateSecret":"已分享的祕密",
 "checkUser":"啟用",
@@ -569,10 +569,13 @@
 "newGrantRule":"新授權規則",
 "newHost":"新主機",
 "newLocationWarning":"Activation",
-"newLocationWarnings":"New location warning",
+"newLocationWarningLocationAttribute":"Session attribute containing location",
+"newLocationWarningLocationDisplayAttribute":"Session attribute to display",
 "newLocationWarningMailAttribute":"Session mail attribute",
 "newLocationWarningMailBody":"Warning mail content",
 "newLocationWarningMailSubject":"Warning mail subject",
+"newLocationWarningMaxValues":"Maximum number of locations to consider",
+"newLocationWarnings":"New location warning",
 "newPost":"新表單重新進行",
 "newPostVar":"新變數",
 "newRSAKey":"新金鑰",