Skip to content

support empty cert signer class to disable cert signing #2926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
havetisyan merged 1 commit into from
Apr 7, 2025
+29 −0
Merged

support empty cert signer class to disable cert signing #2926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions servers/zts/src/main/java/com/yahoo/athenz/zts/cert/InstanceCertManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,11 @@ private void loadCertSigner() {

String certSignerFactoryClass = System.getProperty(ZTSConsts.ZTS_PROP_CERT_SIGNER_FACTORY_CLASS,
ZTSConsts.ZTS_CERT_SIGNER_FACTORY_CLASS);
if (StringUtil.isEmpty(certSignerFactoryClass)) {
LOGGER.error("No CertSignerFactory class configured");
certSigner = null;
return;
}
try {
CertSignerFactory certSignerFactory = (CertSignerFactory) Class.forName(certSignerFactoryClass)
.getDeclaredConstructor().newInstance();
Expand Down Expand Up @@ -754,6 +759,11 @@ public boolean insertX509CertRecord(X509CertRecord certRecord) {
public String generateX509Certificate(final String provider, final String certIssuer, final String csr,
final String keyUsage, int expiryTime, Priority priority, final String keySignerId) {

if (certSigner == null) {
LOGGER.error("CertSigner is not available");
return null;
}

String pemCert = null;
try {
pemCert = certSigner.generateX509Certificate(provider, certIssuer, csr, keyUsage,
Expand All @@ -768,6 +778,12 @@ public String generateX509Certificate(final String provider, final String certIs
}

public String getCACertificate(final String provider, final String signerKeyId) {

if (certSigner == null) {
LOGGER.error("CertSigner is not available");
return null;
}

try {
return certSigner.getCACertificate(provider, signerKeyId);
} catch (ServerResourceException ex) {
Expand Down
13 changes: 13 additions & 0 deletions servers/zts/src/test/java/com/yahoo/athenz/zts/cert/InstanceCertManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2505,4 +2505,17 @@ public void testParseTimeUnit() {
assertEquals(InstanceCertManager.parseTimeUnit("invalidstring"), TimeUnit.DAYS);
}

@Test
public void testEmptyCertSignerFactoryClassName() {

System.setProperty(ZTSConsts.ZTS_PROP_CERT_SIGNER_FACTORY_CLASS, "");

InstanceCertManager instanceManager = new InstanceCertManager(null, null, null, new DynamicConfigBoolean(false));
assertNull(instanceManager.generateX509Certificate("provider", "issuer", "csr", "client", 0, Priority.High, "keyId"));
assertNull(instanceManager.getCACertificate("provider", "keyId"));

instanceManager.shutdown();

System.clearProperty(ZTSConsts.ZTS_PROP_CERT_SIGNER_FACTORY_CLASS);
}
}