Skip to content

Commit

Permalink
Replace hostname and port with placeholders of callback URLs.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thisara-Welmilla
Thisara-Welmilla committed Nov 6, 2023
1 parent 4961b54 commit 0089f94
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 9 deletions.
51 changes: 43 additions & 8 deletions ...2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
import org.wso2.carbon.identity.application.common.model.ServiceProvider;
import org.wso2.carbon.identity.application.common.model.User;
import org.wso2.carbon.identity.application.mgt.ApplicationMgtUtil;
import org.wso2.carbon.identity.core.ServiceURL;
import org.wso2.carbon.identity.core.ServiceURLBuilder;
import org.wso2.carbon.identity.core.URLBuilderException;
import org.wso2.carbon.identity.core.util.IdentityDatabaseUtil;
import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
import org.wso2.carbon.identity.core.util.IdentityUtil;
Expand Down Expand Up @@ -66,6 +70,8 @@
import java.util.Optional;
import java.util.Set;

import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.Application.CONSOLE_APP_PATH;
import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.Application.MY_ACCOUNT_APP_PATH;
import static org.wso2.carbon.identity.oauth.OAuthUtil.handleError;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.BACK_CHANNEL_LOGOUT_URL;
import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.BYPASS_CLIENT_CREDENTIALS;
Expand Down Expand Up @@ -118,6 +124,7 @@ public class OAuthAppDAO {
private static final String APP_ACCESS_TOKEN_EXPIRE_TIME = "APP_ACCESS_TOKEN_EXPIRE_TIME";
private static final String REFRESH_TOKEN_EXPIRE_TIME = "REFRESH_TOKEN_EXPIRE_TIME";
private static final String ID_TOKEN_EXPIRE_TIME = "ID_TOKEN_EXPIRE_TIME";
private static final String ORIGIN_PLACEHOLDER = "<HOSTNAME>:<PORT>";

private TokenPersistenceProcessor persistenceProcessor;
private boolean isHashDisabled = OAuth2Util.isHashDisabled();
Expand Down Expand Up @@ -160,7 +167,8 @@ public void addOAuthApplication(OAuthAppDO consumerAppDO) throws IdentityOAuthAd
prepStmt.setString(5, userStoreDomain);
prepStmt.setString(6, consumerAppDO.getApplicationName());
prepStmt.setString(7, consumerAppDO.getOauthVersion());
prepStmt.setString(8, consumerAppDO.getCallbackUrl());
prepStmt.setString(8,
ApplicationMgtUtil.replaceUrlOriginWithPlaceholders(consumerAppDO.getCallbackUrl()));
prepStmt.setString(9, consumerAppDO.getGrantTypes());
prepStmt.setString(10, consumerAppDO.isPkceMandatory() ? "1" : "0");
prepStmt.setString(11, consumerAppDO.isPkceSupportPlain() ? "1" : "0");
Expand Down Expand Up @@ -206,6 +214,9 @@ public void addOAuthApplication(OAuthAppDO consumerAppDO) throws IdentityOAuthAd
"TokenPersistenceProcessor", null);
} catch (InvalidOAuthClientException e) {
throw handleError("Error occurred while processing client id", e);
} catch (URLBuilderException e) {
throw handleError(
"Error occurred when replacing origin of the access URL with placeholders", e);
}
} else {
String msg = "An application with the same name already exists.";
Expand Down Expand Up @@ -309,7 +320,8 @@ public OAuthAppDO[] getOAuthConsumerAppsOfUser(String username, int tenantId) th
}
oauthApp.setApplicationName(rSet.getString(3));
oauthApp.setOauthVersion(rSet.getString(4));
oauthApp.setCallbackUrl(rSet.getString(5));
oauthApp.setCallbackUrl(
ApplicationMgtUtil.resolveOriginUrlFromPlaceholders(rSet.getString(5)));
oauthApp.setGrantTypes(rSet.getString(6));
oauthApp.setId(rSet.getInt(7));
AuthenticatedUser authenticatedUser = new AuthenticatedUser();
Expand Down Expand Up @@ -340,6 +352,9 @@ public OAuthAppDO[] getOAuthConsumerAppsOfUser(String username, int tenantId) th
} catch (IdentityOAuth2Exception e) {
throw handleError("Error occurred while processing client id and client secret by " +
"TokenPersistenceProcessor", e);
} catch (URLBuilderException e) {
throw handleError(
"Error occurred when replacing origin of the access URL with placeholders", e);
}
return oauthAppsOfUser;
}
Expand Down Expand Up @@ -408,7 +423,8 @@ public OAuthAppDO getAppInformation(String consumerKey, int tenantId) throws
authenticatedUser.setUserName(rSet.getString(2));
oauthApp.setApplicationName(rSet.getString(3));
oauthApp.setOauthVersion(rSet.getString(4));
oauthApp.setCallbackUrl(rSet.getString(5));
oauthApp.setCallbackUrl(
ApplicationMgtUtil.resolveOriginUrlFromPlaceholders(rSet.getString(5)));
authenticatedUser.setTenantDomain(IdentityTenantUtil.getTenantDomain(rSet.getInt(6)));
authenticatedUser.setUserStoreDomain(rSet.getString(7));
oauthApp.setUser(authenticatedUser);
Expand Down Expand Up @@ -436,6 +452,9 @@ public OAuthAppDO getAppInformation(String consumerKey, int tenantId) throws
}
} catch (SQLException e) {
throw new IdentityOAuth2Exception("Error while retrieving the app information", e);
} catch (URLBuilderException e) {
throw new IdentityOAuth2Exception(
"Error occurred when replacing origin of the access URL with placeholders", e);
}
return oauthApp;
}
Expand Down Expand Up @@ -487,7 +506,8 @@ public OAuthAppDO getAppInformation(String consumerKey, AccessTokenDO accessToke
authenticatedUser.setUserName(rSet.getString(USERNAME));
oauthApp.setApplicationName(rSet.getString(APP_NAME));
oauthApp.setOauthVersion(rSet.getString(OAUTH_VERSION));
oauthApp.setCallbackUrl(rSet.getString(CALLBACK_URL));
oauthApp.setCallbackUrl(
ApplicationMgtUtil.resolveOriginUrlFromPlaceholders(rSet.getString(CALLBACK_URL)));
authenticatedUser.setTenantDomain(IdentityTenantUtil.getTenantDomain(rSet.getInt(TENANT_ID)));
authenticatedUser.setUserStoreDomain(rSet.getString(USER_DOMAIN));
oauthApp.setAppOwner(authenticatedUser);
Expand Down Expand Up @@ -515,6 +535,9 @@ public OAuthAppDO getAppInformation(String consumerKey, AccessTokenDO accessToke
}
} catch (SQLException e) {
throw new IdentityOAuth2Exception("Error while retrieving the app information", e);
} catch (URLBuilderException e) {
throw new IdentityOAuth2Exception(
"Error occurred when replacing origin of the access URL with placeholders", e);
}
return oauthApp;
}
Expand Down Expand Up @@ -553,7 +576,8 @@ public OAuthAppDO[] getAppsForConsumerKey(String consumerKey)
authenticatedUser.setUserName(rSet.getString(USERNAME));
oauthApp.setApplicationName(rSet.getString(APP_NAME));
oauthApp.setOauthVersion(rSet.getString(OAUTH_VERSION));
oauthApp.setCallbackUrl(rSet.getString(CALLBACK_URL));
oauthApp.setCallbackUrl(
ApplicationMgtUtil.resolveOriginUrlFromPlaceholders(rSet.getString(CALLBACK_URL)));
authenticatedUser.setTenantDomain(IdentityTenantUtil.getTenantDomain(rSet.getInt(TENANT_ID)));
authenticatedUser.setUserStoreDomain(rSet.getString(USER_DOMAIN));
oauthApp.setAppOwner(authenticatedUser);
Expand All @@ -570,7 +594,6 @@ public OAuthAppDO[] getAppsForConsumerKey(String consumerKey)
String spTenantDomain = authenticatedUser.getTenantDomain();
handleSpOIDCProperties(connection, preprocessedClientId, spTenantDomain, oauthApp);
oauthApp.setScopeValidators(getScopeValidators(connection, oauthApp.getId()));

oauthAppList.add(oauthApp);
}
}
Expand All @@ -582,6 +605,9 @@ public OAuthAppDO[] getAppsForConsumerKey(String consumerKey)
}
} catch (SQLException e) {
throw new IdentityOAuth2Exception("Error while retrieving the app information", e);
} catch (URLBuilderException e) {
throw new IdentityOAuth2Exception(
"Error occurred when replacing origin of the access URL with placeholders", e);
}

return oauthAppList.toArray(new OAuthAppDO[oauthAppList.size()]);
Expand Down Expand Up @@ -629,7 +655,8 @@ public OAuthAppDO getAppInformationByAppName(String appName) throws
(4));
oauthApp.setOauthConsumerKey(preprocessedClientId);
oauthApp.setOauthVersion(rSet.getString(5));
oauthApp.setCallbackUrl(rSet.getString(6));
oauthApp.setCallbackUrl(
ApplicationMgtUtil.resolveOriginUrlFromPlaceholders(rSet.getString(6)));
oauthApp.setGrantTypes(rSet.getString(7));
oauthApp.setId(rSet.getInt(8));
oauthApp.setPkceMandatory(!"0".equals(rSet.getString(9)));
Expand All @@ -652,17 +679,22 @@ public OAuthAppDO getAppInformationByAppName(String appName) throws
}
} catch (SQLException e) {
throw new IdentityOAuth2Exception("Error while retrieving the app information", e);
} catch (URLBuilderException e) {
throw new IdentityOAuth2Exception(
"Error occurred when replacing origin of the access URL with placeholders", e);
}
return oauthApp;
}

public void updateConsumerApplication(OAuthAppDO oauthAppDO) throws IdentityOAuthAdminException {

boolean isUserValidForOwnerUpdate = validateUserForOwnerUpdate(oauthAppDO);
try (Connection connection = IdentityDatabaseUtil.getDBConnection()) {
String sqlQuery = getSqlQuery(isUserValidForOwnerUpdate);
try (PreparedStatement prepStmt = connection.prepareStatement(sqlQuery)) {
prepStmt.setString(1, oauthAppDO.getApplicationName());
prepStmt.setString(2, oauthAppDO.getCallbackUrl());
prepStmt.setString(2,
ApplicationMgtUtil.replaceUrlOriginWithPlaceholders(oauthAppDO.getCallbackUrl()));
prepStmt.setString(3, oauthAppDO.getGrantTypes());

if (isUserValidForOwnerUpdate) {
Expand All @@ -687,6 +719,9 @@ public void updateConsumerApplication(OAuthAppDO oauthAppDO) throws IdentityOAut
} catch (IdentityOAuth2Exception e) {
throw handleError("Error occurred while processing client id and client secret by " +
"TokenPersistenceProcessor", e);
} catch (URLBuilderException e) {
throw handleError(
"Error occurred when replacing origin of the access URL with placeholders", e);
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@
<carbon.kernel.registry.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version.range>

<!-- Carbon Identity Framework version -->
<carbon.identity.framework.version>5.25.459</carbon.identity.framework.version>
<carbon.identity.framework.version>5.25.478</carbon.identity.framework.version>
<carbon.identity.framework.imp.pkg.version.range>[5.25.234, 7.0.0)
</carbon.identity.framework.imp.pkg.version.range>

Expand Down

0 comments on commit 0089f94

Please sign in to comment.