java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java | 17
+++++-----
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 64667a91e02e48802a9b5bff64141644c5dafcf9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Sep 30 14:36:37 2011 +0200
602179 - limit fake generated password to maximal password length
for PAM enabled logins
diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
index 57e9b87..80c87e6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgCreateAction.java
@@ -16,6 +16,7 @@ package com.redhat.rhn.frontend.action.multiorg;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
+import com.redhat.rhn.common.conf.UserDefaults;
import com.redhat.rhn.common.util.MD5Crypt;
import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.frontend.action.user.UserActionHelper;
@@ -24,6 +25,7 @@ import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.manager.org.CreateOrgCommand;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -73,14 +75,15 @@ public class OrgCreateAction extends RhnAction {
*/
if (dynaForm.get("usepam") != null &&
((Boolean) dynaForm.get("usepam")).booleanValue()) {
- String hash = MD5Crypt.crypt("" + System.currentTimeMillis());
- if (dynaForm.get(UserActionHelper.DESIRED_PASS) == null ||
- dynaForm.get(UserActionHelper.DESIRED_PASS).equals(""))
{
- dynaForm.set(UserActionHelper.DESIRED_PASS, hash);
+ String fakePassword = MD5Crypt.crypt("" +
System.currentTimeMillis()).
+ substring(0, UserDefaults.get().getMaxPasswordLength());
+ if (StringUtils.isEmpty(
+ (String) dynaForm.get(UserActionHelper.DESIRED_PASS))) {
+ dynaForm.set(UserActionHelper.DESIRED_PASS, fakePassword);
}
- if (dynaForm.get(UserActionHelper.DESIRED_PASS_CONFIRM) == null ||
-
dynaForm.get(UserActionHelper.DESIRED_PASS_CONFIRM).equals("")) {
- dynaForm.set(UserActionHelper.DESIRED_PASS_CONFIRM, hash);
+ if (StringUtils.isEmpty(
+ (String) dynaForm.get(UserActionHelper.DESIRED_PASS_CONFIRM))) {
+ dynaForm.set(UserActionHelper.DESIRED_PASS_CONFIRM, fakePassword);
}
}
Show replies by thread