Skip to content

server: null-check public IP before the DNS/Source NAT guard in creat… #14027

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

Open
nagaboinaramgopal wants to merge 1 commit into
base: 4.20
Choose a base branch
from
Open

server: null-check public IP before the DNS/Source NAT guard in creat… #14027

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
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1706,7 +1706,7 @@ public LoadBalancer createPublicLoadBalancerRule(String xId, String name, String
IpAddress systemIp = null;
NetworkOffering off = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId());

if (srcPortStart == DNS_PORT && ipVO.isSourceNat()) {
if (srcPortStart == DNS_PORT && ipVO != null && ipVO.isSourceNat()) {
List<NetworkOfferingServiceMapVO> offeringServices = _networkOfferingServiceDao.listByNetworkOfferingId(network.getNetworkOfferingId());
for (NetworkOfferingServiceMapVO serviceMapVo: offeringServices) {
if (serviceMapVo.getService().equals(Service.Dns.getName())) {
Expand Down
36 changes: 36 additions & 0 deletions server/src/test/java/com/cloud/network/lb/LoadBalancingRulesManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,16 @@

package com.cloud.network.lb;

import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.Network;
import com.cloud.network.NetworkModel;
import com.cloud.network.dao.LoadBalancerVO;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.offering.NetworkOffering;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.utils.db.EntityManager;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
Expand Down Expand Up @@ -48,6 +54,21 @@ public class LoadBalancingRulesManagerImplTest{
@Mock
NetworkOrchestrationService _networkMgr;

@Mock
EntityManager _entityMgr;

@Mock
AccountManager _accountMgr;

@Mock
NetworkModel _networkModel;

@Mock
NetworkVO networkMock;

private long accountId = 10L;
private long networkId = 4L;

@Spy
@InjectMocks
LoadBalancingRulesManagerImpl lbr = new LoadBalancingRulesManagerImpl();
Expand Down Expand Up @@ -101,4 +122,19 @@ public void testGetLoadBalancerServiceProviderFail() {

Network.Provider provider = lbr.getLoadBalancerServiceProvider(loadBalancerMock);
}

@Test(expected = InvalidParameterValueException.class)
public void createPublicLoadBalancerRuleWithDnsPortAndNoIpDoesNotNpe() throws Exception {
long lbOwnerId = accountId;
long networkOfferingId = 7L;
when(_accountMgr.getAccount(lbOwnerId)).thenReturn(Mockito.mock(Account.class));
when(_networkModel.getNetwork(networkId)).thenReturn(networkMock);
when(networkMock.getNetworkOfferingId()).thenReturn(networkOfferingId);
NetworkOffering off = Mockito.mock(NetworkOffering.class);
when(_entityMgr.findById(NetworkOffering.class, networkOfferingId)).thenReturn(off);
when(off.isElasticLb()).thenReturn(false);

lbr.createPublicLoadBalancerRule("xid", "name", "desc", 53, 53, 53, 53,
null, "tcp", "roundrobin", networkId, lbOwnerId, false, "tcp", null, null);
}
}