inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALF-4106: AuditService and audit DAO refactor

Browse Source 
- Moved 'AlfrescoRepository' to be an extension sample audit application
 - Added 'AlfrescoRepositoryTest' into test-resources for unit tests
 - Updated unit tests and added stricter checking for enable/disable status


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-09-15 15:06:06 +00:00
parent 94a04311d7
commit b8af08649d
1 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
source/java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java
View File

@@ -18,9 +18,11 @@
*/ */
package org.alfresco.repo.web.scripts.audit; package org.alfresco.repo.web.scripts.audit;
import java.net.URL;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import org.alfresco.repo.audit.model.AuditModelRegistryImpl;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -36,6 +38,7 @@ import org.springframework.extensions.surf.util.ISO8601DateFormat;
import org.springframework.extensions.webscripts.Status; import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.TestWebScriptServer; import org.springframework.extensions.webscripts.TestWebScriptServer;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response; import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
import org.springframework.util.ResourceUtils;
/** /**
* Test the audit web scripts * Test the audit web scripts
@@ -45,6 +48,9 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
*/ */
public class AuditWebScriptTest extends BaseWebScriptTest public class AuditWebScriptTest extends BaseWebScriptTest
{ {
private static final String APP_REPOTEST_NAME = "AlfrescoRepositoryTest";
private static final String APP_REPOTEST_PATH = "/repositorytest";
private ApplicationContext ctx; private ApplicationContext ctx;
private AuditService auditService; private AuditService auditService;
private AuthenticationService authenticationService; private AuthenticationService authenticationService;
@@ -61,18 +67,34 @@ public class AuditWebScriptTest extends BaseWebScriptTest
auditService = (AuditService) ctx.getBean("AuditService"); auditService = (AuditService) ctx.getBean("AuditService");
admin = AuthenticationUtil.getAdminUserName(); admin = AuthenticationUtil.getAdminUserName();
// Register the test model
AuditModelRegistryImpl auditModelRegistry = (AuditModelRegistryImpl) ctx.getBean("auditModel.modelRegistry");
URL testModelUrl = ResourceUtils.getURL("classpath:alfresco/testaudit/alfresco-audit-test-repository.xml");
auditModelRegistry.registerModel(testModelUrl);
auditModelRegistry.loadAuditModels();
AuthenticationUtil.setFullyAuthenticatedUser(admin); AuthenticationUtil.setFullyAuthenticatedUser(admin);
wasGloballyEnabled = auditService.isAuditEnabled(); wasGloballyEnabled = auditService.isAuditEnabled();
wasRepoEnabled = auditService.isAuditEnabled(APP_REPO_NAME, APP_REPO_PATH); wasRepoEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
// Only enable if required // Only enable if required
if (!wasGloballyEnabled) if (!wasGloballyEnabled)
{ {
auditService.setAuditEnabled(true); auditService.setAuditEnabled(true);
wasGloballyEnabled = auditService.isAuditEnabled();
if (!wasGloballyEnabled)
{
fail("Failed to enable global audit for test");
}
} }
if (!wasRepoEnabled) if (!wasRepoEnabled)
{ {
auditService.enableAudit(APP_REPO_NAME, APP_REPO_PATH); auditService.enableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
wasRepoEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
if (!wasRepoEnabled)
{
fail("Failed to enable repo audit for test");
}
} }
} }
@@ -96,11 +118,11 @@ public class AuditWebScriptTest extends BaseWebScriptTest
{ {
if (wasRepoEnabled) if (wasRepoEnabled)
{ {
auditService.enableAudit(APP_REPO_NAME, APP_REPO_PATH); auditService.enableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
} }
else else
{ {
auditService.disableAudit(APP_REPO_NAME, APP_REPO_PATH); auditService.disableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
} }
} }
catch (Throwable e) catch (Throwable e)
@@ -161,13 +183,11 @@ public class AuditWebScriptTest extends BaseWebScriptTest
testGetIsAuditEnabledGlobally(); testGetIsAuditEnabledGlobally();
} }
private static final String APP_REPO_NAME = "AlfrescoRepository";
private static final String APP_REPO_PATH = "/repository";
public void testGetIsAuditEnabledRepo() throws Exception public void testGetIsAuditEnabledRepo() throws Exception
{ {
boolean wasEnabled = auditService.isAuditEnabled(APP_REPO_NAME, null); boolean wasEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, null);
String url = "/api/audit/control/" + APP_REPO_NAME + APP_REPO_PATH; String url = "/api/audit/control/" + APP_REPOTEST_NAME + APP_REPOTEST_PATH;
TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url); TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
if (wasEnabled) if (wasEnabled)
@@ -181,8 +201,8 @@ public class AuditWebScriptTest extends BaseWebScriptTest
String appPath = app.getString(AbstractAuditWebScript.JSON_KEY_PATH); String appPath = app.getString(AbstractAuditWebScript.JSON_KEY_PATH);
boolean appEnabled = app.getBoolean(AbstractAuditWebScript.JSON_KEY_ENABLED); boolean appEnabled = app.getBoolean(AbstractAuditWebScript.JSON_KEY_ENABLED);
assertEquals("Mismatched application audit enabled", wasEnabled, appEnabled); assertEquals("Mismatched application audit enabled", wasEnabled, appEnabled);
assertEquals("Mismatched application audit name", APP_REPO_NAME, appName); assertEquals("Mismatched application audit name", APP_REPOTEST_NAME, appName);
assertEquals("Mismatched application audit path", APP_REPO_PATH, appPath); assertEquals("Mismatched application audit path", APP_REPOTEST_PATH, appPath);
} }
else else
{ {
@@ -192,17 +212,17 @@ public class AuditWebScriptTest extends BaseWebScriptTest
public void testSetAuditEnabledRepo() throws Exception public void testSetAuditEnabledRepo() throws Exception
{ {
boolean wasEnabled = auditService.isAuditEnabled(APP_REPO_NAME, APP_REPO_PATH); boolean wasEnabled = auditService.isAuditEnabled(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
if (wasEnabled) if (wasEnabled)
{ {
String url = "/api/audit/control/" + APP_REPO_NAME + APP_REPO_PATH + "?enable=false"; String url = "/api/audit/control/" + APP_REPOTEST_NAME + APP_REPOTEST_PATH + "?enable=false";
TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON); TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
sendRequest(req, Status.STATUS_OK, admin); sendRequest(req, Status.STATUS_OK, admin);
} }
else else
{ {
String url = "/api/audit/control/" + APP_REPO_NAME + APP_REPO_PATH + "?enable=true"; String url = "/api/audit/control/" + APP_REPOTEST_NAME + APP_REPOTEST_PATH + "?enable=true";
TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON); TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
sendRequest(req, Status.STATUS_OK, admin); sendRequest(req, Status.STATUS_OK, admin);
} }
@@ -245,7 +265,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
loginWithFailure(getName()); loginWithFailure(getName());
// Delete audit entries that could not have happened // Delete audit entries that could not have happened
String url = "/api/audit/clear/" + APP_REPO_NAME + "?fromTime=" + future; String url = "/api/audit/clear/" + APP_REPOTEST_NAME + "?fromTime=" + future;
TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON); TestWebScriptServer.PostRequest req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
Response response = sendRequest(req, Status.STATUS_OK, admin); Response response = sendRequest(req, Status.STATUS_OK, admin);
JSONObject json = new JSONObject(response.getContentAsString()); JSONObject json = new JSONObject(response.getContentAsString());
@@ -253,7 +273,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
assertEquals("Could not have cleared more than 0", 0, cleared); assertEquals("Could not have cleared more than 0", 0, cleared);
// Delete the entry (at least) // Delete the entry (at least)
url = "/api/audit/clear/" + APP_REPO_NAME + "?fromTime=" + now + "&toTime=" + future; url = "/api/audit/clear/" + APP_REPOTEST_NAME + "?fromTime=" + now + "&toTime=" + future;
req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON); req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -261,7 +281,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
assertTrue("Should have cleared at least 1 entry", cleared > 0); assertTrue("Should have cleared at least 1 entry", cleared > 0);
// Delete all entries // Delete all entries
url = "/api/audit/clear/" + APP_REPO_NAME;; url = "/api/audit/clear/" + APP_REPOTEST_NAME;;
req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON); req = new TestWebScriptServer.PostRequest(url, "", MimetypeMap.MIMETYPE_JSON);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -275,12 +295,12 @@ public class AuditWebScriptTest extends BaseWebScriptTest
long future = Long.MAX_VALUE; long future = Long.MAX_VALUE;
auditService.setAuditEnabled(true); auditService.setAuditEnabled(true);
auditService.enableAudit(APP_REPO_NAME, APP_REPO_PATH); auditService.enableAudit(APP_REPOTEST_NAME, APP_REPOTEST_PATH);
loginWithFailure(getName()); loginWithFailure(getName());
// Query for audit entries that could not have happened // Query for audit entries that could not have happened
String url = "/api/audit/query/" + APP_REPO_NAME + "?fromTime=" + now + "&verbose=true"; String url = "/api/audit/query/" + APP_REPOTEST_NAME + "?fromTime=" + now + "&verbose=true";
TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url); TestWebScriptServer.GetRequest req = new TestWebScriptServer.GetRequest(url);
Response response = sendRequest(req, Status.STATUS_OK, admin); Response response = sendRequest(req, Status.STATUS_OK, admin);
JSONObject json = new JSONObject(response.getContentAsString()); JSONObject json = new JSONObject(response.getContentAsString());
@@ -295,13 +315,13 @@ public class AuditWebScriptTest extends BaseWebScriptTest
assertNotNull("No entry time String", entryTimeStr); assertNotNull("No entry time String", entryTimeStr);
Date entryTime = ISO8601DateFormat.parse((String)entryTimeStr); // Check conversion Date entryTime = ISO8601DateFormat.parse((String)entryTimeStr); // Check conversion
JSONObject jsonValues = jsonEntry.getJSONObject(AbstractAuditWebScript.JSON_KEY_ENTRY_VALUES); JSONObject jsonValues = jsonEntry.getJSONObject(AbstractAuditWebScript.JSON_KEY_ENTRY_VALUES);
String entryUsername = jsonValues.getString("/repository/login/error/user"); String entryUsername = jsonValues.getString("/repositorytest/login/error/user");
assertEquals("Didn't find the login-failure-user", getName(), entryUsername); assertEquals("Didn't find the login-failure-user", getName(), entryUsername);
// Query using well-known ID // Query using well-known ID
Long fromEntryId = entryId; // Search is inclusive on the 'from' side Long fromEntryId = entryId; // Search is inclusive on the 'from' side
Long toEntryId = entryId.longValue() + 1L; // Search is exclusive on the 'to' side Long toEntryId = entryId.longValue() + 1L; // Search is exclusive on the 'to' side
url = "/api/audit/query/" + APP_REPO_NAME + "?fromId=" + fromEntryId + "&toId=" + toEntryId; url = "/api/audit/query/" + APP_REPOTEST_NAME + "?fromId=" + fromEntryId + "&toId=" + toEntryId;
req = new TestWebScriptServer.GetRequest(url); req = new TestWebScriptServer.GetRequest(url);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -309,7 +329,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
assertEquals("Incorrect number of search results", 1, jsonEntries.length()); assertEquals("Incorrect number of search results", 1, jsonEntries.length());
// Query using a non-existent entry path // Query using a non-existent entry path
url = "/api/audit/query/" + APP_REPO_NAME + "/repository/login/error/userXXX" + "?verbose=true"; url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/userXXX" + "?verbose=true";
req = new TestWebScriptServer.GetRequest(url); req = new TestWebScriptServer.GetRequest(url);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -317,7 +337,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
assertTrue("Should not have found anything", jsonEntries.length() == 0); assertTrue("Should not have found anything", jsonEntries.length() == 0);
// Query using a good entry path // Query using a good entry path
url = "/api/audit/query/" + APP_REPO_NAME + "/repository/login/error/user" + "?verbose=true"; url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?verbose=true";
req = new TestWebScriptServer.GetRequest(url); req = new TestWebScriptServer.GetRequest(url);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -328,7 +348,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
String missingUser = new Long(System.currentTimeMillis()).toString(); String missingUser = new Long(System.currentTimeMillis()).toString();
// Query for event that has not happened // Query for event that has not happened
url = "/api/audit/query/" + APP_REPO_NAME + "/repository/login/error/user" + "?value=" + missingUser; url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?value=" + missingUser;
req = new TestWebScriptServer.GetRequest(url); req = new TestWebScriptServer.GetRequest(url);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -338,7 +358,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
loginWithFailure(missingUser); loginWithFailure(missingUser);
// Query for event that has happened once // Query for event that has happened once
url = "/api/audit/query/" + APP_REPO_NAME + "/repository/login/error/user" + "?value=" + missingUser; url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?value=" + missingUser;
req = new TestWebScriptServer.GetRequest(url); req = new TestWebScriptServer.GetRequest(url);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -346,7 +366,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
assertEquals("Incorrect number of search results", 1, jsonEntries.length()); assertEquals("Incorrect number of search results", 1, jsonEntries.length());
// Query for event, but casting the value to the incorrect type // Query for event, but casting the value to the incorrect type
url = "/api/audit/query/" + APP_REPO_NAME + "/repository/login/error/user" + "?value=" + missingUser + "&valueType=java.lang.Long"; url = "/api/audit/query/" + APP_REPOTEST_NAME + "/repositorytest/login/error/user" + "?value=" + missingUser + "&valueType=java.lang.Long";
req = new TestWebScriptServer.GetRequest(url); req = new TestWebScriptServer.GetRequest(url);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -358,7 +378,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
loginWithFailure(oddUser); loginWithFailure(oddUser);
// Query for the event limiting to one by count and descending (i.e. get last) // Query for the event limiting to one by count and descending (i.e. get last)
url = "/api/audit/query/" + APP_REPO_NAME + "?forward=false&limit=1&verbose=true"; url = "/api/audit/query/" + APP_REPOTEST_NAME + "?forward=false&limit=1&verbose=true";
req = new TestWebScriptServer.GetRequest(url); req = new TestWebScriptServer.GetRequest(url);
response = sendRequest(req, Status.STATUS_OK, admin); response = sendRequest(req, Status.STATUS_OK, admin);
json = new JSONObject(response.getContentAsString()); json = new JSONObject(response.getContentAsString());
@@ -368,7 +388,7 @@ public class AuditWebScriptTest extends BaseWebScriptTest
entryId = jsonEntry.getLong(AbstractAuditWebScript.JSON_KEY_ENTRY_ID); entryId = jsonEntry.getLong(AbstractAuditWebScript.JSON_KEY_ENTRY_ID);
assertNotNull("No entry ID", entryId); assertNotNull("No entry ID", entryId);
jsonValues = jsonEntry.getJSONObject(AbstractAuditWebScript.JSON_KEY_ENTRY_VALUES); jsonValues = jsonEntry.getJSONObject(AbstractAuditWebScript.JSON_KEY_ENTRY_VALUES);
entryUsername = jsonValues.getString("/repository/login/error/user"); entryUsername = jsonValues.getString("/repositorytest/login/error/user");
assertEquals("Didn't find the login-failure-user", oddUser, entryUsername); assertEquals("Didn't find the login-failure-user", oddUser, entryUsername);
} }
} }