Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate user store domain of the parent user invitation flow #402

Merged
merged 5 commits into from
Oct 24, 2024
Merged

Validate user store domain of the parent user invitation flow #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58deac0
Validate user store domain of the parent user invitation flow
sadilchamishka Oct 17, 2024
60c5cbf
Add unit test for invalid invitation domain and Revamp Organization u…
sadilchamishka Oct 17, 2024
b4bfe47
Fix Jacoco plugin issues
sadilchamishka Oct 17, 2024
9b9a9d1
Improve codecov configs ins pr-builder.yml
sadilchamishka Oct 17, 2024
a310b29
Refactor unit tests
sadilchamishka Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/pr-builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up Adopt JDK 8
- name: Set up Adopt JDK 11
uses: actions/setup-java@v2
with:
java-version: "8"
java-version: "11"
distribution: "adopt"
- name: Cache local Maven repository
id: cache-maven-m2
Expand All @@ -39,8 +39,11 @@ jobs:
- name: Build with Maven
run: mvn clean install -U -B

- name: Generate coverage report
run: mvn test jacoco:report

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: components/**/target/site/jacoco/jacoco.xml
files: target/site/jacoco/jacoco.xml
38 changes: 3 additions & 35 deletions components/org.wso2.carbon.identity.organization.discovery.service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,49 +138,17 @@
<version>${jacoco.version}</version>
<executions>
<execution>
<id>default-instrument</id>
<goals>
<goal>instrument</goal>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>default-restore-instrumented-classes</id>
<goals>
<goal>restore-instrumented-classes</goal>
</goals>
</execution>
<execution>
<id>default-report</id>
<phase>prepare-package</phase>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>default-report-integration</id>
<goals>
<goal>report-integration</goal>
</goals>
</execution>
<execution>
<id>default-check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule implementation="org.jacoco.maven.RuleConfiguration">
<element>BUNDLE</element>
<limits>
<limit implementation="org.jacoco.report.check.Limit">
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
</limit>
</limits>
</rule>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
19 changes: 3 additions & 16 deletions components/org.wso2.carbon.identity.organization.management.application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,30 +205,17 @@
<version>${jacoco.version}</version>
<executions>
<execution>
<id>default-instrument</id>
<goals>
<goal>instrument</goal>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>default-restore-instrumented-classes</id>
<goals>
<goal>restore-instrumented-classes</goal>
</goals>
</execution>
<execution>
<id>default-report</id>
<phase>prepare-package</phase>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>default-report-integration</id>
<goals>
<goal>report-integration</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
19 changes: 3 additions & 16 deletions components/org.wso2.carbon.identity.organization.management.handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,30 +161,17 @@
<version>${jacoco.version}</version>
<executions>
<execution>
<id>default-instrument</id>
<goals>
<goal>instrument</goal>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>default-restore-instrumented-classes</id>
<goals>
<goal>restore-instrumented-classes</goal>
</goals>
</execution>
<execution>
<id>default-report</id>
<phase>prepare-package</phase>
<id>report</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
<execution>
<id>default-report-integration</id>
<goals>
<goal>report-integration</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
10 changes: 0 additions & 10 deletions ...onents/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand Down
15 changes: 5 additions & 10 deletions components/org.wso2.carbon.identity.organization.user.invitation.management/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand All @@ -102,6 +92,11 @@
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
13 changes: 13 additions & 0 deletions ...o2/carbon/identity/organization/user/invitation/management/InvitationCoreServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_GROUP;
import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_INVITATION_ID;
import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_ROLE;
import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVALID_USER_STORE_DOMAIN;
import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVITATION_EXPIRED;
import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_INVITED_USER_EMAIL_NOT_FOUND;
import static org.wso2.carbon.identity.organization.user.invitation.management.constant.UserInvitationMgtConstants.ErrorMessage.ERROR_CODE_NO_INVITATION_FOR_USER;
Expand Down Expand Up @@ -149,6 +150,7 @@ public List<InvitationResult> createInvitations(InvitationDO invitationDO) throw
String parentTenantDomain = resolveTenantDomain(parentOrgId);
int parentTenantId = IdentityTenantUtil.getTenantId(parentTenantDomain);
AbstractUserStoreManager userStoreManager = getAbstractUserStoreManager(parentTenantId);
validateInvitedUserStoreDomain(userStoreManager, invitationDO.getUserDomain());
for (String username : invitationDO.getUsernamesList()) {
if (LOG.isDebugEnabled()) {
LOG.debug("Creating invitation for the user: " + username + " in the organization: " +
Expand Down Expand Up @@ -732,6 +734,17 @@ private void validateGroupAssignments(InvitationDO invitation, String invitedTen
}
}

private void validateInvitedUserStoreDomain(AbstractUserStoreManager userStoreManager, String domain)
throws UserInvitationMgtException {

LOG.debug("Validating the user store domain of the invitation.");
if (userStoreManager.getSecondaryUserStoreManager(domain) == null) {
throw new UserInvitationMgtClientException(ERROR_CODE_INVALID_USER_STORE_DOMAIN.getCode(),
ERROR_CODE_INVALID_USER_STORE_DOMAIN.getMessage(),
String.format(ERROR_CODE_INVALID_USER_STORE_DOMAIN.getDescription(), domain));
}
}

private String resolveTenantDomain(String orgId) throws UserInvitationMgtServerException {

try {
Expand Down
3 changes: 3 additions & 0 deletions ...identity/organization/user/invitation/management/constant/UserInvitationMgtConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ public enum ErrorMessage {
ERROR_CODE_GROUP_EXISTENCE("10035",
"Error while checking the group existence.",
"Could not resolve the group existence from the given list."),
ERROR_CODE_INVALID_USER_STORE_DOMAIN("10036",
"Invalid user store domain specified in the invitation.",
"Could not find a user store domain with identifier %s."),

// DAO layer errors
ERROR_CODE_STORE_INVITATION("10501",
Expand Down
Loading
Loading