[KNOWAGE-9595] fix bad decoding for trailing "%"

Author: eng-dedalus

knowage-core/src/main/java/it/eng/spagobi/analiticalmodel/document/handlers/DriversValidationAPI.java

@@ -30,6 +30,7 @@
 import it.eng.spagobi.commons.validation.SpagoBIValidationImpl;
 import it.eng.spagobi.tools.catalogue.metadata.IDrivableBIResource;
 import it.eng.spagobi.utilities.objects.Couple;
+import org.owasp.esapi.errors.EncodingException;
 
 public class DriversValidationAPI {
 
@@ -76,7 +77,7 @@ public List getParametersErrors(IDrivableBIResource object, String role, Abstrac
 			throws Exception {
 		logger.debug("IN");
 		List toReturn = new ArrayList();
-		List drivers = object.getDrivers();
+ 		List drivers = object.getDrivers();
 		if (drivers.isEmpty()) {
 			return toReturn;
 		}
@@ -360,7 +361,12 @@ private List getValidationErrorsOnValuesByLovResult(String lovResult, AbstractDr
 					value = "%";
 				} else {
 					Encoder encoder = OwaspDefaultEncoderFactory.getInstance().getEncoder();
-					value = encoder.decodeFromURL(val);
+					try {
+						value = encoder.decodeFromURL(val);
+					} catch (EncodingException ex) {
+						logger.error("Error decoding value from URL encoding: " + val, ex);
+						value = val;
+					}
 				}
 				String description = null;
 				if (value.equals("")) {

knowage-core/src/main/java/it/eng/spagobi/api/v2/DocumentExecutionResource.java

@@ -1046,7 +1046,12 @@ protected JSONObject decodeRequestParameters(JSONObject requestValParams)
 				String value = String.valueOf(valueObj);
 				// if (!value.equals("%7B%3B%7B") && !value.equalsIgnoreCase("%")) {
 				if (!value.equals("") && !value.equalsIgnoreCase("%")) {
-					toReturn.put(key, encoder.decodeFromURL(value.replaceAll("%", "%25").replace("+", "%2B")));
+					try {
+						toReturn.put(key, encoder.decodeFromURL(value.replaceAll("%", "%25").replace("+", "%2B")));
+					} catch (EncodingException e) {
+						LOGGER.debug("An error occured while decoding parameter with value[" + value + "]" + e);
+						toReturn.put(key, value);
+					}
 				} else {
 					toReturn.put(key, value); // uses the original value for list and %
 				}