cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 提高单元测试覆盖率 

RCA：
SOL：
修改人：dongxiancun
检视人：dongxiancun
This commit is contained in:
dongxiancun 2019-07-25 18:30:38 +08:00
parent 7c86972ee6
commit d137a33979
3 changed files with 52 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
ControlPlatform/aaa/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/idm/DomainHandler.java
View File

@ -79,11 +79,7 @@ public class DomainHandler {
try { try {
domains = iidMStore.getDomains(); domains = iidMStore.getDomains();
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e, "Internal error getting domains");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting domains");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
return Response.ok(domains).build(); return Response.ok(domains).build();
} }
@ -104,11 +100,7 @@ public class DomainHandler {
try { try {
domain = iidMStore.readDomain(domainId); domain = iidMStore.readDomain(domainId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting domain");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (domain == null) { if (domain == null) {
@ -157,11 +149,7 @@ public class DomainHandler {
} }
domain = iidMStore.writeDomain(domain); domain = iidMStore.writeDomain(domain);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error creating domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error creating domain");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
return Response.status(201).entity(domain).build(); return Response.status(201).entity(domain).build();
} }
@ -194,11 +182,7 @@ public class DomainHandler {
claimCache.clear(); claimCache.clear();
return Response.status(200).entity(domain).build(); return Response.status(200).entity(domain).build();
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error putting domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error putting domain");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
} }
@ -224,11 +208,7 @@ public class DomainHandler {
return Response.status(404).entity(idmerror).build(); return Response.status(404).entity(idmerror).build();
} }
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error deleting Domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error deleting Domain");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
claimCache.clear(); claimCache.clear();
return Response.status(204).build(); return Response.status(204).build();
@ -268,19 +248,15 @@ public class DomainHandler {
} }
Domain domain = null; Domain domain = null;
User user; User user = null;
Role role; Role role = null;
String roleId; String roleId = null;
// validate domain id // validate domain id
try { try {
domain = iidMStore.readDomain(domainId); domain = iidMStore.readDomain(domainId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting domain");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (domain == null) { if (domain == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -292,11 +268,7 @@ public class DomainHandler {
try { try {
user = iidMStore.readUser(userId); user = iidMStore.readUser(userId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting user");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting user");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (user == null) { if (user == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -317,11 +289,7 @@ public class DomainHandler {
try { try {
role = iidMStore.readRole(roleId); role = iidMStore.readRole(roleId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting role");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting role");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (role == null) { if (role == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -338,22 +306,14 @@ public class DomainHandler {
return Response.status(403).entity(idmerror).build(); return Response.status(403).entity(idmerror).build();
} }
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error creating grant");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error creating grant");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
// create grant // create grant
try { try {
grant = iidMStore.writeGrant(grant); grant = iidMStore.writeGrant(grant);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException: ", e); return getResponse500(e,"Internal error creating grant");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error creating grant");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
claimCache.clear(); claimCache.clear();
@ -384,11 +344,7 @@ public class DomainHandler {
try { try {
domain = iidMStore.readDomain(domainId); domain = iidMStore.readDomain(domainId);
} catch (IDMStoreException se) { } catch (IDMStoreException se) {
LOG.error("StoreException: ", se); return getResponse500(se,"Internal error getting domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting domain");
idmerror.setDetails(se.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (domain == null) { if (domain == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -437,19 +393,11 @@ public class DomainHandler {
roleList.add(role); roleList.add(role);
} }
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e, "Internal error getting Roles");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting Roles");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
claim.setRoles(roleList); claim.setRoles(roleList);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting user");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting user");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
return Response.ok(claim).build(); return Response.ok(claim).build();
@ -479,11 +427,7 @@ public class DomainHandler {
try { try {
domain = iidMStore.readDomain(domainId); domain = iidMStore.readDomain(domainId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting domain");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (domain == null) { if (domain == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -494,11 +438,7 @@ public class DomainHandler {
try { try {
user = iidMStore.readUser(userId); user = iidMStore.readUser(userId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting user");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting user");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (user == null) { if (user == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -513,17 +453,21 @@ public class DomainHandler {
roleList.add(role); roleList.add(role);
} }
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting Roles");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting Roles");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
Roles roles = new Roles(); Roles roles = new Roles();
roles.setRoles(roleList); roles.setRoles(roleList);
return Response.ok(roles).build(); return Response.ok(roles).build();
} }
private Response getResponse500(IDMStoreException e, String msg) {
LOG.error("StoreException", e);
IDMError idmerror = new IDMError();
idmerror.setMessage(msg);
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
}
/** /**
* Delete a grant. * Delete a grant.
* *
@ -548,11 +492,7 @@ public class DomainHandler {
try { try {
domain = iidMStore.readDomain(domainId); domain = iidMStore.readDomain(domainId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("Error deleting Grant", e); return getResponse500(e,"Internal error getting domain");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting domain");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (domain == null) { if (domain == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -563,11 +503,7 @@ public class DomainHandler {
try { try {
user = iidMStore.readUser(userId); user = iidMStore.readUser(userId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting user");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting user");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (user == null) { if (user == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -578,11 +514,7 @@ public class DomainHandler {
try { try {
role = iidMStore.readRole(roleId); role = iidMStore.readRole(roleId);
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error getting Role");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error getting Role");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
if (role == null) { if (role == null) {
IDMError idmerror = new IDMError(); IDMError idmerror = new IDMError();
@ -600,11 +532,7 @@ public class DomainHandler {
} }
iidMStore.deleteGrant(existingGrant.getGrantid()); iidMStore.deleteGrant(existingGrant.getGrantid());
} catch (IDMStoreException e) { } catch (IDMStoreException e) {
LOG.error("StoreException", e); return getResponse500(e,"Internal error creating grant");
IDMError idmerror = new IDMError();
idmerror.setMessage("Internal error creating grant");
idmerror.setDetails(e.getMessage());
return Response.status(500).entity(idmerror).build();
} }
claimCache.clear(); claimCache.clear();
return Response.status(204).build(); return Response.status(204).build();

14
ControlPlatform/aaa/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/persistence/PasswordHashTest.java
View File

@ -74,7 +74,9 @@ public class PasswordHashTest {
role.setName("admin"); role.setName("admin");
Mockito.when(store.readRole("admin")).thenReturn(role); Mockito.when(store.readRole("admin")).thenReturn(role);
Mockito.when(store.getUsers(creds.username(), creds.domain())).thenReturn(users); Mockito.when(store.getUsers(creds.username(), creds.domain())).thenReturn(users);
Mockito.when(store.getUsers()).thenReturn(users);
Mockito.when(store.getGrants(creds.domain(), creds.username())).thenReturn(grants); Mockito.when(store.getGrants(creds.domain(), creds.username())).thenReturn(grants);
Mockito.when(store.getGrants(grant.getUserid())).thenReturn(grants);
} }
@Test @Test
@ -99,6 +101,18 @@ public class PasswordHashTest {
return "sdn"; return "sdn";
} }
} }
@Test
public void testOthers() {
IdmLightProxy proxy = new IdmLightProxy(store, passwordService);
proxy.listDomains("admin");
proxy.listRoles("admin","sdn");
try {
proxy.listUserIDs();
} catch (IDMStoreException e) {
e.printStackTrace();
}
}
} }
/** /**
* Revision history * Revision history

7
ControlPlatform/aaa/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/idm/rest/test/DomainHandlerTest.java
View File

@ -82,6 +82,13 @@ public class DomainHandlerTest extends HandlerTest {
clientResponse = target("/v1/domains/5/users/0/roles").request().post(entity(grantData)); clientResponse = target("/v1/domains/5/users/0/roles").request().post(entity(grantData));
assertEquals(404, clientResponse.getStatus()); assertEquals(404, clientResponse.getStatus());
// //异常测试
// // check create grant
// Map<String, String> grantData2 = new HashMap<>();
// grantData2.put("roleid", "2");
// clientResponse = target("/v1/domains/(select teId from teacher where teName='Rona')/users/0/roles").request().post(entity(grantData));
// assertEquals(500, clientResponse.getStatus());
// check validate user (admin) // check validate user (admin)
Map<String, String> usrPwdData = new HashMap<>(); Map<String, String> usrPwdData = new HashMap<>();
usrPwdData.put("username", "admin"); usrPwdData.put("username", "admin");