From fa9be07474d653f0a78b653e8cf0b2c700eb56ff Mon Sep 17 00:00:00 2001
From: luissian <chapado.l@gmail.com>
Date: Sat, 12 Feb 2022 11:37:49 +0100
Subject: [PATCH] Fixed security enhance 61.
 https://github.com/BU-ISCIII/iSkyLIMS/issues/61

---
 .../iSkyLIMS_wetlab/configurationSamba.html          |  2 +-
 .../utils/testing_wetlab_configuration.py            | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/iSkyLIMS_wetlab/templates/iSkyLIMS_wetlab/configurationSamba.html b/iSkyLIMS_wetlab/templates/iSkyLIMS_wetlab/configurationSamba.html
index 12eae1674..2825bb214 100644
--- a/iSkyLIMS_wetlab/templates/iSkyLIMS_wetlab/configurationSamba.html
+++ b/iSkyLIMS_wetlab/templates/iSkyLIMS_wetlab/configurationSamba.html
@@ -44,7 +44,7 @@ <h5 style="text-align:center">Your Samba settings are OK</h5>
                             <div class="col-sm-5"><input class="form-control" type="text" required = "required" name="SAMBA_USER_ID" id="SAMBA_USER_ID" value = "{{samba_conf_data.SAMBA_USER_ID}}" size="100" maxlength="100" ></div>
                             <br><br>
                             <label class="col-sm-5  control-label" for="SAMBA_USER_PASSWORD" >Samba User Password</label>
-                            <div class="col-sm-5"><input class="form-control" type="text" required = "required" name="SAMBA_USER_PASSWORD" id="SAMBA_USER_PASSWORD" value = "{{samba_conf_data.SAMBA_USER_PASSWORD}}" size="100" maxlength="100" ></div>
+                            <div class="col-sm-5"><input class="form-control" type="password" required = "required" name="SAMBA_USER_PASSWORD" id="SAMBA_USER_PASSWORD" value = "{{samba_conf_data.SAMBA_USER_PASSWORD}}" size="100" maxlength="100" ></div>
                             <br><br>
                             <label class="col-sm-5  control-label" for="SAMBA_SHARED_FOLDER_NAME" >Samba Folder name</label>
                             <div class="col-sm-5"><input class="form-control" type="text" required = "required" name="SAMBA_SHARED_FOLDER_NAME" id="SAMBA_SHARED_FOLDER_NAME" value = "{{samba_conf_data.SAMBA_SHARED_FOLDER_NAME}}" size="100" maxlength="100" ></div>
diff --git a/iSkyLIMS_wetlab/utils/testing_wetlab_configuration.py b/iSkyLIMS_wetlab/utils/testing_wetlab_configuration.py
index f84e40cfa..4cf408fa3 100644
--- a/iSkyLIMS_wetlab/utils/testing_wetlab_configuration.py
+++ b/iSkyLIMS_wetlab/utils/testing_wetlab_configuration.py
@@ -45,6 +45,18 @@ def get_iSkyLIMS_settings():
         with open (settings_file ,'r') as fh:
             for line in fh:
                 line = line.replace('\n', '')
+                if 'PASSWORD' in line or 'SECRET_KEY' in line:
+                    if not 'VALIDATORS' in line:
+                        
+                        split_line = line.split('=')
+                        if len(split_line) >1:
+                            split_line[1] = 'XXXXXXXXXXXXXXXXXX'
+                            line = ' = '.join(split_line)
+                        else:
+                            split_line = line.split(':')
+                            if len(split_line) > 1:
+                                split_line[1] = 'XXXXXXXXXXXXXXXXXX'
+                            line = ' : '.join(split_line)
                 s_file.append(line)
     except:
         return