fix #130
This commit is contained in:
parent
f2d2ca2045
commit
e7998979a0
@ -115,32 +115,31 @@ public class DomainModuleImpl extends AbstractModuleImpl {
|
|||||||
// Standard domainoptions setzen. TODO: Alle defaults über eigene Klasse aus der Datenbank holen.
|
// Standard domainoptions setzen. TODO: Alle defaults über eigene Klasse aus der Datenbank holen.
|
||||||
UnixUser loginUser = getTransaction().getLoginUser();
|
UnixUser loginUser = getTransaction().getLoginUser();
|
||||||
if (!loginUser.hasHostmasterRole()) {
|
if (!loginUser.hasHostmasterRole()) {
|
||||||
|
boolean usersDomain = false;
|
||||||
|
boolean otherUserDomain = false;
|
||||||
// search for domains superior to dom
|
// search for domains superior to dom
|
||||||
Query domainQuery = em.createQuery("SELECT d FROM Domains d WHERE d.name = :domainName");
|
Query domainQuery = em.createQuery("SELECT d FROM Domains d WHERE d.name = :domainName");
|
||||||
String superior = dom.getName();
|
String superior = dom.getName();
|
||||||
while (superior.contains(".")) {
|
while (superior.contains(".") && !usersDomain) {
|
||||||
if (dom.isPacDomain()) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
superior = superior.substring(superior.indexOf('.') + 1);
|
superior = superior.substring(superior.indexOf('.') + 1);
|
||||||
domainQuery.setParameter("domainName", superior);
|
domainQuery.setParameter("domainName", superior);
|
||||||
List<?> resultList = domainQuery.getResultList();
|
List<?> resultList = domainQuery.getResultList();
|
||||||
if (resultList.size() > 0) {
|
if (resultList.size() > 0) {
|
||||||
Domain superDom = (Domain) resultList.get(0);
|
Domain superDom = (Domain) resultList.get(0);
|
||||||
if (superDom.isPacDomain()) {
|
|
||||||
throw new HSAdminException("subdomains to pacdomain " + superDom.getName() + " are not allowed");
|
|
||||||
}
|
|
||||||
if (loginUser.hasPacAdminRoleFor(superDom.getUser().getPac())) {
|
if (loginUser.hasPacAdminRoleFor(superDom.getUser().getPac())) {
|
||||||
break; // same pac
|
usersDomain = true; // same pac
|
||||||
}
|
} else{
|
||||||
if (loginUser.hasCustomerRoleFor(superDom.getUser().getPac().getCustomer())) {
|
if (loginUser.hasCustomerRoleFor(superDom.getUser().getPac().getCustomer())) {
|
||||||
break; // same customer
|
usersDomain = true; // same customer
|
||||||
|
} else {
|
||||||
|
otherUserDomain = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!usersDomain && otherUserDomain) {
|
||||||
// TODO war es ein break, dann weitermachen, sonst Exception !
|
throw new AuthorisationException(loginUser, "create", dom);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Query adminQuery = em.createQuery("SELECT u FROM UnixUsers u WHERE u.name = :adminName");
|
Query adminQuery = em.createQuery("SELECT u FROM UnixUsers u WHERE u.name = :adminName");
|
||||||
adminQuery.setParameter("adminName", admin.getName());
|
adminQuery.setParameter("adminName", admin.getName());
|
||||||
|
@ -15,6 +15,7 @@ import org.junit.runners.Suite;
|
|||||||
UnixUserTest.class,
|
UnixUserTest.class,
|
||||||
EMailAliasTest.class,
|
EMailAliasTest.class,
|
||||||
DomainTest.class,
|
DomainTest.class,
|
||||||
|
DomainDeleteTest.class,
|
||||||
EMailAddressTest.class,
|
EMailAddressTest.class,
|
||||||
SSLCertDomainTest.class,
|
SSLCertDomainTest.class,
|
||||||
DatabaseCleanTest.class,
|
DatabaseCleanTest.class,
|
||||||
|
72
hsarback/test/de/hsadmin/remote/DomainDeleteTest.java
Normal file
72
hsarback/test/de/hsadmin/remote/DomainDeleteTest.java
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
package de.hsadmin.remote;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNull;
|
||||||
|
import static org.junit.Assert.fail;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.apache.xmlrpc.XmlRpcException;
|
||||||
|
import org.apache.xmlrpc.client.XmlRpcClient;
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
public class DomainDeleteTest {
|
||||||
|
|
||||||
|
private static final String MODULE = "domain";
|
||||||
|
|
||||||
|
private XmlRpcClient client;
|
||||||
|
private RemoteCASHelper cas;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() throws Exception {
|
||||||
|
client = RemoteTestHelper.getClient();
|
||||||
|
cas = new RemoteCASHelper();
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void tearDown() throws Exception {
|
||||||
|
client = null;
|
||||||
|
cas = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDelete() {
|
||||||
|
int count = getDomsCount();
|
||||||
|
String user = "aaa00";
|
||||||
|
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||||
|
Map<String, String> whereParams = new HashMap<String, String>();
|
||||||
|
whereParams.put("name", "f6n.de");
|
||||||
|
Object[] params = new Object[] { user,
|
||||||
|
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||||
|
whereParams };
|
||||||
|
try {
|
||||||
|
Object execute = client.execute(MODULE + ".delete", params);
|
||||||
|
assertNull(execute);
|
||||||
|
} catch (XmlRpcException e) {
|
||||||
|
fail(e.getMessage());
|
||||||
|
}
|
||||||
|
assertEquals(count - 1, getDomsCount());
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getDomsCount() {
|
||||||
|
int count = 0;
|
||||||
|
String user = "aaa00";
|
||||||
|
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||||
|
Map<String, String> whereParams = new HashMap<String, String>();
|
||||||
|
Object[] params = new Object[] { user,
|
||||||
|
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||||
|
whereParams };
|
||||||
|
try {
|
||||||
|
Object execute = client.execute(MODULE + ".search", params);
|
||||||
|
Object[] result = (Object[]) execute;
|
||||||
|
count = result.length;
|
||||||
|
} catch (XmlRpcException e) {
|
||||||
|
fail(e.getMessage());
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -54,7 +54,7 @@ public class DomainTest {
|
|||||||
try {
|
try {
|
||||||
Object execute = client.execute(MODULE + ".search", params);
|
Object execute = client.execute(MODULE + ".search", params);
|
||||||
Object[] result = (Object[]) execute;
|
Object[] result = (Object[]) execute;
|
||||||
assertEquals(2, result.length);
|
assertEquals(3, result.length);
|
||||||
for (Object o : result) {
|
for (Object o : result) {
|
||||||
if (o instanceof Map<?, ?>) {
|
if (o instanceof Map<?, ?>) {
|
||||||
Map<?, ?> row = (Map<?, ?>) o;
|
Map<?, ?> row = (Map<?, ?>) o;
|
||||||
@ -135,25 +135,6 @@ public class DomainTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testDelete() {
|
|
||||||
int count = getDomsCount();
|
|
||||||
String user = "aaa00";
|
|
||||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
|
||||||
Map<String, String> whereParams = new HashMap<String, String>();
|
|
||||||
whereParams.put("name", "f6n.de");
|
|
||||||
Object[] params = new Object[] { user,
|
|
||||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
|
||||||
whereParams };
|
|
||||||
try {
|
|
||||||
Object execute = client.execute(MODULE + ".delete", params);
|
|
||||||
assertNull(execute);
|
|
||||||
} catch (XmlRpcException e) {
|
|
||||||
fail(e.getMessage());
|
|
||||||
}
|
|
||||||
assertEquals(count - 1, getDomsCount());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testDomainOption() {
|
public void testDomainOption() {
|
||||||
// these tests build upon each other
|
// these tests build upon each other
|
||||||
|
@ -15,6 +15,7 @@ import org.junit.runners.Suite;
|
|||||||
UnixUserTest.class,
|
UnixUserTest.class,
|
||||||
EMailAliasTest.class,
|
EMailAliasTest.class,
|
||||||
DomainTest.class,
|
DomainTest.class,
|
||||||
|
DomainDeleteTest.class,
|
||||||
EMailAddressTest.class,
|
EMailAddressTest.class,
|
||||||
DatabaseCleanTest.class,
|
DatabaseCleanTest.class,
|
||||||
PacMigrationTest.class,
|
PacMigrationTest.class,
|
||||||
|
Loading…
Reference in New Issue
Block a user