Author: cmailleux
Date: Thu Jul 12 18:08:01 2007
New Revision: 17975
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17975&repname=
=3Djahia
Log:
Port of commit [17298] Resolve issue ESI-310
Modified:
trunk/core/src/java/org/jahia/services/esi/EsiURLGeneratorService.java
Modified: trunk/core/src/java/org/jahia/services/esi/EsiURLGeneratorService=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/esi/EsiURLGeneratorService.java&rev=3D17975&repname=3Djah=
ia
=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
--- trunk/core/src/java/org/jahia/services/esi/EsiURLGeneratorService.java =
(original)
+++ trunk/core/src/java/org/jahia/services/esi/EsiURLGeneratorService.java =
Thu Jul 12 18:08:01 2007
@@ -200,30 +200,32 @@
* */
public String encodeUsername(JahiaUser curUser) {
StringBuffer curUserKey =3D new StringBuffer();
- curUserKey.append(curUser.getUserKey());
- //curUsername =3D Base64.encode(curUsername.getBytes());
-
- if (Jahia.getSettings().getEsiEncryptUserIdentifiers()) {
- //time-to-live constraint to keys so that they expire every week
- Calendar rightNow =3D Calendar.getInstance();
- int week =3D rightNow.get(Calendar.WEEK_OF_YEAR);
- curUserKey.append("_").append(Integer.toString(week)).append("=
_");
-
- //include a unique UUID for each user
- String uuid =3D curUser.getProperty("ESI_USER_UUID");
- if (uuid=3D=3Dnull) {
- uuid =3D idGen.nextIdentifier().toString();
- if (!curUser.setProperty("ESI_USER_UUID", uuid)) {
- logger.error("[esi] : Could not save ESI_USER_UUID in=
current User's properties: ["+curUser+"]");
+ if (curUser !=3D null) {
+ curUserKey.append(curUser.getUserKey());
+ //curUsername =3D Base64.encode(curUsername.getBytes());
+
+ if (Jahia.getSettings().getEsiEncryptUserIdentifiers()) {
+ //time-to-live constraint to keys so that they expire ever=
y week
+ Calendar rightNow =3D Calendar.getInstance();
+ int week =3D rightNow.get(Calendar.WEEK_OF_YEAR);
+ curUserKey.append("_").append(Integer.toString(week)).appe=
nd("_");
+
+ //include a unique UUID for each user
+ String uuid =3D curUser.getProperty("ESI_USER_UUID");
+ if (uuid =3D=3D null) {
+ uuid =3D idGen.nextIdentifier().toString();
+ if (!curUser.setProperty("ESI_USER_UUID", uuid)) {
+ logger.error("[esi] : Could not save ESI_USER_UUID=
in current User's properties: [" +
+ curUser +
+ "]");
+ }
}
+ curUserKey.append("_").append(uuid).append("_");
+ //TODO: include a few characters from password string for =
extra security
}
- curUserKey.append("_").append(uuid).append("_");
- //TODO: include a few characters from password string for extr=
a security
- }
-
- if (logger.isDebugEnabled()) =
- logger.debug("[esi] : encodeUsername(): "+curUserKey.toString(=
));
=
+ if (logger.isDebugEnabled()) logger.debug("[esi] : encodeUsern=
ame(): " + curUserKey.toString());
+ }
return encodeString(curUserKey.toString());
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
