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.

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

[4.9.x] Add isInputValidationEnabled configuration at kernel Utils #3667

Merged
merged 5 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1491,4 +1491,22 @@ private static String getMapDataAsString(Map<String, Object> data) {
builder.append(StringUtils.join(inputs.iterator(), ", ")).append(" }");
return builder.toString();
}

/**
* Function to extract InputValidationEnabled configuration from carbon.xml.
* <pre>
* {@code
* <InputValidationEnabled>true</InputValidationEnabled>
* }
* </pre>
*
* @return isInputValidationEnabled.
*/
public static boolean isInputValidationEnabled() {
Thumimku marked this conversation as resolved.
Show resolved Hide resolved

String isInputValidationEnabledConfig = ServerConfiguration.getInstance().
getFirstProperty("InputValidationEnabled");

return isInputValidationEnabledConfig == null || Boolean.parseBoolean(isInputValidationEnabledConfig);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -470,5 +470,17 @@ public void testArrayCopyOf() {
Integer[] numbers = {1, 2, 3, 4, 5, 6, 7, 8, 9};
Assert.assertEquals(CarbonUtils.arrayCopyOf(numbers), numbers);
}

@Test(groups = {"org.wso2.carbon.utils.base"}, dependsOnMethods = "testGetServerConfiguration")
public void testIsInputValidationEnabledDefault() {
ServerConfiguration.getInstance().overrideConfigurationProperty("InputValidationEnabled", null);
Assert.assertTrue(CarbonUtils.isInputValidationEnabled());
}

@Test(groups = {"org.wso2.carbon.utils.base"}, dependsOnMethods = "testGetServerConfiguration")
public void testIsInputValidationEnabled() {
ServerConfiguration.getInstance().overrideConfigurationProperty("InputValidationEnabled", "false");
Assert.assertFalse(CarbonUtils.isInputValidationEnabled());
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,10 @@
Enable following config to allow Emails as usernames.
-->
<!--EnableEmailUserName>true</EnableEmailUserName-->
<!--
Enable following config to flag input validation configuration.
-->
<isInputValidationEnabled>true</isInputValidationEnabled>

<!--
Security configurations
Expand Down
4 changes: 4 additions & 0 deletions distribution/kernel/carbon-home/repository/conf/carbon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,10 @@
Enable following config to allow Emails as usernames.
-->
<EnableEmailUserName>false</EnableEmailUserName>
<!--
Enable following config to flag input validation configuration.
-->
<isInputValidationEnabled>true</isInputValidationEnabled>
<!--EnablePasswordTrim>false</EnablePasswordTrim-->
<!--
Security configurations
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,6 @@
"tenant_mgt.enable_tenant_theme_mgt" : true,
"tenant_mgt.enable_tenant_validation_for_nonsaas_username" : true,
"jce_provider.provider_name" : "BC",
"signature_util.enable_sha256_algo" : true

"signature_util.enable_sha256_algo" : true,
"tenant_mgt.enable_input_validation" : true
}
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,10 @@
Enable following config to allow Emails as usernames.
-->
<EnableEmailUserName>{{tenant_mgt.enable_email_domain | default('false')}}</EnableEmailUserName>
<!--
Enable following config to flag input validation configuration.
-->
<isInputValidationEnabled>{{tenant_mgt.enable_input_validation}}</isInputValidationEnabled>
{% if password_trim.enable is defined %}
<EnablePasswordTrim>{{password_trim.enable}}</EnablePasswordTrim>
{% endif %}
Expand Down