Add the CA certificates to configuration and read it from application package

3 files changed, 15 insertions, 9 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 9f86fe4dea2..8d83d16a272 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -111,6 +111,7 @@
       "public java.util.List getQueryProfileFiles()",
       "public java.util.List getQueryProfileTypeFiles()",
       "public java.util.List getPageTemplateFiles()",
+      "public com.yahoo.config.application.api.ApplicationFile getClientSecurityFile()",
       "public abstract java.lang.String getHostSource()",
       "public abstract java.lang.String getServicesSource()",
       "public abstract java.util.Optional getDeployment()",
@@ -148,6 +149,7 @@
       "public static final com.yahoo.path.Path RULES_DIR",
       "public static final com.yahoo.path.Path DEPLOYMENT_FILE",
       "public static final com.yahoo.path.Path VALIDATION_OVERRIDES",
+      "public static final com.yahoo.path.Path SECURITY_DIR",
       "public static final java.lang.String SD_NAME_SUFFIX",
       "public static final java.lang.String RANKEXPRESSION_NAME_SUFFIX",
       "public static final java.lang.String RULES_NAME_SUFFIX",
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
index 06f8034453d..5cd119dcf65 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java
@@ -27,7 +27,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.stream.Collectors;
 
 /**
  * Represents an application package, that is, used as input when creating a VespaModel and as
@@ -73,6 +72,8 @@ public interface ApplicationPackage {
     Path DEPLOYMENT_FILE = Path.fromString("deployment.xml");
     Path VALIDATION_OVERRIDES = Path.fromString("validation-overrides.xml");
 
+    Path SECURITY_DIR = Path.fromString("security");
+
     String SD_NAME_SUFFIX = ".sd";
     String RANKEXPRESSION_NAME_SUFFIX = ".expression";
     String RULES_NAME_SUFFIX = ".sr";
@@ -178,6 +179,9 @@ public interface ApplicationPackage {
     /** Does {@link #getFiles} on the page template directory and gets all xml files */
     default List<NamedReader> getPageTemplateFiles() { return getFiles(PAGE_TEMPLATES_DIR,".xml"); }
 
+    /** Returns handle for the file containing client certificate authorities */
+    default ApplicationFile getClientSecurityFile() { return getFile(SECURITY_DIR.append("clients.pem")); }
+
     //For generating error messages
     String getHostSource();
     String getServicesSource();
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java b/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java
index 3cb4cedcbac..6a8b5a237ab 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/TlsSecrets.java
@@ -1,30 +1,30 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.api;
 
- public class TlsSecrets {
+public class TlsSecrets {
     public static final TlsSecrets MISSING = new TlsSecrets();
 
-     private final String certificate;
+    private final String certificate;
     private final String key;
 
-     private TlsSecrets() {
-        this(null,null);
+    private TlsSecrets() {
+        this(null, null);
     }
 
-     public TlsSecrets(String certificate, String key) {
+    public TlsSecrets(String certificate, String key) {
         this.certificate = certificate;
         this.key = key;
     }
 
-     public String certificate() {
+    public String certificate() {
         return certificate;
     }
 
-     public String key() {
+    public String key() {
         return key;
     }
 
-     public boolean isMissing() {
+    public boolean isMissing() {
         return this == MISSING;
     }
 }