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
|
// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.model.application.validation;
import com.yahoo.config.model.NullConfigModelRegistry;
import com.yahoo.config.model.api.ApplicationClusterEndpoint;
import com.yahoo.config.model.api.ContainerEndpoint;
import com.yahoo.config.model.deploy.DeployState;
import com.yahoo.config.model.deploy.TestProperties;
import com.yahoo.config.model.test.MockApplicationPackage;
import com.yahoo.vespa.model.VespaModel;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* @author bjorncs
*/
class CloudHttpConnectorValidatorTest {
private static final String CUSTOM_SSL_ON_8080 =
"""
<server port='8080' id='default'>
<ssl>
<private-key-file>/foo/key</private-key-file>
<certificate-file>/foo/cert</certificate-file>
</ssl>
</server>
""";
private static final String DEFAULT_SSL_ON_8080 =
"""
<server port='8080' id='default'/>
""";
private static final String ADDITIONAL_CONNECTOR =
"""
<server port='8080' id='default'/>
<server port='1234' id='custom'/>
""";
@Test
void fails_on_custom_ssl_for_cloud_application() {
var exception = assertThrows(IllegalArgumentException.class, () -> runValidatorOnApp(true, "", CUSTOM_SSL_ON_8080));
var expected = "Adding additional or modifying existing HTTPS connectors is not allowed for Vespa Cloud applications. " +
"Violating connectors: [default@8080]. See https://cloud.vespa.ai/en/security/whitepaper, " +
"https://cloud.vespa.ai/en/security/guide#data-plane.";
assertEquals(expected, exception.getMessage());
}
@Test
void allows_custom_ssl_for_infra() {
assertDoesNotThrow(() -> runValidatorOnApp(true, " application-type='hosted-infrastructure'", CUSTOM_SSL_ON_8080));
}
@Test
void allows_custom_ssl_for_self_hosted() {
assertDoesNotThrow(() -> runValidatorOnApp(false, "", CUSTOM_SSL_ON_8080));
}
@Test
void fails_on_additional_connectors_for_cloud_application() {
var exception = assertThrows(IllegalArgumentException.class, () -> runValidatorOnApp(true, "", ADDITIONAL_CONNECTOR));
var expected = "Illegal port 1234 in http server 'custom': Port must be set to 8080"; // Currently fails earlier in model construction
assertEquals(expected, exception.getMessage());
}
@Test
void allows_additional_connectors_for_self_hosted() {
assertDoesNotThrow(() -> runValidatorOnApp(false, "", ADDITIONAL_CONNECTOR));
}
@Test
void allows_default_ssl_for_cloud_application() {
assertDoesNotThrow(() -> runValidatorOnApp(true, "", DEFAULT_SSL_ON_8080));
}
@Test
void allows_default_ssl_for_self_hosted() {
assertDoesNotThrow(() -> runValidatorOnApp(false, "", DEFAULT_SSL_ON_8080));
}
private static void runValidatorOnApp(boolean hosted, String appTypeAttribute, String serverXml) throws Exception {
String servicesXml = """
<services version='1.0'%s>
<container version='1.0'>
<http>
%s
</http>
</container>
</services>
""".formatted(appTypeAttribute, serverXml);
var state = new DeployState.Builder()
.applicationPackage(
new MockApplicationPackage.Builder()
.withServices(servicesXml)
.build())
.properties(new TestProperties().setHostedVespa(hosted))
.endpoints(Set.of(new ContainerEndpoint("container", ApplicationClusterEndpoint.Scope.zone, List.of("c.example.com"))))
.build();
var model = new VespaModel(new NullConfigModelRegistry(), state);
new CloudHttpConnectorValidator().validate(model, state);
}
}
|
