Add separate connector for token endpoint

1 files changed, 6 insertions, 11 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/CloudSslContextProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/CloudTokenSslContextProvider.java
index cdfd4aa938e..fe71d1b24c6 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/CloudSslContextProvider.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/CloudTokenSslContextProvider.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http.ssl.impl;
 
+import com.yahoo.component.annotation.Inject;
 import com.yahoo.jdisc.http.ConnectorConfig;
 import com.yahoo.jdisc.http.server.jetty.DataplaneProxyCredentials;
 
@@ -14,29 +15,23 @@ import java.util.Optional;
  *
  * @author mortent
  */
-public class CloudSslContextProvider extends ConfiguredSslContextFactoryProvider {
+public class CloudTokenSslContextProvider extends ConfiguredSslContextFactoryProvider {
 
     private final DataplaneProxyCredentials dataplaneProxyCredentials;
 
-    public CloudSslContextProvider(ConnectorConfig connectorConfig, DataplaneProxyCredentials dataplaneProxyCredentials) {
+    @Inject
+    public CloudTokenSslContextProvider(ConnectorConfig connectorConfig,
+                                        DataplaneProxyCredentials dataplaneProxyCredentials) {
         super(connectorConfig);
         this.dataplaneProxyCredentials = dataplaneProxyCredentials;
     }
 
     @Override
     Optional<String> getCaCertificates(ConnectorConfig.Ssl sslConfig) {
-        String proxyCert;
         try {
-            proxyCert = Files.readString(dataplaneProxyCredentials.certificateFile(), StandardCharsets.UTF_8);
+            return Optional.of(Files.readString(dataplaneProxyCredentials.certificateFile(), StandardCharsets.UTF_8));
         } catch (IOException e) {
             throw new IllegalArgumentException("Dataplane proxy certificate not available", e);
         }
-        if (!sslConfig.caCertificate().isBlank()) {
-            return Optional.of(sslConfig.caCertificate() + "\n" + proxyCert);
-        } else if (!sslConfig.caCertificateFile().isBlank()) {
-            return Optional.of(readToString(sslConfig.caCertificateFile()) + "\n" + proxyCert);
-        } else {
-            return Optional.of(proxyCert);
-        }
     }
 }