summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2020-03-03 14:30:40 +0100
committerØyvind Grønnesby <oyving@verizonmedia.com>2020-03-03 14:30:40 +0100
commitddc15f6257c1efca96e91399e7583fbfed6632d7 (patch)
tree24cf3290b359ffd9a07ac7e658bd5415f7ea3be2 /controller-server
parentca8c2aef95c43bce8759eb468ccdf80688293da4 (diff)
Add a way to add a dummy certificate for testing
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java23
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java1
2 files changed, 24 insertions, 0 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index ed7ae12168f..58175762129 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -6,12 +6,17 @@ import com.yahoo.config.provision.AthenzDomain;
import com.yahoo.config.provision.AthenzService;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.RegionName;
+import com.yahoo.security.SignatureAlgorithm;
+import com.yahoo.security.X509CertificateBuilder;
import com.yahoo.security.X509CertificateUtils;
import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
+import javax.security.auth.x500.X500Principal;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UncheckedIOException;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
import java.text.SimpleDateFormat;
import java.time.Duration;
@@ -186,6 +191,24 @@ public class ApplicationPackageBuilder {
return this;
}
+ public ApplicationPackageBuilder trustDefaultCertificate() {
+ try {
+ var generator = KeyPairGenerator.getInstance("RSA");
+ var builder = X509CertificateBuilder.fromKeypair(
+ generator.generateKeyPair(),
+ new X500Principal("CN=name"),
+ Instant.now(),
+ Instant.now().plusMillis(300_000),
+ SignatureAlgorithm.SHA256_WITH_RSA,
+ X509CertificateBuilder.generateRandomSerialNumber()
+ );
+ this.trustedCertificates.add(builder.build());
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ }
+ return this;
+ }
+
private byte[] deploymentSpec() {
StringBuilder xml = new StringBuilder();
xml.append("<deployment version='1.0' ");
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index a48554e2af4..732ea9bff31 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -494,6 +494,7 @@ public class RoutingPoliciesTest {
var context = tester.tester.newDeploymentContext();
var endpointId = EndpointId.of("r0");
var applicationPackage = new ApplicationPackageBuilder()
+ .trustDefaultCertificate()
.region(sharedRegion)
.endpoint(endpointId.id(), "default")
.build();