mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-04 10:09:42 +00:00
forgot to add changes to previous commit
This commit is contained in:
1 parent
8ca8dd20eb
commit
fd91cb0922
2 files changed
+14
-7
No files matched your search
+10
-3
@@ -15,6 +15,7 @@ import com.sap.sailing.selenium.api.event.SecurityApi;
|
||||
import com.sap.sailing.selenium.core.SeleniumTestCase;
|
||||
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
|
||||
import com.sap.sailing.selenium.pages.adminconsole.advanced.IpBlocklistPanelPO;
|
||||
import com.sap.sailing.selenium.pages.adminconsole.advanced.LocalServerPO;
|
||||
import com.sap.sailing.selenium.test.AbstractSeleniumTest;
|
||||
|
||||
public class TestIpLocking extends AbstractSeleniumTest {
|
||||
@@ -28,12 +29,15 @@ public class TestIpLocking extends AbstractSeleniumTest {
|
||||
@SeleniumTestCase
|
||||
public void testUnlockingForBearerTokenAbuser() throws InterruptedException {
|
||||
final AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
|
||||
final IpBlocklistPanelPO tablePO = adminConsole.goToLocalServerPanel().getBearerTokenAbusePO();
|
||||
attemptBearerTokenAbuse(5);
|
||||
final LocalServerPO localServerPanel = adminConsole.goToLocalServerPanel();
|
||||
IpBlocklistPanelPO tablePO = localServerPanel.getBearerTokenAbusePO();
|
||||
attemptBearerTokenAbuse(4);
|
||||
tablePO.refresh();
|
||||
final String ip = "127.0.0.1";
|
||||
assertTrue(tablePO.isIpInTable(ip));
|
||||
tablePO.unblockIP(ip);
|
||||
// reference was getting stale otherwise
|
||||
tablePO = localServerPanel.getBearerTokenAbusePO();
|
||||
assertFalse(tablePO.isIpInTable(ip));
|
||||
attemptValidBearerTokenUse();
|
||||
}
|
||||
@@ -73,12 +77,15 @@ public class TestIpLocking extends AbstractSeleniumTest {
|
||||
@SeleniumTestCase
|
||||
public void testUnlockingForUserCreationAbuser() throws InterruptedException {
|
||||
final AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
|
||||
final IpBlocklistPanelPO tablePO = adminConsole.goToLocalServerPanel().getUserCreationAbusePO();
|
||||
final LocalServerPO localServerPanel = adminConsole.goToLocalServerPanel();
|
||||
IpBlocklistPanelPO tablePO = localServerPanel.getUserCreationAbusePO();
|
||||
spamUserCreation(4);
|
||||
tablePO.refresh();
|
||||
final String ip = "127.0.0.1";
|
||||
assertTrue(tablePO.isIpInTable(ip));
|
||||
tablePO.unblockIP(ip);
|
||||
// reference was getting stale otherwise
|
||||
tablePO = localServerPanel.getUserCreationAbusePO();
|
||||
assertFalse(tablePO.isIpInTable(ip));
|
||||
attemptValidBearerTokenUse();
|
||||
}
|
||||
|
||||
+4
-4
@@ -746,20 +746,20 @@ public class UserManagementWriteServiceImpl extends UserManagementServiceImpl im
|
||||
@Override
|
||||
public void releaseUserCreationLockOnIp(String ip) throws UnauthorizedException {
|
||||
final SecurityService securityService = getSecurityService();
|
||||
final WildcardPermission userReadPermissionOnIp = SecuredSecurityTypes.LOCKED_IP
|
||||
final WildcardPermission deletePermission = SecuredSecurityTypes.LOCKED_IP
|
||||
.getPermissionForObject(DefaultActions.DELETE, new IPAddress(ip));
|
||||
// throws exception if not permitted
|
||||
SecurityUtils.getSubject().checkPermission(userReadPermissionOnIp.toString());
|
||||
SecurityUtils.getSubject().checkPermission(deletePermission.toString());
|
||||
securityService.releaseUserCreationLockOnIp(ip);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void releaseBearerTokenLockOnIp(String ip) throws UnauthorizedException {
|
||||
final SecurityService securityService = getSecurityService();
|
||||
final WildcardPermission userReadPermissionOnIp = SecuredSecurityTypes.LOCKED_IP
|
||||
final WildcardPermission deletePermission = SecuredSecurityTypes.LOCKED_IP
|
||||
.getPermissionForObject(DefaultActions.DELETE, new IPAddress(ip));
|
||||
// throws exception if not permitted
|
||||
SecurityUtils.getSubject().checkPermission(userReadPermissionOnIp.toString());
|
||||
SecurityUtils.getSubject().checkPermission(deletePermission.toString());
|
||||
securityService.releaseBearerTokenLockOnIp(ip);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user