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

Fix issues in custom implementations #449

Merged
merged 5 commits into from
Apr 25, 2024
Merged

Fix issues in custom implementations #449

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
3336bd3
Fix custom-jdbc-user-store-manager issues.
mpmadhavig Apr 24, 2024
966c6eb
Fix post.authn.handler.disclaimer issues.
mpmadhavig Apr 24, 2024
955b8a6
Fix workflow compilation issues.
mpmadhavig Apr 24, 2024
2d35c7a
URL encode application name in request post.authn.handler.disclaimer.
mpmadhavig Apr 24, 2024
b7082d3
Fix mobile grant issues.
mpmadhavig Apr 25, 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
2 changes: 1 addition & 1 deletion etc/sample-post-authentication-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
javax.servlet.http,
org.apache.commons.logging,
org.osgi.framework,
org.osgi.service.component,
org.osgi.service.component.*;version="${osgi.service.component.imp.pkg.version.range}",
org.wso2.carbon.identity.application.authentication.framework.config,
org.wso2.carbon.identity.application.authentication.framework.config.model,
org.wso2.carbon.identity.application.authentication.framework.context,
Expand Down
18 changes: 12 additions & 6 deletions ...o2/carbon/identity/post/authn/handler/disclaimer/DisclaimerPostAuthenticationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@

package org.wso2.carbon.identity.post.authn.handler.disclaimer;

import org.apache.commons.codec.digest.DigestUtils;
import org.wso2.carbon.identity.application.authentication.framework.config.ConfigurationFacade;
import org.wso2.carbon.identity.application.authentication.framework.context.AuthenticationContext;
import org.wso2.carbon.identity.application.authentication.framework.exception.PostAuthenticationFailedException;
import org.wso2.carbon.identity.application.authentication.framework.handler.request.AbstractPostAuthnHandler;
import org.wso2.carbon.identity.application.authentication.framework.handler.request.PostAuthnHandlerFlowStatus;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkUtils;

import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

Expand All @@ -54,15 +55,20 @@ public PostAuthnHandlerFlowStatus handle(HttpServletRequest httpServletRequest,
}
} else {
try {
String urlEncodedApplicationName = new URI(null, null, authenticationContext
.getSequenceConfig().getApplicationConfig().getApplicationName(), null).toASCIIString();

httpServletResponse.sendRedirect
(ConfigurationFacade.getInstance().getAuthenticationEndpointURL().replace("/login.do", ""
) + "/disclaimer" + ".jsp?sessionDataKey=" + authenticationContext.getContextIdentifier() +
"&application=" + authenticationContext
.getSequenceConfig().getApplicationConfig().getApplicationName());
(ConfigurationFacade.getInstance().getAuthenticationEndpointURL().replace("/login.do", "") +
"/disclaimer.jsp?sessionDataKey=" + authenticationContext.getContextIdentifier() +
"&application=" + urlEncodedApplicationName);
setConsentPoppedUpState(authenticationContext);
return PostAuthnHandlerFlowStatus.INCOMPLETE;
} catch (IOException e) {
throw new PostAuthenticationFailedException("Invalid Consent", "Error while redirecting", e);
} catch (URISyntaxException e) {
throw new PostAuthenticationFailedException("Invalid Application Name",
"Error encoding application name", e);
}
}
}
Expand Down
23 changes: 12 additions & 11 deletions .../custom-grant/src/main/java/org/wso2/sample/identity/oauth2/grant/mobile/MobileGrant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;

import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* New grant type for Identity Server
Expand Down Expand Up @@ -158,22 +160,21 @@ public boolean validateScope(OAuthTokenReqMessageContext tokReqMsgCtx)


/**
* TODO
*
* You need to implement how to validate the mobile number
*
* @param mobileNumber
* @return
* @param mobileNumber Mobile number of the user.
* @return true if the mobile number is valid, otherwise false.
*/
private boolean isValidMobileNumber(String mobileNumber){

// just demo validation

if(mobileNumber.startsWith("033")){
return true;
}

return false;
// Regular expression to match 10 digits, with optional country code
String pattern = "^(\\+\\d{1,3})?\\d{10}$";
// Create a Pattern object
Pattern r = Pattern.compile(pattern);
// Create Matcher object
Matcher m = r.matcher(mobileNumber);
// Check if the pattern matches
return m.matches();
}

@Override
Expand Down
34 changes: 17 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,38 +489,38 @@
<artifactId>commons-pool</artifactId>
<version>${commons.pool.wso2.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.workflow.mgt.stub</artifactId>
<version>${carbon.identity.framework.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
<version>${carbon.identity.framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<groupId>org.wso2.carbon.identity.workflow.impl.bps</groupId>
<artifactId>org.wso2.carbon.identity.workflow.mgt</artifactId>
<version>${carbon.identity.framework.version}</version>
<version>${identity.workflow.impl.bps.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
<version>${carbon.identity.framework.version}</version>
<scope>compile</scope>
<groupId>org.wso2.carbon.identity.workflow.impl.bps</groupId>
<artifactId>org.wso2.carbon.identity.workflow.mgt.stub</artifactId>
<version>${identity.workflow.impl.bps.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.workflow.impl.bps</groupId>
<artifactId>org.wso2.carbon.identity.workflow.impl.stub</artifactId>
<artifactId>org.wso2.carbon.identity.workflow.impl</artifactId>
<version>${identity.workflow.impl.bps.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.workflow.impl.bps</groupId>
<artifactId>org.wso2.carbon.identity.workflow.impl</artifactId>
<artifactId>org.wso2.carbon.identity.workflow.impl.stub</artifactId>
<version>${identity.workflow.impl.bps.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
<version>${carbon.identity.framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.user.ws</groupId>
<artifactId>org.wso2.carbon.um.ws.api</artifactId>
Expand Down Expand Up @@ -857,7 +857,7 @@
<identity.framework.version>7.0.110</identity.framework.version>
<maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
<maven.scr.plugin.version>1.22.0</maven.scr.plugin.version>
<maven.bundle.plugin.version>3.2.0</maven.bundle.plugin.version>
<maven.bundle.plugin.version>2.4.0</maven.bundle.plugin.version>
<maven.buildnumber.plugin.version>1.4</maven.buildnumber.plugin.version>
<http.client.version>4.5.13</http.client.version>
<http.core.version>4.4.8</http.core.version>
Expand All @@ -883,9 +883,9 @@
<securevault.wso2.version>1.1.3</securevault.wso2.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
<identity.user.ws.version>5.4.0</identity.user.ws.version>
<carbon.identity.framework.version>5.18.0</carbon.identity.framework.version>
<carbon.identity.framework.version>7.0.110</carbon.identity.framework.version>
<commons.pool.wso2.version>1.5.6.wso2v1</commons.pool.wso2.version>
<identity.workflow.impl.bps.version>5.4.1</identity.workflow.impl.bps.version>
<identity.workflow.impl.bps.version>5.5.7</identity.workflow.impl.bps.version>
<identity.user.ws.version>5.4.0</identity.user.ws.version>
<slf4j.version>1.7.28</slf4j.version>
<rampart.wso2.version>1.6.1-wso2v43</rampart.wso2.version>
Expand Down Expand Up @@ -915,7 +915,7 @@
<commons.logging.version.range>[1.2.0,2.0.0)</commons.logging.version.range>
<commons.model.version.range>[5.18,6.0)</commons.model.version.range>
<commons-lang.wso2.version>2.6.0.wso2v1</commons-lang.wso2.version>
<carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
<carbon.identity.framework.version.range>[5.14.67, 8.0.0]</carbon.identity.framework.version.range>
<nimbusds.osgi.version.range>[2.26.0,8.0.0)</nimbusds.osgi.version.range>
<json-smart.version.range>[1.3.0,3.0.0)</json-smart.version.range>
<oauth2.outbound.version.range>[1.0.5, 2.0.0)</oauth2.outbound.version.range>
Expand Down
16 changes: 14 additions & 2 deletions sample-outbound-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<repository>
<id>wso2-nexus</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<url>https://maven.wso2.org/nexus/content/groups/wso2-public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
Expand All @@ -142,13 +142,25 @@
<repository>
<id>wso2.releases</id>
<name>WSO2 internal Repository</name>
<url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
<url>https://maven.wso2.org/nexus/content/repositories/releases/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
<repository>
<id>wso2.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>https://maven.wso2.org/nexus/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
</snapshots>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>

<properties>
Expand Down
12 changes: 6 additions & 6 deletions user-mgt/custom-jdbc-user-store-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

<parent>
<groupId>org.wso2.samples.is</groupId>
<artifactId>wso2is-identity-samples-usermgt</artifactId>
<artifactId>samples-is</artifactId>
<version>4.6.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>../../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.custom.user.store</artifactId>
<artifactId>custom-jdbc-user-store-manager</artifactId>
<packaging>bundle</packaging>
<name>Custom JDBC User-store Manager</name>
<description>Custom JDBC User-store Manager</description>
Expand Down Expand Up @@ -120,7 +120,7 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>
org.wso2.custom.user.store.internal.*,
org.wso2.custom.user.store.internal,
org.jasypt.*
</Private-Package>
<Export-Package>
Expand Down Expand Up @@ -149,10 +149,10 @@
<properties>
<!-- Custom component versions -->
<wso2.custom.components.exp.pkg.version>${project.version}</wso2.custom.components.exp.pkg.version>
<wso2.custom.componets.imp.pkg.version.range>[1.0.0, 2.0.0)</wso2.custom.componets.imp.pkg.version.range>
<wso2.custom.componets.imp.pkg.version.range>[4.6.0, 5.0.0)</wso2.custom.componets.imp.pkg.version.range>

<!--Carbon Kernel Version-->
<carbon.kernel.version>4.6.2</carbon.kernel.version>
<carbon.kernel.version>4.10.13</carbon.kernel.version>
<carbon.kernel.package.import.version.range>[4.6.0, 5.0.0)</carbon.kernel.package.import.version.range>
<carbon.user.api.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.user.api.imp.pkg.version.range>

Expand Down
2 changes: 1 addition & 1 deletion workflow/handler/service-provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<groupId>org.wso2.carbon.identity.workflow.impl.bps</groupId>
<artifactId>org.wso2.carbon.identity.workflow.mgt</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion workflow/template/sample-template/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<groupId>org.wso2.carbon.identity.workflow.impl.bps</groupId>
<artifactId>org.wso2.carbon.identity.workflow.mgt</artifactId>
</dependency>
<dependency>
Expand Down
Loading