From 6ec153f3329c8c6b7c6b6b874083b1bd5d6d3392 Mon Sep 17 00:00:00 2001
From: Ricardo Marques <rimarques@suse.com>
Date: Thu, 5 Mar 2020 11:00:28 +0000
Subject: [PATCH] mgr/dashboard: Improve iSCSI CHAP messages

iSCSI username and password can also contain numbers

Fixes: https://tracker.ceph.com/issues/44618

Signed-off-by: Ricardo Marques <rimarques@suse.com>
---
 ...scsi-target-discovery-modal.component.html | 16 +++++-----
 .../iscsi-target-form.component.html          | 32 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
index 3562530be92..8ebdb7d6e06 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.html
@@ -24,8 +24,8 @@
 
             <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('user', formDir, 'pattern')"
-                  i18n>Usernames must have a length of 8 to 64 characters and
-              can only contain letters, '.', '@', '-', '_' or ':'.</span>
+                  i18n>User names must have a length of 8 to 64 characters and can contain
+              alphanumeric characters, '.', '@', '-', '_' or ':'.</span>
           </div>
         </div>
 
@@ -58,8 +58,8 @@
 
             <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('password', formDir, 'pattern')"
-                  i18n>Passwords must have a length of 12 to 16 characters
-              and can only contain letters, '@', '-', '_' or '/'.</span>
+                  i18n>Passwords must have a length of 12 to 16 characters and can contain
+              alphanumeric characters, '@', '-', '_' or '/'.</span>
           </div>
         </div>
 
@@ -81,8 +81,8 @@
 
             <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('mutual_user', formDir, 'pattern')"
-                  i18n>Usernames must have a length of 8 to 64 characters and
-              can only contain letters, '.', '@', '-', '_' or ':'.</span>
+                  i18n>User names must have a length of 8 to 64 characters and can contain
+              alphanumeric characters, '.', '@', '-', '_' or ':'.</span>
           </div>
         </div>
 
@@ -115,8 +115,8 @@
 
             <span class="invalid-feedback"
                   *ngIf="discoveryForm.showError('mutual_password', formDir, 'pattern')"
-                  i18n>Passwords must have a length of 12 to 16 characters and
-              can only contain letters, '@', '-', '_' or '/'.</span>
+                  i18n>Passwords must have a length of 12 to 16 characters and can contain
+              alphanumeric characters, '@', '-', '_' or '/'.</span>
           </div>
         </div>
       </div>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
index 899742549e6..fea6d30f18e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.html
@@ -223,8 +223,8 @@
 
               <span class="invalid-feedback"
                     *ngIf="targetForm.showError('user', formDir, 'pattern')"
-                    i18n>Usernames must have a length of 8 to 64 characters and
-                can only contain letters, '.', '@', '-', '_' or ':'.</span>
+                    i18n>User names must have a length of 8 to 64 characters and can contain
+                alphanumeric characters, '.', '@', '-', '_' or ':'.</span>
             </div>
           </div>
 
@@ -260,8 +260,8 @@
 
               <span class="invalid-feedback"
                     *ngIf="targetForm.showError('password', formDir, 'pattern')"
-                    i18n>Passwords must have a length of 12 to 16 characters
-                and can only contain letters, '@', '-', '_' or '/'.</span>
+                    i18n>Passwords must have a length of 12 to 16 characters and can contain
+                alphanumeric characters, '@', '-', '_' or '/'.</span>
             </div>
           </div>
 
@@ -284,8 +284,8 @@
 
               <span class="invalid-feedback"
                     *ngIf="targetForm.showError('mutual_user', formDir, 'pattern')"
-                    i18n>Usernames must have a length of 8 to 64 characters and
-                can only contain letters, '.', '@', '-', '_' or ':'.</span>
+                    i18n>User names must have a length of 8 to 64 characters and can contain
+                alphanumeric characters, '.', '@', '-', '_' or ':'.</span>
             </div>
           </div>
 
@@ -322,8 +322,8 @@
 
               <span class="invalid-feedback"
                     *ngIf="targetForm.showError('mutual_password', formDir, 'pattern')"
-                    i18n>Passwords must have a length of 12 to 16 characters
-                and can only contain letters, '@', '-', '_' or '/'.</span>
+                    i18n>Passwords must have a length of 12 to 16 characters and can contain
+                alphanumeric characters, '@', '-', '_' or '/'.</span>
             </div>
           </div>
 
@@ -392,8 +392,8 @@
 
                       <span class="invalid-feedback"
                             *ngIf="initiator.showError('user', formDir, 'pattern')"
-                            i18n>Usernames must have a length of 8 to 64 characters and
-                        can only contain letters, '.', '@', '-', '_' or ':'.</span>
+                            i18n>User names must have a length of 8 to 64 characters and can contain
+                        alphanumeric characters, '.', '@', '-', '_' or ':'.</span>
                     </div>
                   </div>
 
@@ -426,8 +426,8 @@
 
                       <span class="invalid-feedback"
                             *ngIf="initiator.showError('password', formDir, 'pattern')"
-                            i18n>Passwords must have a length of 12 to 16 characters
-                        and can only contain letters, '@', '-', '_' or '/'.</span>
+                            i18n>Passwords must have a length of 12 to 16 characters and can contain
+                        alphanumeric characters, '@', '-', '_' or '/'.</span>
                     </div>
                   </div>
 
@@ -450,8 +450,8 @@
 
                       <span class="invalid-feedback"
                             *ngIf="initiator.showError('mutual_user', formDir, 'pattern')"
-                            i18n>Usernames must have a length of 8 to 64 characters and
-                        can only contain letters, '.', '@', '-', '_' or ':'.</span>
+                            i18n>User names must have a length of 8 to 64 characters and can contain
+                        alphanumeric characters, '.', '@', '-', '_' or ':'.</span>
                     </div>
                   </div>
 
@@ -484,8 +484,8 @@
 
                       <span class="invalid-feedback"
                             *ngIf="initiator.showError('mutual_password', formDir, 'pattern')"
-                            i18n>Passwords must have a length of 12 to 16 characters and
-                        can only contain letters, '@', '-', '_' or '/'.</span>
+                            i18n>Passwords must have a length of 12 to 16 characters and can contain
+                        alphanumeric characters, '@', '-', '_' or '/'.</span>
                     </div>
                   </div>
                 </ng-container>