From 10be967c750b06749e15bf93ee1c852e65fd502c Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sat, 24 Jun 2017 13:34:10 +0200
Subject: [PATCH] Peer review from a suggested patch from Hiep Lq ->
 IDEMPIERE-3408 Encrypted Field can explore by normal user

---
 org.adempiere.base/src/org/compiere/model/Obscure.java | 10 +++++++++-
 .../src/org/adempiere/webui/component/Textbox.java     | 10 +++++++++-
 .../org/adempiere/webui/panel/ResetPasswordPanel.java  |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.base/src/org/compiere/model/Obscure.java b/org.adempiere.base/src/org/compiere/model/Obscure.java
index 6c7e2a21a5..ef8bc1a7a3 100644
--- a/org.adempiere.base/src/org/compiere/model/Obscure.java
+++ b/org.adempiere.base/src/org/compiere/model/Obscure.java
@@ -89,6 +89,8 @@ public class Obscure extends Object
 	public static final String OBSCURETYPE_ObscureAlphaNumericButFirstLast4 = "A44";
 	/** Obscure AlphaNumeric but last 4 = A04 */
 	public static final String OBSCURETYPE_ObscureAlphaNumericButLast4 = "A04";
+	/** Obscure by asterisk character, use for EncryptedField */
+	public static final String OBSCURETYPE_ObscureAllAsterisk = "AA";
 
 	/** Obscure Type			*/
 	private String 	m_type = OBSCURETYPE_ObscureDigitsButLast4;
@@ -103,7 +105,8 @@ public class Obscure extends Object
 	 */
 	public void setType (String obscureType)
 	{
-		if (obscureType == null || obscureType.equals("904") || obscureType.equals("944") || obscureType.equals("A44") || obscureType.equals("A04"))
+		if (obscureType == null || obscureType.equals("904") || obscureType.equals("944") || obscureType.equals("A44") || obscureType.equals("A04") || 
+				OBSCURETYPE_ObscureAllAsterisk.equals(obscureType))
 		{
 			m_type = obscureType;
 			m_obscuredValue = null;
@@ -161,6 +164,11 @@ public class Obscure extends Object
 			return m_obscuredValue;
 		if (m_clearValue == null || m_clearValue.length() == 0)
 			return m_clearValue;	
+		
+		if (OBSCURETYPE_ObscureAllAsterisk.equals(m_type)){
+			return "**********";
+		}
+
 		//
 		boolean alpha = m_type.charAt(0) == 'A';
 		int clearStart = Integer.parseInt(m_type.substring(1,2));
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java
index de8b39c282..9af12c6d76 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/Textbox.java
@@ -34,7 +34,7 @@ public class Textbox extends org.zkoss.zul.Textbox implements EventListener<Even
     /**
 	 * 
 	 */
-	private static final long serialVersionUID = 2201466028538929955L;
+	private static final long serialVersionUID = -3919623360765045602L;
 
 	private Obscure	m_obscure = null;
 
@@ -118,4 +118,12 @@ public class Textbox extends org.zkoss.zul.Textbox implements EventListener<Even
 				setValue(getValue());
 		}		
 	}
+
+	@Override
+	public void setType(String type) throws WrongValueException {
+		if ("password".equals(type))
+			setObscureType(Obscure.OBSCURETYPE_ObscureAllAsterisk);
+		super.setType(type);
+	}
+
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
index c4825514b0..6890fdfa20 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
@@ -258,6 +258,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
 	    	txtSecurityQuestion.setVisible(false);
 	        
 	    	txtAnswer = new Textbox();
+	    	txtAnswer.setType("password");
 	    	txtAnswer.setId("txtAnswer");
 	//        txtAnswer.setType("password");
 	        txtAnswer.setCols(25);