Author: sshyrkov
Date: Wed Aug 22 16:24:21 2007
New Revision: 18239
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18239&repname=
=3Djahia
Log:
Fix: if the user does not belong to any group the isPolicyEnabled alwasy re=
turns false. This is fixed now
Modified:
branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/pwdpolicy/JahiaPasswordPolicyService.java
Modified: branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/s=
ervices/pwdpolicy/JahiaPasswordPolicyService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-VODAFO=
NE-5-0-2-SP%20BRANCH/core/src/java/org/jahia/services/pwdpolicy/JahiaPasswo=
rdPolicyService.java&rev=3D18239&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/pwdpolicy/JahiaPasswordPolicyService.java (original)
+++ branches/JAHIA-VODAFONE-5-0-2-SP BRANCH/core/src/java/org/jahia/service=
s/pwdpolicy/JahiaPasswordPolicyService.java Wed Aug 22 16:24:21 2007
@@ -173,24 +173,28 @@
JahiaGroupManagerService groupMgr =3D ServicesRegistry
.getInstance().getJahiaGroupManagerService();
List groups =3D groupMgr.getUserMembership(user);
- boolean enforccePolicyAtLeastForOneGroup =3D false;
- for (Iterator iterator =3D groups.iterator(); iterator.has=
Next();) {
- String groupName =3D (String) iterator.next();
- JahiaGroup group =3D groupMgr.lookupGroup(groupName);
- if (group !=3D null) {
- String propValue =3D group
- .getProperty(JahiaGroup.PROPERTY_ENFORCE_P=
ASSWORD_POLICY);
- // is porperty for group not set (overriden) or is=
true?
- if (StringUtils.isEmpty(propValue)
- || "true".equals(propValue)) {
- // we do force policy check
- enforccePolicyAtLeastForOneGroup =3D true;
- break;
+ if (groups.size() > 0) {
+ boolean enforcePolicyAtLeastForOneGroup =3D false;
+ for (Iterator iterator =3D groups.iterator(); iterator
+ .hasNext();) {
+ String groupName =3D (String) iterator.next();
+ JahiaGroup group =3D groupMgr.lookupGroup(groupNam=
e);
+ if (group !=3D null) {
+ String propValue =3D group
+ .getProperty(JahiaGroup.PROPERTY_ENFOR=
CE_PASSWORD_POLICY);
+ // is porperty for group not set (overriden) o=
r is
+ // true?
+ if (StringUtils.isEmpty(propValue)
+ || "true".equals(propValue)) {
+ // we do force policy check
+ enforcePolicyAtLeastForOneGroup =3D true;
+ break;
+ }
}
}
+ enforcePolicy =3D enforcePolicy
+ && enforcePolicyAtLeastForOneGroup;
}
- enforcePolicy =3D enforcePolicy
- && enforccePolicyAtLeastForOneGroup;
}
} catch (JahiaException ex) {
logger.error("Unable to retrieve a property "
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
