yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化过滤器逻辑

Browse Source
This commit is contained in:
zz 2021-10-28 16:04:02 +08:00
parent 5bd7fea731
commit f4c488d763
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java
View File

@ -298,15 +298,12 @@ public class EvcsFilter extends OncePerRequestFilter {
String computedSig = HMAC.hmacDigest( String computedSig = HMAC.hmacDigest(
operatorIDNode.asText().concat(dataNode.asText()).concat(timestampNode.asText()).concat(seqNode.asText()), operatorIDNode.asText().concat(dataNode.asText()).concat(timestampNode.asText()).concat(seqNode.asText()),
authSecretToken.getSigSecret()); 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)); throw new InvalidAlgorithmParameterException("Illegal Sig, computed: ".concat(computedSig));
} }
String rawData = dataNode.asText(); String rawData = dataNode.asText();
String decryptedData; String decryptedData = rawData;
if (rawData.startsWith("{")) { if ((encin == null || encin.equals("true")) || authSecretToken.isEncrypt()) {
decryptedData = rawData;
// ((ObjectNode) rootNode).put("Data", rawData);
} else {
decryptedData = Aes128Cbc.decryptString(rawData, authSecretToken.getDataSecret(), decryptedData = Aes128Cbc.decryptString(rawData, authSecretToken.getDataSecret(),
authSecretToken.getDataSecretIV()); authSecretToken.getDataSecretIV());
((ObjectNode) rootNode).put("Data", decryptedData); ((ObjectNode) rootNode).put("Data", decryptedData);