Skip to content

Commit

Permalink
Extended REST tests. Fixing REST auditing.
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Mar 27, 2015
1 parent dc78de1 commit 467de62
Show file tree
Hide file tree
Showing 15 changed files with 466 additions and 311 deletions.
3 changes: 2 additions & 1 deletion ...ain/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
View file
Expand Up @@ -100,6 +100,7 @@ public void handleRequest(Message m, ContainerRequestContext requestCtx) {
}

if (principal == null ){
auditLoginFailure(username);
requestCtx.abortWith(Response.status(401).header("WWW-Authenticate", "Basic").build());
return;
}
Expand Down Expand Up @@ -193,7 +194,7 @@ private void auditLoginFailure(String username) {
AuditEventRecord record = new AuditEventRecord(AuditEventType.CREATE_SESSION, AuditEventStage.REQUEST);
record.setParameter(username);

record.setChannel(SchemaConstants.CHANNEL_WEB_SERVICE_URI);
record.setChannel(SchemaConstants.CHANNEL_REST_URI);
record.setTimestamp(System.currentTimeMillis());
record.setOutcome(OperationResultStatus.FATAL_ERROR);

Expand Down
8 changes: 4 additions & 4 deletions model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
View file
Expand Up @@ -256,8 +256,8 @@ public void test100ModifyUserJackAssignAccount() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();
Collection<ObjectDeltaOperation<? extends ObjectType>> executionDeltas = dummyAuditService.getExecutionDeltas();
Expand Down Expand Up @@ -921,8 +921,8 @@ public void test160ModifyUserJackAssignAccountKhaki() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();
Collection<ObjectDeltaOperation<? extends ObjectType>> executionDeltas = dummyAuditService.getExecutionDeltas();
Expand Down
20 changes: 10 additions & 10 deletions model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
View file
Expand Up @@ -138,8 +138,8 @@ public void test131ModifyUserJackAssignAccountDefault() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();

Expand Down Expand Up @@ -212,8 +212,8 @@ public void test132ModifyUserJackAssignAccountTest() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();

Expand Down Expand Up @@ -275,8 +275,8 @@ public void test135ModifyUserJackFullName() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();

Expand Down Expand Up @@ -336,8 +336,8 @@ public void test147ModifyUserJackUnAssignAccountDefault() throws Exception {
dummyAuditService.assertRecords(2);
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.DELETE, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.DELETE, ShadowType.class);
dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();

Expand Down Expand Up @@ -384,8 +384,8 @@ public void test149ModifyUserJackUnassignAccountTest() throws Exception {
dummyAuditService.assertRecords(2);
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.DELETE, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.DELETE, ShadowType.class);
dummyAuditService.assertTarget(USER_JACK_OID);
dummyAuditService.assertExecutionSuccess();

Expand Down
56 changes: 28 additions & 28 deletions model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
View file
Expand Up @@ -279,8 +279,8 @@ public void test100JackAssignAccountDummyConflicting() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -345,8 +345,8 @@ public void test200JackAssignAccountDummyPinkConflicting() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -403,8 +403,8 @@ public void test210GuybrushAssignAccountDummyPink() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -472,8 +472,8 @@ public void test220DeWattAssignAccountDummyPinkCaseIgnore() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -579,8 +579,8 @@ public void test240LargoAssignAccountDummyConflictingNoShadow() throws Exception
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(2);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1104,8 +1104,8 @@ public void test300JackAssignAccountDummyVioletConflicting() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1161,8 +1161,8 @@ public void test350GuybrushAssignAccountDummyViolet() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1221,8 +1221,8 @@ public void test360HermanAssignAccountDummyViolet() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1321,8 +1321,8 @@ public void test500JackAssignAccountDummyMagenta() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1401,8 +1401,8 @@ public void test510DrakeAssignAccountDummyMagenta() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1465,8 +1465,8 @@ public void test520DrakeModifyLocality() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(2);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1531,8 +1531,8 @@ public void test530GuybrushAssignAccountDummyMagenta() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(3);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.ADD, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1600,8 +1600,8 @@ public void test532GuybrushModifyDescription() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(2);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down Expand Up @@ -1662,8 +1662,8 @@ public void test600JackRename() throws Exception {
dummyAuditService.assertSimpleRecordSanity();
dummyAuditService.assertAnyRequestDeltas();
dummyAuditService.assertExecutionDeltas(5);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.asserHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, UserType.class);
dummyAuditService.assertHasDelta(ChangeType.MODIFY, ShadowType.class);
dummyAuditService.assertExecutionSuccess();
}

Expand Down

0 comments on commit 467de62

Please sign in to comment.