suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use apache Base64

This commit is contained in:
zhouhao 2022-06-20 09:49:09 +08:00
parent 35947b3567
commit cb3fd4989e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/enums/CertificateType.java
View File

@ -4,13 +4,13 @@ import lombok.Getter;
import org.jetlinks.community.network.manager.entity.CertificateEntity;
import org.jetlinks.community.network.security.DefaultCertificate;
import java.util.Base64;
import java.util.Collections;
import java.util.List;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
/**
* @author wangzheng
* @see
* @since 1.0
*/
@Getter
@ -19,26 +19,26 @@ public enum CertificateType {
@Override
public DefaultCertificate init(DefaultCertificate certificate, CertificateEntity.CertificateConfig config) {
return certificate
.initPfxKey(Base64.getDecoder().decode(config.getKeystoreBase64()), config.getKeystorePwd())
.initPfxTrust(Base64.getDecoder().decode(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
.initPfxKey(decodeBase64(config.getKeystoreBase64()), config.getKeystorePwd())
.initPfxTrust(decodeBase64(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
}
},
JKS {
@Override
public DefaultCertificate init(DefaultCertificate certificate, CertificateEntity.CertificateConfig config) {
return certificate
.initJksKey(Base64.getDecoder().decode(config.getKeystoreBase64()), config.getKeystorePwd())
.initJksTrust(Base64.getDecoder().decode(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
.initJksKey(decodeBase64(config.getKeystoreBase64()), config.getKeystorePwd())
.initJksTrust(decodeBase64(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
}
},
PEM {
@Override
public DefaultCertificate init(DefaultCertificate certificate, CertificateEntity.CertificateConfig config) {
List<byte[]> keyCert = Collections.singletonList(Base64.getDecoder().decode(config.getKeystoreBase64()));
List<byte[]> keyCert = Collections.singletonList(decodeBase64(config.getKeystoreBase64()));
return certificate
.initPemKey(keyCert, keyCert)
.initPemTrust(Collections.singletonList(Base64.getDecoder().decode(config.getTrustKeyStoreBase64())));
.initPemTrust(Collections.singletonList(decodeBase64(config.getTrustKeyStoreBase64())));
}
};