Changeset 300:f1616126da30 for kraken-dom/src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.java

Timestamp:

09/05/11 21:32:37 (9 months ago)

Author:

delmitz

Branch:

default

Convert:

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

Message:

usable otp password.

File:

• kraken-dom/src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.java (modified) (5 diffs)

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

@@ -27 +27 @@
 import org.krakenapps.dom.api.AbstractApi;
 import org.krakenapps.dom.api.AdminApi;
+import org.krakenapps.dom.api.OtpApi;
 import org.krakenapps.dom.api.UserExtensionProvider;
 import org.krakenapps.dom.exception.AdminLockedException;
@@ -39 +40 @@
 import org.krakenapps.jpa.handler.JpaConfig;
 import org.krakenapps.jpa.handler.Transactional;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Component(name = "dom-admin-api")
@@ -44 +47 @@
 @JpaConfig(factory = "dom")
 public class AdminApiImpl extends AbstractApi<Admin> implements AdminApi, UserExtensionProvider {
+        private Logger logger = LoggerFactory.getLogger(AdminApiImpl.class);
+
         @Requires
         private ThreadLocalEntityManagerService entityManagerService;
 
+        @Requires(optional = true, nullable = false)
+        private OtpApi otpApi;
+
         @Override
         public String getName() {
@@ -54 +62 @@
         @Override
         public Admin login(String nick, String hash, String nonce) throws AdminNotFoundException, InvalidPasswordException {
-                Admin admin = getAdmin(nick, hash, nonce);
-
-                if (hash.equals(Sha1.hash(admin.getUser().getPassword() + nonce)) == false) {
+                Admin admin = getAdmin(nick);
+                String password = null;
+
+                logger.info("otpApi = " + otpApi);
+                if (otpApi != null && admin.isUseOtp())
+                        password = Sha1.hash(otpApi.getOtpValue(admin.getOtpSeed()));
+                else
+                        password = admin.getUser().getPassword();
+
+                if (hash.equals(Sha1.hash(password + nonce))) {
+                        updateLoginFailures(admin, true);
+                        return admin;
+                } else {
                         updateLoginFailures(admin, false);
                         throw new InvalidPasswordException();
-                } else
-                        updateLoginFailures(admin, true);
-
-                return admin;
+                }
         }
 
@@ -82 +97 @@
 
         @Transactional
-        private Admin getAdmin(String nick, String hash, String nonce) {
+        private Admin getAdmin(String nick) {
                 try {
                         EntityManager em = entityManagerService.getEntityManager();