From f4c488d76361ab87364524638579b7a568a2b9f8 Mon Sep 17 00:00:00 2001 From: zz Date: Thu, 28 Oct 2021 16:04:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=87=E6=BB=A4=E5=99=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/evcs/config/EvcsFilter.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java index c40dc2f2..bf3d2d27 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java @@ -298,15 +298,12 @@ public class EvcsFilter extends OncePerRequestFilter { String computedSig = HMAC.hmacDigest( operatorIDNode.asText().concat(dataNode.asText()).concat(timestampNode.asText()).concat(seqNode.asText()), authSecretToken.getSigSecret()); - if ((encin != null && !"false".equals(encin)) && !computedSig.equals(sigNode.asText())) { + if ((encin == null || !"false".equals(encin)) && !computedSig.equals(sigNode.asText())) { throw new InvalidAlgorithmParameterException("Illegal Sig, computed: ".concat(computedSig)); } String rawData = dataNode.asText(); - String decryptedData; - if (rawData.startsWith("{")) { - decryptedData = rawData; -// ((ObjectNode) rootNode).put("Data", rawData); - } else { + String decryptedData = rawData; + if ((encin == null || encin.equals("true")) || authSecretToken.isEncrypt()) { decryptedData = Aes128Cbc.decryptString(rawData, authSecretToken.getDataSecret(), authSecretToken.getDataSecretIV()); ((ObjectNode) rootNode).put("Data", decryptedData);