Skip to content

Commit

Permalink
Attempt to reproduce getParentOrgs() authorization issue (MID-4934)
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Oct 11, 2018
1 parent 39b305b commit 16533c0
Show file tree
Hide file tree
Showing 5 changed files with 538 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .../test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
View file
Expand Up @@ -407,7 +407,9 @@ public class AbstractConfiguredModelIntegrationTest extends AbstractModelIntegra
protected static final String ORG_SCUMM_BAR_NAME = "F0006";
protected static final String ORG_SCUMM_BAR_DISPLAY_NAME = "Scumm Bar";
protected static final String ORG_MINISTRY_OF_OFFENSE_OID = "00000000-8888-6666-0000-100000000003";
protected static final String ORG_MINISTRY_OF_OFFENSE_NAME = "F0003";
protected static final String ORG_MINISTRY_OF_DEFENSE_OID = "00000000-8888-6666-0000-100000000002";
protected static final String ORG_MINISTRY_OF_DEFENSE_NAME = "F0002";
protected static final String ORG_MINISTRY_OF_RUM_OID = "00000000-8888-6666-0000-100000000004";
protected static final String ORG_MINISTRY_OF_RUM_NAME = "F0004";
protected static final String ORG_SWASHBUCKLER_SECTION_OID = "00000000-8888-6666-0000-100000000005";
Expand Down
174 changes: 165 additions & 9 deletions ...odel-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2017 Evolveum
* Copyright (c) 2010-2018 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -22,7 +22,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;

import com.evolveum.icf.dummy.resource.ConflictException;
import com.evolveum.icf.dummy.resource.DummyAccount;
import com.evolveum.icf.dummy.resource.SchemaViolationException;
import com.evolveum.midpoint.model.api.ModelExecuteOptions;
import com.evolveum.midpoint.model.impl.expr.ExpressionEnvironment;
import com.evolveum.midpoint.model.impl.expr.ModelExpressionThreadLocalHolder;
Expand All @@ -37,6 +41,7 @@
import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;

import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.annotation.DirtiesContext.ClassMode;
Expand All @@ -49,12 +54,14 @@
import com.evolveum.midpoint.prism.delta.ItemDelta;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.util.PrismAsserts;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.internals.InternalCounters;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
import com.evolveum.midpoint.schema.util.ObjectQueryUtil;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.test.DummyResourceContoller;
import com.evolveum.midpoint.test.util.MidPointAsserts;
import com.evolveum.midpoint.test.util.TestUtil;
import com.evolveum.midpoint.util.exception.CommunicationException;
Expand Down Expand Up @@ -83,6 +90,11 @@ public class TestOrgStruct extends AbstractInitializedModelIntegrationTest {

public static final File TEST_DIR = new File("src/test/resources/orgstruct");

// RED resource has STRONG mappings
protected static final File RESOURCE_DUMMY_ORGTARGET_FILE = new File(TEST_DIR, "resource-dummy-orgtarget.xml");
protected static final String RESOURCE_DUMMY_ORGTARGET_OID = "89cb4c72-cd61-11e8-a21b-27cbf58a8c0e";
protected static final String RESOURCE_DUMMY_ORGTARGET_NAME = "orgtarget";

public static final File ROLE_DEFENDER_FILE = new File(TEST_DIR, "role-defender.xml");
public static final String ROLE_DEFENDER_OID = "12345111-1111-2222-1111-121212111567";

Expand All @@ -97,6 +109,9 @@ public class TestOrgStruct extends AbstractInitializedModelIntegrationTest {

public static final File ROLE_META_DEFENDER_ADMIN_FILE = new File(TEST_DIR, "role-meta-defender-admin.xml");
public static final String ROLE_META_DEFENDER_ADMIN_OID = "12345111-1111-2222-1111-121212111565";

public static final File ROLE_END_PIRATE_FILE = new File(TEST_DIR, "role-end-pirate.xml");
public static final String ROLE_END_PIRATE_OID = "67780b58-cd69-11e8-b664-dbc7b09e163e";

public static final File ORG_TEMP_FILE = new File(TEST_DIR, "org-temp.xml");
public static final String ORG_TEMP_OID = "43214321-4311-0952-4762-854392584320";
Expand All @@ -112,9 +127,14 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
addObject(ROLE_META_DEFENDER_ADMIN_FILE);
addObject(ROLE_OFFENDER_FILE);
addObject(ROLE_OFFENDER_ADMIN_FILE);
addObject(ROLE_END_PIRATE_FILE);
addObject(USER_HERMAN_FILE);
setDefaultUserTemplate(USER_TEMPLATE_ORG_ASSIGNMENT_OID); // used for tests 4xx
//DebugUtil.setDetailedDebugDump(true);

initDummyResourcePirate(RESOURCE_DUMMY_ORGTARGET_NAME,
RESOURCE_DUMMY_ORGTARGET_FILE, RESOURCE_DUMMY_ORGTARGET_OID, initTask, initResult);

}

@Test
Expand Down Expand Up @@ -160,6 +180,32 @@ public void test052RootOrgQuery() throws Exception {
assertMonkeyIslandOrgSanity();
}

@Test
public void test100JackAssignOrgtarget() throws Exception {
final String TEST_NAME = "test100JackAssignOrgtarget";
displayTestTitle(TEST_NAME);

Task task = createTask(TEST_NAME);
OperationResult result = task.getResult();

// Precondition
assertNoDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME);
assertNoDummyAccount(RESOURCE_DUMMY_ORGTARGET_NAME, ACCOUNT_JACK_DUMMY_USERNAME);

// WHEN
assignAccount(USER_JACK_OID, RESOURCE_DUMMY_ORGTARGET_OID, null, task, result);

// THEN
PrismObject<UserType> userJack = getUser(USER_JACK_OID);
display("User jack after", userJack);
assertAccount(userJack, RESOURCE_DUMMY_ORGTARGET_OID);

assertJackOrgtarget(null);

// Postcondition
assertMonkeyIslandOrgSanity();
}

/**
* Scumm bar org also acts as a role, assigning account on dummy resource.
*/
Expand All @@ -182,7 +228,9 @@ public void test101JackAssignScummBar() throws Exception {
display("User jack after", userJack);
assertUserOrg(userJack, ORG_SCUMM_BAR_OID);

assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, "Jack Sparrow", true);
assertDefaultDummyAccount(ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true);

assertJackOrgtarget(null, ORG_SCUMM_BAR_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
Expand All @@ -204,6 +252,8 @@ public void test102JackUnassignScummBar() throws Exception {
display("User jack after", userJack);
assertUserNoOrg(userJack);

assertJackOrgtarget(null);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand Down Expand Up @@ -234,6 +284,8 @@ public void test201JackAssignScummBarAndSaveElaine() throws Exception {
display("User jack after", userJack);
assertUserOrg(userJack, ORG_SCUMM_BAR_OID, ORG_SAVE_ELAINE_OID);

assertJackOrgtarget(null, ORG_SCUMM_BAR_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand All @@ -257,6 +309,8 @@ public void test202JackAssignMinistryOfOffense() throws Exception {
display("User jack after", userJack);
assertUserOrg(userJack, ORG_SCUMM_BAR_OID, ORG_SAVE_ELAINE_OID, ORG_MINISTRY_OF_OFFENSE_OID);

assertJackOrgtarget(null, ORG_SCUMM_BAR_NAME, ORG_MINISTRY_OF_OFFENSE_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand All @@ -277,6 +331,8 @@ public void test207JackUnAssignScummBar() throws Exception {
display("User jack after", userJack);
assertUserOrg(userJack, ORG_SAVE_ELAINE_OID, ORG_MINISTRY_OF_OFFENSE_OID);

assertJackOrgtarget(null, ORG_MINISTRY_OF_OFFENSE_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand All @@ -301,6 +357,8 @@ public void test208JackUnassignAll() throws Exception {
display("User jack after", userJack);
assertUserNoOrg(userJack);

assertNoDummyAccount(RESOURCE_DUMMY_ORGTARGET_NAME, ACCOUNT_JACK_DUMMY_USERNAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand All @@ -317,6 +375,7 @@ public void test210JackAssignMinistryOfOffenseMember() throws Exception {
Collection<ItemDelta<?,?>> modifications = new ArrayList<>();
modifications.add(createAssignmentModification(ORG_MINISTRY_OF_OFFENSE_OID, OrgType.COMPLEX_TYPE, null, null, null, true));
modifications.add(createAssignmentModification(ROLE_DEFENDER_OID, RoleType.COMPLEX_TYPE, null, null, null, true));
modifications.add(createAssignmentModification(RESOURCE_DUMMY_ORGTARGET_OID, ShadowKindType.ACCOUNT, null, true));
ObjectDelta<UserType> userDelta = ObjectDelta.createModifyDelta(USER_JACK_OID, modifications, UserType.class, prismContext);
Collection<ObjectDelta<? extends ObjectType>> deltas = MiscSchemaUtil.createCollection(userDelta);

Expand All @@ -329,6 +388,8 @@ public void test210JackAssignMinistryOfOffenseMember() throws Exception {
assertAssignedOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID);
assertHasOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID, ORG_MINISTRY_OF_DEFENSE_OID);

assertJackOrgtarget(null, ORG_MINISTRY_OF_OFFENSE_NAME, ORG_MINISTRY_OF_DEFENSE_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand All @@ -354,6 +415,8 @@ public void test211JackAssignMinistryOfOffenseMinister() throws Exception {
assertAssignedOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, null);
assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, null);
assertHasOrg(userJack, ORG_MINISTRY_OF_DEFENSE_OID, null);

assertJackOrgtarget(null, ORG_MINISTRY_OF_OFFENSE_NAME, ORG_MINISTRY_OF_DEFENSE_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
Expand All @@ -378,6 +441,8 @@ public void test212JackUnassignMinistryOfOffenseMember() throws Exception {
assertHasOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID, ORG_MINISTRY_OF_DEFENSE_OID);
assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, SchemaConstants.ORG_MANAGER);

assertJackOrgtarget(null, ORG_MINISTRY_OF_DEFENSE_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand All @@ -399,6 +464,8 @@ public void test213JackUnassignMinistryOfOffenseManager() throws Exception {
assertAssignedNoOrg(userJack);
assertHasOrgs(userJack, ORG_MINISTRY_OF_DEFENSE_OID);

assertJackOrgtarget(null, ORG_MINISTRY_OF_DEFENSE_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand All @@ -421,6 +488,8 @@ public void test220JackAssignMinistryOfOffenseMemberAgain() throws Exception {
assertHasOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID, ORG_MINISTRY_OF_DEFENSE_OID);
assertAssignedOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, null);
assertHasOrg(userJack, ORG_MINISTRY_OF_OFFENSE_OID, null);

assertJackOrgtarget(null, ORG_MINISTRY_OF_OFFENSE_NAME, ORG_MINISTRY_OF_DEFENSE_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
Expand Down Expand Up @@ -453,6 +522,8 @@ public void test221JackAssignScummBarAndSaveElaine() throws Exception {
assertAssignedOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID, ORG_SCUMM_BAR_OID, ORG_SAVE_ELAINE_OID);
assertHasOrgs(userJack, ORG_MINISTRY_OF_OFFENSE_OID, ORG_SCUMM_BAR_OID, ORG_SAVE_ELAINE_OID, ORG_MINISTRY_OF_DEFENSE_OID);

assertJackOrgtarget(null, ORG_MINISTRY_OF_OFFENSE_NAME, ORG_MINISTRY_OF_DEFENSE_NAME, ORG_SCUMM_BAR_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}
Expand Down Expand Up @@ -508,6 +579,8 @@ public void test223JackChangeMinistryOfOffenseMemberToManager() throws Exception
assertHasOrg(userJack, ORG_SCUMM_BAR_OID, null);
assertAssignedOrg(userJack, ORG_SAVE_ELAINE_OID, null);
assertHasOrg(userJack, ORG_SAVE_ELAINE_OID, null);

assertJackOrgtarget(null, ORG_MINISTRY_OF_DEFENSE_NAME, ORG_SCUMM_BAR_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
Expand Down Expand Up @@ -537,7 +610,7 @@ public void test230JackRecompute() throws Exception {
TestUtil.assertSuccess(result);

assertRefs23x();
assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 1);
assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 2);
}

/**
Expand Down Expand Up @@ -568,8 +641,8 @@ public void test232JackDestroyRefsAndRecompute() throws Exception {
TestUtil.assertSuccess(result);

assertRefs23x();
assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 1);
assertCounterIncrement(InternalCounters.CONNECTOR_OPERATION_COUNT, 4);
assertCounterIncrement(InternalCounters.SHADOW_FETCH_OPERATION_COUNT, 2);
assertCounterIncrement(InternalCounters.CONNECTOR_OPERATION_COUNT, 5);
}

/**
Expand Down Expand Up @@ -1598,6 +1671,13 @@ public void test439JackCleanup() throws Exception {
assertMonkeyIslandOrgSanity();
}


/**
* Now let's test working with assignments when there is an object template that prescribes an org assignment
* based on organizationalUnit property.
*
*/

/**
* MID-3545
*/
Expand Down Expand Up @@ -1709,17 +1789,82 @@ public void test449JackModifyEmployeeTypeNull() throws Exception {
assertMonkeyIslandOrgSanity();
}

@Test
public void test500JackEndPirate() throws Exception {
final String TEST_NAME = "test500JackEndPirate";
displayTestTitle(TEST_NAME);

Task task = createTask(TEST_NAME);
OperationResult result = task.getResult();

// preconditions
PrismObject<UserType> userBefore = getUser(USER_JACK_OID);
display("User before", userBefore);
assertNoAssignments(userBefore);
assertLinks(userBefore, 0);

// WHEN
assignAccount(USER_JACK_OID, RESOURCE_DUMMY_ORGTARGET_OID, null, task, result);
assignOrg(USER_JACK_OID, ORG_SCUMM_BAR_OID, task, result);
assignRole(USER_JACK_OID, ROLE_END_PIRATE_OID, task, result);

// THEN
result.computeStatus();
TestUtil.assertSuccess(result);

PrismObject<UserType> userJack = getUser(USER_JACK_OID);
display("User jack after", userJack);
assertAssignments(userJack, 3);

assertJackOrgtarget(USER_ELAINE_USERNAME, ORG_SCUMM_BAR_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}

/**
* Now let's test working with assignments when there is an object template that prescribes an org assignment
* based on organizationalUnit property.
*
* MID-4934
*/
@Test
public void test510JackEndPirate() throws Exception {
final String TEST_NAME = "test510JackEndPirate";
displayTestTitle(TEST_NAME);

login(USER_JACK_USERNAME);

Task task = createTask(TEST_NAME);
OperationResult result = task.getResult();

// WHEN
displayWhen(TEST_NAME);
modifyUserChangePassword(USER_JACK_OID, "X.marks.the.SPOT", task, result);

// THEN
displayThen(TEST_NAME);
result.computeStatus();
TestUtil.assertSuccess(result);

login(USER_ADMINISTRATOR_USERNAME);

PrismObject<UserType> userJack = getUser(USER_JACK_OID);
display("User jack after", userJack);
assertAssignments(userJack, 3);

assertJackOrgtarget(USER_ELAINE_USERNAME, ORG_SCUMM_BAR_NAME);

// Postcondition
assertMonkeyIslandOrgSanity();
}



@Test
public void test799DeleteJack() throws Exception {
final String TEST_NAME = "test799DeleteJack";
displayTestTitle(TEST_NAME);

login(USER_ADMINISTRATOR_USERNAME);

executeDeleteJack(TEST_NAME);
}

Expand All @@ -1738,7 +1883,6 @@ protected void assertUserOrg(PrismObject<UserType> user, String... orgOids) thro
protected void assertUserNoOrg(PrismObject<UserType> user) throws Exception {
assertAssignedNoOrg(user);
assertHasNoOrg(user);
assertAssignments(user, 0);
assertHasOrgs(user, 0);

}
Expand Down Expand Up @@ -1769,5 +1913,17 @@ private void assertManager(String userOid, String managerOid, String orgType, bo
}
}
}

private void assertJackOrgtarget(String expectedShip, String... expectedTitleValues) throws Exception {
DummyAccount account = assertDummyAccount(RESOURCE_DUMMY_ORGTARGET_NAME, ACCOUNT_JACK_DUMMY_USERNAME, USER_JACK_FULL_NAME, true);
display("orgtarget account", account);
String shipAccountValue = account.getAttributeValue(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_SHIP_NAME);
assertEquals("Jack's ship is wrong", expectedShip, shipAccountValue);
Set<String> titleAccountValues = account.getAttributeValues(DummyResourceContoller.DUMMY_ACCOUNT_ATTRIBUTE_TITLE_NAME, String.class);
if (titleAccountValues == null && expectedTitleValues.length == 0) {
return;
}
PrismAsserts.assertEqualsCollectionUnordered("Jack's titles are wrong", titleAccountValues, expectedTitleValues);
}

}

0 comments on commit 16533c0

Please sign in to comment.