优化过滤器逻辑

This commit is contained in:
zz 2021-10-28 16:04:02 +08:00
parent 5bd7fea731
commit f4c488d763

View File

@ -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);