LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slf4j

Browse Source
This commit is contained in:
MaxKey
2021-12-25 09:45:54 +08:00
parent 14fb79ab1b
commit 1140dc1d41
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maxkey-common/src/main/java/org/maxkey/crypto/jwt/encryption/service/impl/RecipientJwtEncryptionAndDecryptionServiceBuilder.java
View File

@@ -23,9 +23,11 @@ package org.maxkey.crypto.jwt.encryption.service.impl;
import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.text.ParseException;
import org.apache.log4j.Logger;
import org.maxkey.crypto.jose.keystore.JWKSetKeyStore;
import org.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.nimbusds.jose.JOSEException;
import com.nimbusds.jose.jwk.JWKSet;
@@ -34,7 +36,7 @@ import com.nimbusds.jose.jwk.JWKSet;
*
*/
public class RecipientJwtEncryptionAndDecryptionServiceBuilder {
final static Logger logger = Logger.getLogger(RecipientJwtEncryptionAndDecryptionServiceBuilder.class);
final static Logger _logger = LoggerFactory.getLogger(RecipientJwtEncryptionAndDecryptionServiceBuilder.class);
//private HttpClient httpClient = HttpClientBuilder.create().useSystemProperties().build();
//private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
@@ -49,11 +51,11 @@ public class RecipientJwtEncryptionAndDecryptionServiceBuilder {
public JwtEncryptionAndDecryptionService serviceBuilder(String jwksUri){
logger.debug("jwksUri : "+jwksUri);
_logger.debug("jwksUri : {}" , jwksUri);
String jsonString ="";//= restTemplate.getForObject(jwksUri, String.class);
logger.debug("jwks json String : "+jsonString);
_logger.debug("jwks json String : {}" , jsonString);
JwtEncryptionAndDecryptionService recipientJwtEncryptionAndDecryptionService;
try {
JWKSet jwkSet = JWKSet.parse(jsonString);

11
maxkey-common/src/main/java/org/maxkey/crypto/jwt/signer/service/impl/SymmetricSigningAndValidationServiceBuilder.java
View File

@@ -24,8 +24,9 @@ import java.security.NoSuchAlgorithmException;
import java.security.spec.InvalidKeySpecException;
import java.util.Map;
import org.apache.log4j.Logger;
import org.maxkey.crypto.jwt.signer.service.JwtSigningAndValidationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableMap;
import com.nimbusds.jose.JOSEException;
@@ -36,7 +37,7 @@ import com.nimbusds.jose.jwk.JWK;
* Builder Symmetric Signing Service
*/
public class SymmetricSigningAndValidationServiceBuilder {
final static Logger logger = Logger.getLogger(SymmetricSigningAndValidationServiceBuilder.class);
final static Logger _logger = LoggerFactory.getLogger(SymmetricSigningAndValidationServiceBuilder.class);
public static final String SYMMETRIC_KEY = "SYMMETRIC-KEY";
/**
*
@@ -46,10 +47,10 @@ public class SymmetricSigningAndValidationServiceBuilder {
}
public JwtSigningAndValidationService serviceBuilder(String sharedSecret){
logger.debug("shared Secret : "+sharedSecret);
logger.debug("Symmetric Id : "+SYMMETRIC_KEY);
_logger.debug("shared Secret : {}" , sharedSecret);
_logger.debug("Symmetric Id : {}" , SYMMETRIC_KEY);
if (sharedSecret == null) {
logger.error("Couldn't create symmetric SigningAndValidation");
_logger.error("Couldn't create symmetric SigningAndValidation");
return null;
}