Merge pull request #9386 from vespa-engine/bjorncs/node-identifier

Bjorncs/node identifier

config-provisioning/src/main/java/com/yahoo/config/provision/security/DummyNodeIdentifierProvider.java

@@ -0,0 +1,31 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.config.provision.security;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+import java.security.cert.X509Certificate;
+import java.util.List;
+
+/**
+ * @author bjorncs
+ */
+public class DummyNodeIdentifierProvider implements Provider<NodeIdentifier> {
+
+    private final ThrowingNodeIdentifier instance = new ThrowingNodeIdentifier();
+
+    @Inject
+    public DummyNodeIdentifierProvider() {}
+
+    @Override
+    public NodeIdentifier get() {
+        return instance;
+    }
+
+    private static class ThrowingNodeIdentifier implements NodeIdentifier {
+        @Override
+        public NodeIdentity identifyNode(List<X509Certificate> peerCertificateChain) {
+            throw new UnsupportedOperationException();
+        }
+    }
+}

config-provisioning/src/main/java/com/yahoo/config/provision/security/NodeIdentifierException.java

@@ -5,7 +5,16 @@
  * @author bjorncs
  */
 public class NodeIdentifierException extends RuntimeException {
+
     public NodeIdentifierException(String message) {
         super(message);
     }
+
+    public NodeIdentifierException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public NodeIdentifierException(Throwable cause) {
+        super(cause);
+    }
 }

configserver/src/main/resources/configserver-app/services.xml

@@ -38,6 +38,7 @@
     <component id="com.yahoo.vespa.config.server.application.HttpProxy" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.filedistribution.FileServer" bundle="configserver" />
     <component id="com.yahoo.vespa.config.server.maintenance.ConfigServerMaintenance" bundle="configserver" />
+    <component id="com.yahoo.config.provision.security.DummyNodeIdentifierProvider" bundle="config-provisioning" />
 
     <component id="com.yahoo.vespa.serviceview.ConfigServerLocation" bundle="configserver" />
 

node-repository/pom.xml

@@ -77,18 +77,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>vespa-athenz</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>jdisc-security-filters</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.yahoo.vespa</groupId>
             <artifactId>flags</artifactId>