Skip to content

<fix>[lb]: intercept httpCompressAlgos::disable tag #4585

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

Closed
zstack-robot-2 wants to merge 1 commit into from
+21 −0
Closed

<fix>[lb]: intercept httpCompressAlgos::disable tag #4585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions .../loadBalancer/src/main/java/org/zstack/network/service/lb/LoadBalancerApiInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,14 @@ private void validate(APICreateLoadBalancerListenerMsg msg) {
statusCode = LoadBalancerSystemTags.STATUS_CODE.getTokenByTag(tag,
LoadBalancerSystemTags.STATUS_CODE_TOKEN);
}
if (LoadBalancerSystemTags.HTTP_COMPRESS_ALGOS.isMatch(tag)) {
String compressAlgos = LoadBalancerSystemTags.HTTP_COMPRESS_ALGOS.getTokenByTag(tag,
LoadBalancerSystemTags.HTTP_COMPRESS_ALGOS_TOKEN);
if (DisableLbSupportHttpCompressAlgos.equals(compressAlgos)) {
throw new ApiMessageInterceptionException(argerr(
"could not create the loadbalancer listener with systemTag httpCompressAlgos::disable, please remove this tag"));
}
}
}

if ((redirectPort != null || statusCode != null) && (httpRedirectHttps == null || HttpRedirectHttps.disable.toString().equals(httpRedirectHttps))) {
Expand Down
13 changes: 13 additions & 0 deletions ...test/integration/networkservice/provider/flat/loadbalancer/OperateLoadBalancerCase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import org.zstack.network.service.vip.VipNetworkServicesRefVO_
import org.zstack.network.service.vip.VipPeerL3NetworkRefVO
import org.zstack.network.service.vip.VipPeerL3NetworkRefVO_
import org.zstack.network.service.virtualrouter.vyos.VyosConstants
import org.zstack.sdk.CreateLoadBalancerListenerAction
import org.zstack.sdk.L3NetworkInventory
import org.zstack.sdk.LoadBalancerInventory
import org.zstack.sdk.LoadBalancerListenerInventory
Expand Down Expand Up @@ -297,6 +298,18 @@ class OperateLoadBalancerCase extends SubCase {
assert Q.New(VipNetworkServicesRefVO.class).eq(VipNetworkServicesRefVO_.vipUuid, vip.getUuid()).select(VipNetworkServicesRefVO_.serviceType).findValue() == VipUseForList.LB_NETWORK_SERVICE_TYPE
assert Q.New(VipPeerL3NetworkRefVO.class).eq(VipPeerL3NetworkRefVO_.vipUuid, vip.getUuid()).count() == 0

CreateLoadBalancerListenerAction invalidListenerAction = new CreateLoadBalancerListenerAction()
invalidListenerAction.loadBalancerUuid = lb.uuid
invalidListenerAction.name = "invalid-compression-listener"
invalidListenerAction.instancePort = 23
invalidListenerAction.loadBalancerPort = 23
invalidListenerAction.protocol = LoadBalancerConstants.LB_PROTOCOL_HTTP
invalidListenerAction.systemTags = ["httpCompressAlgos::disable"]
invalidListenerAction.sessionId = adminSession()
CreateLoadBalancerListenerAction.Result invalidListenerResult = invalidListenerAction.call()
assert invalidListenerResult.error != null
assert invalidListenerResult.error.details.contains("please remove this tag")

List<String> httpAlgos = ["deflate","gzip", "raw-deflate"]
List<String> httpAlgosInput = ["deflate","gzip", "raw-deflate\n"]
def listener = createLoadBalancerListener {
Expand Down