Merge branch 'backport-password-changes' into release_3_6

3liz · Sep 20, 2023 · 385074a · 385074a
2 parents 4a9707a + 75174c8
commit 385074a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 59 deletions.
diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
@@ -19,6 +19,8 @@ with some extra keywords : backend, tests, test, translation, funders, important
 * Fix some grammar
 * Allow import/export in selection tool
 * Fix 500 error in the administration panel when the "Lizmap server" plugin was not found
+* Fix increase the login length in the database in order to use email as logins
+* the minimal length of password is now 12 characters to improve the security
 
 ### Translations
 

diff --git a/lizmap/app/overloads/jcommunity/forms/registration.form.xml b/lizmap/app/overloads/jcommunity/forms/registration.form.xml
@@ -9,11 +9,11 @@
     @link         http://jelix.org
     @licence      http://www.gnu.org/licenses/gpl.html GNU General Public Licence, see LICENCE file
     -->
-    <input ref="reg_login" required="true">
+    <input ref="reg_login" required="true" minlength="3" maxlength="255">
         <label locale="jcommunity~account.form.login"/>
     </input>
 
-    <input ref="reg_email"  required="true" type="email">
+    <input ref="reg_email"  required="true" type="email" maxlength="255">
         <label locale="jcommunity~account.form.email"/>
     </input>
 
@@ -29,7 +29,7 @@
         <label locale="view~user.form.organization.label"/>
     </input>
 
-    <secret ref="reg_password"  required="true" minlength="8" maxlength="120">
+    <secret ref="reg_password"  required="true" minlength="12" maxlength="120">
         <label locale="jcommunity~account.form.password"/>
         <help locale="jcommunity~account.form.password.help"/>
         <confirm locale="jcommunity~account.form.password.confirm" />

diff --git a/lizmap/app/themes/default/jauthdb_admin/password_change.tpl b/lizmap/app/themes/default/jauthdb_admin/password_change.tpl
diff --git a/lizmap/composer.json b/lizmap/composer.json
@@ -7,9 +7,9 @@
   ],
   "require": {
     "php": ">=7.4",
-    "jelix/jelix": "~1.8.2",
+    "jelix/jelix": "dev-jelix-1.8.x",
     "jelix/composer-module-setup": "^1.0.6",
-    "jelix/jcommunity-module": "~1.3.20",
+    "jelix/jcommunity-module": "1.4.0-beta.1",
     "jelix/ldapdao-module": "~2.2.4",
     "proj4php/proj4php": "dev-proj4php5.2",
     "violet/streaming-json-encoder": "^1.1.5",

diff --git a/lizmap/modules/lizmap/daos/user.dao.xml b/lizmap/modules/lizmap/daos/user.dao.xml
@@ -5,7 +5,7 @@
     </datasources>
     <record>
         <property name="login" fieldname="usr_login"
-                  required="yes" datatype="string"  maxlength="50" />
+                  required="yes" datatype="string"  maxlength="255" />
 
         <property name="email" fieldname="usr_email"
                   datatype="string" required="yes" maxlength="255" />

diff --git a/lizmap/modules/lizmap/forms/account_admin.form.xml b/lizmap/modules/lizmap/forms/account_admin.form.xml
@@ -6,15 +6,15 @@
      -->
 
 
-    <input ref="login" required="true" minlength="3" maxlength="50">
+    <input ref="login" required="true" minlength="3" maxlength="255">
         <label locale="jcommunity~account.form.login"/>
     </input>
 
     <input ref="email"  required="true" type="email">
         <label locale="jcommunity~account.form.email"/>
     </input>
 
-    <secret ref="password" minlength="8" maxlength="120">
+    <secret ref="password" minlength="12" maxlength="120">
         <label locale="jcommunity~account.form.password"/>
         <help locale="jcommunity~account.form.password.help"/>
         <confirm locale="jcommunity~account.form.password.confirm"/>
@@ -70,11 +70,11 @@
         <label locale="jcommunity~account.form.keyactivate"/>
     </output>
 
-    <output ref="request_date">
+    <output ref="request_date" type="localedatetime">
         <label locale="jcommunity~account.form.requestdate"/>
     </output>
 
-    <output ref="create_date">
+    <output ref="create_date" type="localedatetime">
         <label locale="jcommunity~account.form.createdate"/>
     </output>