diff options
author | Morten Tokle <mortent@yahooinc.com> | 2022-12-02 15:32:01 +0100 |
---|---|---|
committer | Morten Tokle <mortent@yahooinc.com> | 2022-12-02 15:32:01 +0100 |
commit | fe023e4ecf2b3eb2f9ebb2e71bf652cbf5f1a4dd (patch) | |
tree | 6bc2b9874c2bc73159abbe87fc96516939e0a89f /config-model/src/main/java/com | |
parent | 0f5a6d241394b7b064debdd38fabd58c7c64f94d (diff) |
Enforce at least one cert in files
Diffstat (limited to 'config-model/src/main/java/com')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 007e8401c70..13ab012dedb 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -532,7 +532,11 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { Reader reader = file.createReader(); String certPem = IOUtils.readAll(reader); reader.close(); - return X509CertificateUtils.certificateListFromPem(certPem); + List<X509Certificate> x509Certificates = X509CertificateUtils.certificateListFromPem(certPem); + if (x509Certificates.isEmpty()) { + throw new IllegalArgumentException("File %s does not contain any certificates.".formatted(file.getPath().getRelative())); + } + return x509Certificates; } catch (IOException e) { throw new RuntimeException(e); } |