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

Hide rule-based password expiry for users missing required scopes #7224

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Hide rule-based password expiry for users missing required scopes #7224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2248420
Disable rule based password expiry for users missing required scopes
PasinduYeshan Dec 18, 2024
1d32c9f
Fix handle update method
PasinduYeshan Dec 19, 2024
36632b6
Merge remote-tracking branch 'upstream/master' into migration/rule-ba…
PasinduYeshan Dec 19, 2024
6b37873
Introduce ruleBasedPasswordExpiry feature config
PasinduYeshan Jan 2, 2025
fe406f2
Merge remote-tracking branch 'upstream/master' into migration/rule-ba…
PasinduYeshan Jan 2, 2025
4f2a110
Refactor
PasinduYeshan Jan 2, 2025
058e4a4
add admin.core to changeset
PasinduYeshan Jan 2, 2025
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
7 changes: 7 additions & 0 deletions .changeset/lemon-pets-wait.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@wso2is/admin.core.v1": patch
"@wso2is/admin.validation.v1": patch
"@wso2is/console": patch
PasinduYeshan marked this conversation as resolved.
Show resolved Hide resolved
---

Disable rule based password expiry for users without required scopes
31 changes: 31 additions & 0 deletions ...le/java/org.wso2.identity.apps.console.server.feature/resources/deployment.config.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,6 +1335,37 @@
]
},
{% endif %}
{% if console.rule_based_password_expiry is defined %}
"ruleBasedPasswordExpiry": {
"disabledFeatures": [
{% if console.rule_based_password_expiry.disabled_features is defined %}
{% for feature in console.rule_based_password_expiry.disabled_features %}
"{{ feature }}"{{ "," if not loop.last }}
{% endfor %}
{% endif %}
],
"enabled": {% if console.rule_based_password_expiry.enabled is defined %} {{ console.rule_based_password_expiry.enabled }},
{% else %} true,
{% endif %}
"scopes": {
{% if console.rule_based_password_expiry.scopes is defined %}
{% for operation, scopes in console.rule_based_password_expiry.scopes.items() %}
"{{ operation }}": [
{% for scope in scopes %}
"{{ scope }}"{{ "," if not loop.last }}
{% endfor %}
]{{ "," if not loop.last }}
{% endfor %}
{% else %}
"create": [],
"read": [],
PasinduYeshan marked this conversation as resolved.
Show resolved Hide resolved
"feature": [],
"update": [],
"delete": []
{% endif %}
}
},
{% endif %}
{% if console.server is defined %}
"server": {
"disabledFeatures": [
Expand Down
23 changes: 20 additions & 3 deletions apps/console/src/public/deployment.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,9 +749,7 @@
"console:loginAndRegistration"
],
"read": [
"internal_governance_view",
PasinduYeshan marked this conversation as resolved.
Show resolved Hide resolved
"internal_group_mgt_view",
"internal_role_mgt_view"
"internal_governance_view"
],
"update": [
"internal_config_update",
Expand Down Expand Up @@ -940,6 +938,25 @@
]
}
},
"ruleBasedPasswordExpiry": {
pavinduLakshan marked this conversation as resolved.
Show resolved Hide resolved
"disabledFeatures": [],
"enabled": true,
"scopes": {
"create": [],
"delete": [],
"feature": [],
"read": [
"internal_governance_view",
"internal_group_mgt_view",
"internal_role_mgt_view"
],
"update": [
"internal_config_update",
"internal_governance_update",
"internal_validation_rule_mgt_update"
]
}
},
"saml2Configuration": {
"disabledFeatures": [],
"enabled": true,
Expand Down
4 changes: 4 additions & 0 deletions features/admin.core.v1/models/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,10 @@ export interface FeatureConfigInterface {
* Resident Outbound Provisioning feature
*/
residentOutboundProvisioning?: FeatureAccessConfigInterface;
/**
* Rule based password expiry feature
*/
ruleBasedPasswordExpiry?: FeatureAccessConfigInterface;
/**
* Connection management feature.
*/
Expand Down
5 changes: 5 additions & 0 deletions features/admin.validation.v1/constants/validation-config-constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ export class ValidationConfigConstants {
PASSWORD_MIN_VALUE: 5
};

/**
* Set of keys used to enable/disable features.
*/
public static readonly FEATURE_DICTIONARY: Map<string, string> = new Map<string, string>()
.set("RULE_BASED_PASSWORD_EXPIRY", "validation.ruleBasedPasswordExpiry");;
}

/**
Expand Down
17 changes: 12 additions & 5 deletions features/admin.validation.v1/pages/validation-config-edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ export const ValidationConfigEditPage: FunctionComponent<MyAccountSettingsEditPa
state?.config?.ui?.isPasswordInputValidationEnabled);
const disabledFeatures: string[] = useSelector((state: AppState) =>
state?.config?.ui?.features?.loginAndRegistration?.disabledFeatures);
const isRuleBasedPasswordExpiryDisabled: boolean = disabledFeatures?.includes("ruleBasedPasswordExpiry");
const featureConfig: FeatureConfigInterface = useSelector((state: AppState) => state?.config?.ui?.features);
const maxPasswordLengthLimit: number = useSelector((state: AppState) =>
state?.config?.ui?.passwordPolicyConfigs?.maxPasswordAllowedLength);
Expand Down Expand Up @@ -140,6 +139,11 @@ export const ValidationConfigEditPage: FunctionComponent<MyAccountSettingsEditPa
const [ legacyPasswordPolicies, setLegacyPasswordPolicies ] = useState<ConnectorPropertyInterface[]>([]);

const isReadOnly: boolean = !useRequiredScopes(featureConfig?.governanceConnectors?.scopes?.update);
const hasRuleBasedPasswordExpiryReadPermissions: boolean =
useRequiredScopes(featureConfig?.ruleBasedPasswordExpiry?.scopes?.read);
const isRuleBasedPasswordExpiryDisabled: boolean =
disabledFeatures?.includes(ValidationConfigConstants.FEATURE_DICTIONARY.get("RULE_BASED_PASSWORD_EXPIRY"))
|| !hasRuleBasedPasswordExpiryReadPermissions;
pavinduLakshan marked this conversation as resolved.
Show resolved Hide resolved

const {
data: passwordHistoryCountData,
Expand Down Expand Up @@ -604,12 +608,15 @@ export const ValidationConfigEditPage: FunctionComponent<MyAccountSettingsEditPa

const processedFormValues: ValidationFormInterface = {
...values,
passwordExpiryEnabled: passwordExpiryEnabled,
passwordExpiryRules: processPasswordExpiryRules(),
passwordExpirySkipFallback: passwordExpirySkipFallback,
passwordExpiryTime: defaultPasswordExpiryTime
passwordExpiryEnabled: passwordExpiryEnabled
};

if (!isRuleBasedPasswordExpiryDisabled) {
processedFormValues.passwordExpiryRules = processPasswordExpiryRules();
processedFormValues.passwordExpirySkipFallback = passwordExpirySkipFallback;
processedFormValues.passwordExpiryTime = defaultPasswordExpiryTime;
}

const updatePasswordPolicies: Promise<void> = serverConfigurationConfig.processPasswordPoliciesSubmitData(
processedFormValues,
!isPasswordInputValidationEnabled
Expand Down
Loading