diff --git a/L2J_Mobius_Classic/.classpath b/L2J_Mobius_Classic/.classpath
index d51276f7b2..fc8369b2aa 100644
--- a/L2J_Mobius_Classic/.classpath
+++ b/L2J_Mobius_Classic/.classpath
@@ -5,7 +5,6 @@
-
diff --git a/L2J_Mobius_Classic/dist/libs/googleauth-1.1.0.jar b/L2J_Mobius_Classic/dist/libs/googleauth-1.1.0.jar
deleted file mode 100644
index a3ab858bf4..0000000000
Binary files a/L2J_Mobius_Classic/dist/libs/googleauth-1.1.0.jar and /dev/null differ
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/LoginController.java
index 8c6ae19e23..a83b097ee9 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/LoginController.java
@@ -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;
}
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/model/data/AccountInfo.java b/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
index 18bca937dc..9bebda1653 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
@@ -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);
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
index 50874d0e36..f68dbeac9a 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
@@ -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)
diff --git a/L2J_Mobius_Classic/launcher/Gameserver.launch b/L2J_Mobius_Classic/launcher/Gameserver.launch
index c5a7de41ec..28b44a905c 100644
--- a/L2J_Mobius_Classic/launcher/Gameserver.launch
+++ b/L2J_Mobius_Classic/launcher/Gameserver.launch
@@ -7,7 +7,7 @@
-
+
diff --git a/L2J_Mobius_Classic/launcher/Loginserver.launch b/L2J_Mobius_Classic/launcher/Loginserver.launch
index dc1e7bcf8f..7dd1fb3c01 100644
--- a/L2J_Mobius_Classic/launcher/Loginserver.launch
+++ b/L2J_Mobius_Classic/launcher/Loginserver.launch
@@ -7,7 +7,7 @@
-
+
diff --git a/L2J_Mobius_Helios/.classpath b/L2J_Mobius_Helios/.classpath
index d51276f7b2..fc8369b2aa 100644
--- a/L2J_Mobius_Helios/.classpath
+++ b/L2J_Mobius_Helios/.classpath
@@ -5,7 +5,6 @@
-
diff --git a/L2J_Mobius_Helios/dist/libs/googleauth-1.1.0.jar b/L2J_Mobius_Helios/dist/libs/googleauth-1.1.0.jar
deleted file mode 100644
index a3ab858bf4..0000000000
Binary files a/L2J_Mobius_Helios/dist/libs/googleauth-1.1.0.jar and /dev/null differ
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/LoginController.java
index 8c6ae19e23..a83b097ee9 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/LoginController.java
@@ -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;
}
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/model/data/AccountInfo.java b/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
index 18bca937dc..9bebda1653 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
@@ -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);
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
index 50874d0e36..f68dbeac9a 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
@@ -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)
diff --git a/L2J_Mobius_Helios/launcher/Gameserver.launch b/L2J_Mobius_Helios/launcher/Gameserver.launch
index f7c408a8f5..80cbc1f92f 100644
--- a/L2J_Mobius_Helios/launcher/Gameserver.launch
+++ b/L2J_Mobius_Helios/launcher/Gameserver.launch
@@ -7,7 +7,7 @@
-
+
diff --git a/L2J_Mobius_Helios/launcher/Loginserver.launch b/L2J_Mobius_Helios/launcher/Loginserver.launch
index b3e09d15b8..90839a1cd7 100644
--- a/L2J_Mobius_Helios/launcher/Loginserver.launch
+++ b/L2J_Mobius_Helios/launcher/Loginserver.launch
@@ -7,7 +7,7 @@
-
+
diff --git a/L2J_Mobius_Underground/.classpath b/L2J_Mobius_Underground/.classpath
index d51276f7b2..fc8369b2aa 100644
--- a/L2J_Mobius_Underground/.classpath
+++ b/L2J_Mobius_Underground/.classpath
@@ -5,7 +5,6 @@
-
diff --git a/L2J_Mobius_Underground/dist/libs/googleauth-1.1.0.jar b/L2J_Mobius_Underground/dist/libs/googleauth-1.1.0.jar
deleted file mode 100644
index a3ab858bf4..0000000000
Binary files a/L2J_Mobius_Underground/dist/libs/googleauth-1.1.0.jar and /dev/null differ
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/LoginController.java
index 8c6ae19e23..a83b097ee9 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/LoginController.java
@@ -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;
}
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/model/data/AccountInfo.java b/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
index 18bca937dc..9bebda1653 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/model/data/AccountInfo.java
@@ -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);
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java b/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
index 50874d0e36..f68dbeac9a 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/loginserver/network/clientpackets/RequestAuthLogin.java
@@ -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)
diff --git a/L2J_Mobius_Underground/launcher/Gameserver.launch b/L2J_Mobius_Underground/launcher/Gameserver.launch
index 1bdbc2d187..5f498a8388 100644
--- a/L2J_Mobius_Underground/launcher/Gameserver.launch
+++ b/L2J_Mobius_Underground/launcher/Gameserver.launch
@@ -7,7 +7,7 @@
-
+
diff --git a/L2J_Mobius_Underground/launcher/Loginserver.launch b/L2J_Mobius_Underground/launcher/Loginserver.launch
index 28fb5e4d8e..9e704b61d9 100644
--- a/L2J_Mobius_Underground/launcher/Loginserver.launch
+++ b/L2J_Mobius_Underground/launcher/Loginserver.launch
@@ -7,7 +7,7 @@
-
+