lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed googleauth library.

Browse Source
This commit is contained in:
MobiusDev
2017-08-05 16:46:50 +00:00
parent 5d3dc96029
commit 754f2aad0f
21 changed files with 6 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_Underground/java/com/l2jmobius/loginserver/LoginController.java
View File

@@ -77,7 +77,6 @@ public class LoginController
private static final String ACCOUNT_ACCESS_LEVEL_UPDATE = "UPDATE accounts SET accessLevel = ? WHERE login = ?";
private static final String ACCOUNT_IPS_UPDATE = "UPDATE accounts SET pcIp = ?, hop1 = ?, hop2 = ?, hop3 = ?, hop4 = ? WHERE login = ?";
private static final String ACCOUNT_IPAUTH_SELECT = "SELECT * FROM accounts_ipauth WHERE login = ?";
private static final String ACCOUNT_OTP_SELECT = "SELECT value FROM account_data WHERE account_name = ? AND var = 'otp'";
private LoginController() throws GeneralSecurityException
{
@@ -237,18 +236,6 @@ public class LoginController
return null;
}
try (PreparedStatement otpPs = con.prepareStatement(ACCOUNT_OTP_SELECT))
{
otpPs.setString(1, login);
try (ResultSet otpRset = otpPs.executeQuery())
{
if (otpRset.next())
{
info.setOTP(otpRset.getString(1));
}
}
}
clearFailedLoginAttemps(addr);
return info;
}

20
L2J_Mobius_Underground/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
View File

@@ -18,8 +18,6 @@ package com.l2jmobius.loginserver.model.data;
import java.util.Objects;
import com.warrenstrange.googleauth.GoogleAuthenticator;
/**
* @author HorridoJoho
*/
@@ -29,7 +27,6 @@ public final class AccountInfo
private final String _passHash;
private final int _accessLevel;
private final int _lastServer;
private String _otpKey;
public AccountInfo(String login, String passHash, int accessLevel, int lastServer)
{
@@ -51,23 +48,6 @@ public final class AccountInfo
_lastServer = lastServer;
}
public void setOTP(String otpKey)
{
_otpKey = otpKey;
}
public boolean checkOTP(int otp)
{
if (_otpKey == null)
{
// No OTP set
return true;
}
final GoogleAuthenticator gAuth = new GoogleAuthenticator();
return gAuth.authorize(_otpKey, otp);
}
public boolean checkPassHash(String passHash)
{
return _passHash.equals(passHash);

14
L2J_Mobius_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
View File

@@ -34,7 +34,6 @@ import com.l2jmobius.loginserver.network.serverpackets.AccountKicked;
import com.l2jmobius.loginserver.network.serverpackets.AccountKicked.AccountKickedReason;
import com.l2jmobius.loginserver.network.serverpackets.LoginFail.LoginFailReason;
import com.l2jmobius.loginserver.network.serverpackets.LoginOk;
import com.l2jmobius.loginserver.network.serverpackets.LoginOtpFail;
import com.l2jmobius.loginserver.network.serverpackets.ServerList;
/**
@@ -53,7 +52,6 @@ public class RequestAuthLogin extends L2LoginClientPacket
private String _user;
private String _password;
private int _ncotp;
/**
* @return
@@ -71,11 +69,6 @@ public class RequestAuthLogin extends L2LoginClientPacket
return _user;
}
public int getOneTimePassword()
{
return _ncotp;
}
@Override
public boolean readImpl()
{
@@ -121,13 +114,11 @@ public class RequestAuthLogin extends L2LoginClientPacket
{
_user = new String(decrypted, 0x4E, 50).trim() + new String(decrypted, 0xCE, 14).trim();
_password = new String(decrypted, 0xDC, 16).trim();
_ncotp = (decrypted[0xFC] & 0xFF) | ((decrypted[0xFD] & 0xFF) << 8) | ((decrypted[0xFE] & 0xFF) << 16) | ((decrypted[0xFF] & 0xFF) << 24);
}
else
{
_user = new String(decrypted, 0x5E, 14).trim();
_password = new String(decrypted, 0x6C, 16).trim();
_ncotp = (decrypted[0x7C] & 0xFF) | ((decrypted[0x7D] & 0xFF) << 8) | ((decrypted[0x7E] & 0xFF) << 16) | ((decrypted[0x7F] & 0xFF) << 24);
}
}
catch (Exception e)
@@ -145,11 +136,6 @@ public class RequestAuthLogin extends L2LoginClientPacket
client.close(LoginFailReason.REASON_USER_OR_PASS_WRONG);
return;
}
else if (!info.checkOTP(_ncotp))
{
client.sendPacket(new LoginOtpFail());
return;
}
final AuthLoginResult result = lc.tryCheckinAccount(client, clientAddr, info);
switch (result)