diff --git a/CHANGELOG.md b/CHANGELOG.md index 254ed99b..fc9b3150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ +### 1.11 + +* Drop support for RoyalAuth, because it doesn't seem to be supported anymore +* Clean up client-server encryption -> use only one cipher per connection, simplify code + ### 1.10 +* Prevent authentication proxies +* Drop database importer +* More logging by default * Add support for HTTP proxies * Set the fake offline UUID on lowest priority (-> as soon as possible) * Remove bungee chatcolor for Bukkit to support KCauldron @@ -11,7 +19,7 @@ * Automatically register accounts if they are not in the auth plugin database but in the FastLogin database * Update BungeeAuth dependency and use the new API. Please update your plugin if you still use the old one. * Remove deprecated API methods from the last version -* Finally set a value to the API column +* Finally update the IP column on every login * No duplicate session login * Fix timestamp parsing in newer versions of SQLite * Fix Spigot console command invocation sends result to in game players diff --git a/README.md b/README.md index 28cb99b0..7507aa09 100644 --- a/README.md +++ b/README.md @@ -40,19 +40,18 @@ So they don't need to enter passwords. This is also called auto login (auto-logi ### Requirements: * Plugin: [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) or [ProtocolSupport](https://www.spigotmc.org/resources/protocolsupport.7201/) * Tested Bukkit/[Spigot](https://www.spigotmc.org) 1.9 (could also work with other versions) -* Java 7+ +* Java 8+ * Run Spigot and/or BungeeCord/Waterfall in offline mode (see server.properties or config.yml) * An auth plugin. Supported plugins #### Bukkit/Spigot/Paper -* [AuthMe (both 5.X and 3.X)](https://dev.bukkit.org/bukkit-plugins/authme-reloaded/) +* [AuthMe (both 5.X)](https://dev.bukkit.org/bukkit-plugins/authme-reloaded/) * [xAuth](https://dev.bukkit.org/bukkit-plugins/xauth/) * [LogIt](https://github.com/XziomekX/LogIt) * [AdvancedLogin (Paid)](https://www.spigotmc.org/resources/advancedlogin.10510/) * [CrazyLogin](https://dev.bukkit.org/bukkit-plugins/crazylogin/) * [LoginSecurity](https://dev.bukkit.org/bukkit-plugins/loginsecurity/) -* [RoyalAuth](https://dev.bukkit.org/bukkit-plugins/royalauth/) * [UltraAuth](https://dev.bukkit.org/bukkit-plugins/ultraauth-aa/) #### BungeeCord/Waterfall diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 84c5c3c7..ecebb2ce 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -138,19 +138,6 @@ - - com.github.RoyalDev - RoyalAuth - -e21354a9b7-1 - true - - - * - * - - - - de.luricos.bukkit xAuth diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java deleted file mode 100644 index d56e8151..00000000 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.github.games647.fastlogin.bukkit.hooks; - -import com.github.games647.fastlogin.core.hooks.AuthPlugin; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.logging.Level; - -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.royaldev.royalauth.AuthPlayer; -import org.royaldev.royalauth.Config; -import org.royaldev.royalauth.RoyalAuth; - -/** - * Github: https://github.com/RoyalDev/RoyalAuth - * - * Project page: - * - * Bukkits: http://dev.bukkit.org/bukkit-plugins/royalauth/ - */ -public class RoyalAuthHook implements AuthPlugin { - - private final Plugin royalAuthPlugin = (RoyalAuth) Bukkit.getPluginManager().getPlugin("RoyalAuth"); - - @Override - public boolean forceLogin(Player player) { - AuthPlayer authPlayer = AuthPlayer.getAuthPlayer(player); - - Future future = Bukkit.getScheduler().callSyncMethod(royalAuthPlugin, () -> { - if (authPlayer.isLoggedIn()) { - return true; - } - -//https://github.com/RoyalDev/RoyalAuth/blob/master/src/main/java/org/royaldev/royalauth/commands/CmdLogin.java#L62 -//not thread-safe - authPlayer.login(); - - return authPlayer.isLoggedIn(); - }); - - try { - return future.get(); - } catch (InterruptedException | ExecutionException ex) { - royalAuthPlugin.getLogger().log(Level.SEVERE, "Failed to forceLogin", ex); - return false; - } - } - - @Override - public boolean isRegistered(String playerName) throws Exception { - AuthPlayer authPlayer = AuthPlayer.getAuthPlayer(playerName); - return authPlayer.isRegistered(); - } - - @Override - public boolean forceRegister(Player player, String password) { -//https://github.com/RoyalDev/RoyalAuth/blob/master/src/main/java/org/royaldev/royalauth/commands/CmdRegister.java#L50 - AuthPlayer authPlayer = AuthPlayer.getAuthPlayer(player); - - boolean registerSuccess = authPlayer.setPassword(password, Config.passwordHashType); - - //login in the player after registration - return registerSuccess && forceLogin(player); - } -}