Changeset 2255

Timestamp:

Feb 26, 2014, 11:34:55 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #580: Authenticate users using YubiKey? sticks

Updating code to make it compatible with BASE core after ​http://base.thep.lu.se/changeset/6425

Location:

extensions/net.sf.basedb.yubikey/trunk/src/net/sf/basedb/yubikey

Files:

• YubiKey.java (modified) (2 diffs)
• YubiKeyAuthenticationManager.java (modified) (4 diffs)

extensions/net.sf.basedb.yubikey/trunk/src/net/sf/basedb/yubikey/YubiKey.java

@@ -22 +22 @@
 package net.sf.basedb.yubikey;
 
+import net.sf.basedb.core.authentication.AuthenticationMethod;
+
 /**
   Global constants for the YubiKey package.
@@ -35 +37 @@
 
 
+  public static final AuthenticationMethod AUTHENTICATION_METHOD = AuthenticationMethod.getInstance("yubikey");
+  
 }

extensions/net.sf.basedb.yubikey/trunk/src/net/sf/basedb/yubikey/YubiKeyAuthenticationManager.java

@@ -7 +7 @@
 
 import net.sf.basedb.core.AuthenticationContext;
-import net.sf.basedb.core.authentication.AuthenticationInformation;
+import net.sf.basedb.core.authentication.AuthenticatedUser;
 import net.sf.basedb.core.authentication.AuthenticationManager;
 import net.sf.basedb.core.authentication.LoginException;
@@ -25 +25 @@
   
   @Override
-  public AuthenticationInformation authenticate() 
+  public AuthenticatedUser authenticate() 
   {
-    AuthenticationInformation authInfo = null;
+    AuthenticatedUser authInfo = null;
     LoginRequest request = context.getLoginRequest();
     String login = request.getLogin();
@@ -68 +68 @@
           LoginRequest internal = new LoginRequest(user.getLogin(), request.getPassword());
           context.verifyUserInternal(internal);
-          authInfo = new AuthenticationInformation(login, externalId);
+          authInfo = new AuthenticatedUser(YubiKey.AUTHENTICATION_METHOD, user);
         }
         else
@@ -80 +80 @@
   }
 
-  @Override
-  public boolean supportsExtraInformation() 
-  {
-    return false;
-  }
 
 }