1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.model.container.xml;
import com.yahoo.config.model.api.EndpointCertificateSecrets;
import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
import com.yahoo.config.model.deploy.DeployState;
import com.yahoo.config.model.deploy.TestProperties;
import com.yahoo.config.model.test.MockApplicationPackage;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.RegionName;
import com.yahoo.config.provision.SystemName;
import com.yahoo.config.provision.Zone;
import com.yahoo.jdisc.http.ConnectorConfig;
import com.yahoo.jdisc.http.ServerConfig;
import com.yahoo.jdisc.http.filter.security.cloud.config.CloudDataPlaneFilterConfig;
import com.yahoo.security.KeyAlgorithm;
import com.yahoo.security.KeyUtils;
import com.yahoo.security.SignatureAlgorithm;
import com.yahoo.security.X509CertificateBuilder;
import com.yahoo.security.X509CertificateUtils;
import com.yahoo.vespa.model.container.ApplicationContainer;
import com.yahoo.vespa.model.container.ContainerModel;
import com.yahoo.vespa.model.container.http.ConnectorFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.w3c.dom.Element;
import javax.security.auth.x500.X500Principal;
import java.io.File;
import java.io.IOException;
import java.math.BigInteger;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.KeyPair;
import java.security.cert.X509Certificate;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertIterableEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class CloudDataPlaneFilterTest extends ContainerModelBuilderTestBase {
@TempDir
public File applicationFolder;
Path securityFolder;
private static final String cloudDataPlaneFilterConfigId = "container/filters/chain/cloud-data-plane-secure/component/" +
"com.yahoo.jdisc.http.filter.security.cloud.CloudDataPlaneFilter";
@BeforeEach
public void setup() throws IOException {
securityFolder = applicationFolder.toPath().resolve("security");
Files.createDirectories(securityFolder);
}
@Test
public void it_generates_correct_config() throws IOException {
Path certFile = securityFolder.resolve("foo.pem");
Element clusterElem = DomBuilderTest.parse(
"""
<container version='1.0'>
<clients>
<client id="foo" permissions="read,write">
<certificate file="%s"/>
</client>
</clients>
</container>
"""
.formatted(applicationFolder.toPath().relativize(certFile).toString()));
X509Certificate certificate = createCertificate(certFile);
buildModel(clusterElem);
CloudDataPlaneFilterConfig config = root.getConfig(CloudDataPlaneFilterConfig.class, cloudDataPlaneFilterConfigId);
assertFalse(config.legacyMode());
List<CloudDataPlaneFilterConfig.Clients> clients = config.clients();
assertEquals(1, clients.size());
CloudDataPlaneFilterConfig.Clients client = clients.get(0);
assertEquals("foo", client.id());
assertIterableEquals(List.of("read", "write"), client.permissions());
assertIterableEquals(List.of(X509CertificateUtils.toPem(certificate)), client.certificates());
ConnectorConfig connectorConfig = connectorConfig();
var caCerts = X509CertificateUtils.certificateListFromPem(connectorConfig.ssl().caCertificate());
assertEquals(1, caCerts.size());
assertEquals(List.of(certificate), caCerts);
var srvCfg = root.getConfig(ServerConfig.class, "container/http");
assertEquals("cloud-data-plane-insecure", srvCfg.defaultFilters().get(0).filterId());
assertEquals(8080, srvCfg.defaultFilters().get(0).localPort());
assertEquals("cloud-data-plane-secure", srvCfg.defaultFilters().get(1).filterId());
assertEquals(4443, srvCfg.defaultFilters().get(1).localPort());
}
@Test
public void it_generates_correct_legacy_config() throws IOException {
Path certFile = securityFolder.resolve("clients.pem");
Element clusterElem = DomBuilderTest.parse("<container version='1.0' />");
X509Certificate certificate = createCertificate(certFile);
buildModel(clusterElem);
CloudDataPlaneFilterConfig config = root.getConfig(CloudDataPlaneFilterConfig.class, cloudDataPlaneFilterConfigId);
assertTrue(config.legacyMode());
List<CloudDataPlaneFilterConfig.Clients> clients = config.clients();
assertEquals(0, clients.size());
ConnectorConfig connectorConfig = connectorConfig();
var caCerts = X509CertificateUtils.certificateListFromPem(connectorConfig.ssl().caCertificate());
assertEquals(1, caCerts.size());
assertEquals(List.of(certificate), caCerts);
}
@Test
public void it_rejects_files_without_certificates() throws IOException {
Path certFile = securityFolder.resolve("foo.pem");
Element clusterElem = DomBuilderTest.parse(
"""
<container version='1.0'>
<clients>
<client id="foo" permissions="read,write">
<certificate file="%s"/>
</client>
</clients>
</container>
"""
.formatted(applicationFolder.toPath().relativize(certFile).toString()));
Files.writeString(certFile, "effectively empty");
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> buildModel(clusterElem));
assertEquals("File security/foo.pem does not contain any certificates.", exception.getMessage());
}
@Test
public void it_rejects_invalid_client_ids() throws IOException {
Element clusterElem = DomBuilderTest.parse(
"""
<container version='1.0'>
<clients>
<client id="_foo" permissions="read,write">
<certificate file="foo"/>
</client>
</clients>
</container>
""");
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> buildModel(clusterElem));
assertEquals("Invalid client id '_foo', id cannot start with '_'", exception.getMessage());
}
private ConnectorConfig connectorConfig() {
ApplicationContainer container = (ApplicationContainer) root.getProducer("container/container.0");
List<ConnectorFactory> connectorFactories = container.getHttp().getHttpServer().get().getConnectorFactories();
ConnectorFactory tlsPort = connectorFactories.stream().filter(connectorFactory -> connectorFactory.getListenPort() == 4443).findFirst().orElseThrow();
ConnectorConfig.Builder builder = new ConnectorConfig.Builder();
tlsPort.getConfig(builder);
return new ConnectorConfig(builder);
}
/*
Creates cert, returns
*/
static X509Certificate createCertificate(Path certFile) throws IOException {
KeyPair keyPair = KeyUtils.generateKeypair(KeyAlgorithm.EC, 256);
X500Principal subject = new X500Principal("CN=mysubject");
X509Certificate certificate = X509CertificateBuilder
.fromKeypair(
keyPair, subject, Instant.now(), Instant.now().plus(1, ChronoUnit.DAYS), SignatureAlgorithm.SHA512_WITH_ECDSA, BigInteger.valueOf(1))
.build();
String certPem = X509CertificateUtils.toPem(certificate);
Files.writeString(certFile, certPem);
return certificate;
}
public List<ContainerModel> buildModel(Element... clusterElem) {
var applicationPackage = new MockApplicationPackage.Builder()
.withRoot(applicationFolder)
.build();
DeployState state = new DeployState.Builder()
.applicationPackage(applicationPackage)
.properties(
new TestProperties()
.setEndpointCertificateSecrets(Optional.of(new EndpointCertificateSecrets("CERT", "KEY")))
.setHostedVespa(true))
.zone(new Zone(SystemName.PublicCd, Environment.dev, RegionName.defaultName()))
.build();
return createModel(root, state, null, clusterElem);
}
}
|
