Changeset 302:da9f9efbf4d9

Timestamp:

09/05/11 21:47:01 (5 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2736

Message:

fixed otp seed reset bug.

Location:

kraken-dom/src/main/java/org/krakenapps/dom

Files:

• api/impl/AdminApiImpl.java (modified) (3 diffs)
• msgbus/AdminPlugin.java (modified) (2 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.java

@@ -18 +18 @@
 import java.util.Date;
 import java.util.List;
+import java.util.Random;
 
 import javax.persistence.EntityManager;
@@ -254 +255 @@
                         admin.setLoginLockCount(targetAdmin.getLoginLockCount());
                         admin.setUseOtp(targetAdmin.isUseOtp());
-                        admin.setOtpSeed(targetAdmin.getOtpSeed());
+                        if (admin.isUseOtp()) {
+                                if (targetAdmin.getOtpSeed() != null)
+                                        admin.setOtpSeed(targetAdmin.getOtpSeed());
+                                else if (admin.getOtpSeed() == null)
+                                        admin.setOtpSeed(createOtpSeed());
+                        } else
+                                admin.setOtpSeed(null);
 
                         if (!admin.isEnabled() && targetAdmin.isEnabled())
@@ -268 +275 @@
                 }
         }
+
+        private static final char[] chars = new char[62];
+        static {
+                int i = 0;
+                char c = 'a';
+                for (; i < 26; i++)
+                        chars[i] = c++;
+                c = 'A';
+                for (; i < 52; i++)
+                        chars[i] = c++;
+                c = '0';
+                for (; i < 62; i++)
+                        chars[i] = c++;
+        }
+
+        private String createOtpSeed() {
+                Random random = new Random();
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < 10; i++)
+                        sb.append(chars[random.nextInt(62)]);
+                return sb.toString();
+        }
 }

kraken-dom/src/main/java/org/krakenapps/dom/msgbus/AdminPlugin.java

@@ -153 +153 @@
                         throw new IllegalArgumentException("admin not found");
 
-                if (admin.isUseOtp())
-                        admin.setOtpSeed(createOtpSeed());
-                else
-                        admin.setOtpSeed(null);
+                admin.setOtpSeed(createOtpSeed());
 
                 adminApi.updateAdmin(req.getOrgId(), req.getAdminId(), admin);
@@ -184 +181 @@
                 admin.setEnabled(req.getBoolean("is_enabled"));
                 admin.setUseOtp(req.getBoolean("use_otp"));
-                if (admin.isUseOtp()) {
-                        if (admin.getOtpSeed() == null)
-                                admin.setOtpSeed(createOtpSeed());
-                } else
-                        admin.setOtpSeed(null);
 
                 admin.validate();