Skip to content

Improvement: SSL offloading with Virtual Router #11468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 16 commits into from
Sep 11, 2025
Merged

Improvement: SSL offloading with Virtual Router #11468

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
88cf9c3
SSL offloading with Virtual Router
weizhouapache Aug 19, 2025
7f0573d
PR11468: fix pre-commit errors
weizhouapache Aug 19, 2025
b590b74
PR11468: api->getAPI/postAPI in UI
weizhouapache Aug 19, 2025
5a0ec98
SSL: add smoke tests for VPC in user project
weizhouapache Aug 21, 2025
7dc6ec5
PR11468: address Daan's comments
weizhouapache Aug 21, 2025
cb5be1d
Fix test/integration/smoke/test_ssl_offloading.py
weizhouapache Aug 22, 2025
6e629ca
SSL: remove ssl certificates when clean up account
weizhouapache Aug 22, 2025
104e5c1
SSL offloading: add unit tests
weizhouapache Aug 28, 2025
3a457ab
SSL offloading: UI fixes part 1
weizhouapache Sep 2, 2025
d470e05
SSL offloading: UI changes part 2
weizhouapache Sep 2, 2025
0599cf6
Merge branch 'main' into 4.22-ssl-offloading
weizhouapache Sep 3, 2025
8ebe9b1
SSL offloading: add more unit tests
weizhouapache Sep 4, 2025
3bf7459
SSL offloading: more unit tests 3
weizhouapache Sep 4, 2025
b32a775
SSL offloading: wrong check
weizhouapache Sep 5, 2025
1e85137
SSL offloading: more and more unit tests
weizhouapache Sep 5, 2025
be5e66e
SSL offloading: add testUpdateLoadBalancerRule5
weizhouapache Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SSL offloading: add unit tests
  • Loading branch information
@weizhouapache
weizhouapache committed Aug 28, 2025
commit 104e5c1a933fd0d275e164d502759b10cb3747e3
2 changes: 1 addition & 1 deletion api/src/main/java/com/cloud/agent/api/to/LoadBalancerTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public LoadBalancerTO(String uuid, String srcIp, int srcPort, String protocol, S
this.destinations = new DestinationTO[destinations.size()];
this.stickinessPolicies = null;
this.sslCert = null;
this.lbProtocol = null;
this.lbProtocol = protocol;
int i = 0;
for (LbDestination destination : destinations) {
this.destinations[i++] = new DestinationTO(destination.getIpAddress(), destination.getDestinationPortStart(), destination.isRevoked(), false);
Expand Down
6 changes: 5 additions & 1 deletion core/src/test/java/com/cloud/agent/resource/virtualnetwork/ConfigHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import com.cloud.agent.resource.virtualnetwork.model.LoadBalancerRule;
import com.cloud.agent.resource.virtualnetwork.model.LoadBalancerRules;
import com.cloud.network.lb.LoadBalancingRule.LbDestination;
import com.cloud.network.lb.LoadBalancingRule.LbSslCert;
import com.cloud.network.Networks.TrafficType;

public class ConfigHelperTest {
Expand Down Expand Up @@ -223,9 +224,12 @@ public void testDeleteIpAlias() {
protected LoadBalancerConfigCommand generateLoadBalancerConfigCommand() {
final List<LoadBalancerTO> lbs = new ArrayList<>();
final List<LbDestination> dests = new ArrayList<>();
final LbSslCert lbSslCert = new LbSslCert("cert", "key", "password", "chain", "fingerprint", false);
dests.add(new LbDestination(80, 8080, "10.1.10.2", false));
dests.add(new LbDestination(80, 8080, "10.1.10.2", true));
lbs.add(new LoadBalancerTO(UUID.randomUUID().toString(), "64.10.1.10", 80, "tcp", "algo", false, false, false, dests));
LoadBalancerTO loadBalancerTO = new LoadBalancerTO(UUID.randomUUID().toString(), "64.10.1.10", 80, "tcp", "algo", false, false, false, dests);
loadBalancerTO.setLbSslCert(lbSslCert);
lbs.add(loadBalancerTO);

final LoadBalancerTO[] arrayLbs = new LoadBalancerTO[lbs.size()];
lbs.toArray(arrayLbs);
Expand Down
14 changes: 14 additions & 0 deletions core/src/test/java/com/cloud/network/HAProxyConfiguratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.cloud.agent.api.routing.LoadBalancerConfigCommand;
import com.cloud.agent.api.to.LoadBalancerTO;
import com.cloud.network.lb.LoadBalancingRule.LbDestination;
import com.cloud.network.lb.LoadBalancingRule.LbSslCert;

import java.util.List;
import java.util.ArrayList;
Expand Down Expand Up @@ -122,6 +123,19 @@ public void generateConfigurationTestWithCidrList() {
Assert.assertTrue(result.contains("acl network_allowed src 1.1.1.1 2.2.2.2/24 \n\ttcp-request connection reject if !network_allowed"));
}

@Test
public void generateConfigurationTestWithSslCert() {
LoadBalancerTO lb = new LoadBalancerTO("1", "10.2.0.1", 443, "ssl", "roundrobin", false, false, false, null);
final LbSslCert lbSslCert = new LbSslCert("cert", "key", "password", "chain", "fingerprint", false);
lb.setLbSslCert(lbSslCert);
LoadBalancerTO[] lba = new LoadBalancerTO[1];
lba[0] = lb;
HAProxyConfigurator hpg = new HAProxyConfigurator();
LoadBalancerConfigCommand cmd = new LoadBalancerConfigCommand(lba, "10.0.0.1", "10.1.0.1", "10.1.1.1", null, 1L, "12", false);
String result = genConfig(hpg, cmd);
Assert.assertTrue(result.contains("bind 10.2.0.1:443 ssl crt /etc/cloudstack/ssl/10_2_0_1-443.pem"));
}

private String genConfig(HAProxyConfigurator hpg, LoadBalancerConfigCommand cmd) {
String[] sa = hpg.generateConfiguration(cmd);
StringBuilder sb = new StringBuilder();
Expand Down
Loading