Skip to content

server: do not NPE when a VPN provider returns no per-user result #14047

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
+51 −1
Open

server: do not NPE when a VPN provider returns no per-user result #14047

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/vpn/RemoteAccessVpnManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ public boolean applyVpnUsers(long vpnOwnerId, String userName, boolean forRemove

for (int i = 0; i < finals.length; i++) {
final VpnUserVO user = users.get(i);
if (finals[i]) {
if (Boolean.TRUE.equals(finals[i])) {
if (user.getState() == State.Add) {
user.setState(State.Active);
_vpnUsersDao.update(user.getId(), user);
Expand Down
50 changes: 50 additions & 0 deletions server/src/test/java/com/cloud/network/vpn/RemoteAccessVpnManagerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,23 @@
package com.cloud.network.vpn;

import com.cloud.exception.InvalidParameterValueException;
import com.cloud.network.VpnUser.State;
import com.cloud.network.VpnUserVO;
import com.cloud.network.dao.RemoteAccessVpnDao;
import com.cloud.network.dao.RemoteAccessVpnVO;
import com.cloud.network.dao.VpnUserDao;
import com.cloud.network.element.RemoteAccessVPNServiceProvider;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO;
import com.cloud.user.dao.AccountDao;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.net.NetUtils;
import junit.framework.TestCase;
import org.apache.cloudstack.context.CallContext;
import org.springframework.test.util.ReflectionTestUtils;

import java.util.Collections;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -222,4 +236,40 @@ public void validateHandleExceptionOnValidateIpRangeErrorWhenInvalidParameterVal

assertEquals(expectedMessage, assertThrows.getMessage());
}

@Test
public void applyVpnUsersHandlesNullProviderResultWithoutNpe() throws Exception {
RemoteAccessVpnManagerImpl mgr = new RemoteAccessVpnManagerImpl();

AccountDao accountDao = Mockito.mock(AccountDao.class);
AccountManager accountMgr = Mockito.mock(AccountManager.class);
VpnUserDao vpnUsersDao = Mockito.mock(VpnUserDao.class);
RemoteAccessVpnDao remoteAccessVpnDao = Mockito.mock(RemoteAccessVpnDao.class);
RemoteAccessVPNServiceProvider provider = Mockito.mock(RemoteAccessVPNServiceProvider.class);
ReflectionTestUtils.setField(mgr, "_accountDao", accountDao);
ReflectionTestUtils.setField(mgr, "_accountMgr", accountMgr);
ReflectionTestUtils.setField(mgr, "_vpnUsersDao", vpnUsersDao);
ReflectionTestUtils.setField(mgr, "_remoteAccessVpnDao", remoteAccessVpnDao);
ReflectionTestUtils.setField(mgr, "_vpnServiceProviders", Collections.singletonList(provider));

Mockito.when(accountDao.findById(1L)).thenReturn(Mockito.mock(AccountVO.class));

RemoteAccessVpnVO vpn = Mockito.mock(RemoteAccessVpnVO.class);
Mockito.when(vpn.getNetworkId()).thenReturn(null);
Mockito.when(remoteAccessVpnDao.findByAccount(1L)).thenReturn(Collections.singletonList(vpn));

VpnUserVO user = Mockito.mock(VpnUserVO.class);
Mockito.when(user.getState()).thenReturn(State.Revoke);
Mockito.when(vpnUsersDao.listByAccount(1L)).thenReturn(Collections.singletonList(user));

Mockito.when(provider.applyVpnUsers(Mockito.eq(vpn), Mockito.anyList())).thenReturn(null);

try (MockedStatic<CallContext> callContextMock = Mockito.mockStatic(CallContext.class)) {
CallContext callContext = Mockito.mock(CallContext.class);
callContextMock.when(CallContext::current).thenReturn(callContext);
Mockito.when(callContext.getCallingAccount()).thenReturn(Mockito.mock(Account.class));

Assert.assertTrue(mgr.applyVpnUsers(1L, "someuser", false));
}
}
}
Loading