Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 792-registration-date-and-ip

Conflicts: src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java src/main/java/fr/xephi/authme/datasource/Columns.java src/main/java/fr/xephi/authme/datasource/SQLite.java src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java src/main/java/fr/xephi/authme/service/SessionService.java src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java src/test/java/fr/xephi/authme/service/SessionServiceTest.java src/test/resources/fr/xephi/authme/datasource/sql-initialize.sql
2017-10-15 23:38:01 +02:00
parent ea58e20c3d 22e95493de
commit 90073ef95d
19 changed files with 536 additions and 97 deletions
@@ -0,0 +1,86 @@
+package fr.xephi.authme.service;
+
+import fr.xephi.authme.ConsoleLogger;
+import fr.xephi.authme.data.auth.PlayerAuth;
+import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.events.RestoreSessionEvent;
+import fr.xephi.authme.initialization.Reloadable;
+import fr.xephi.authme.message.MessageKey;
+import fr.xephi.authme.settings.properties.PluginSettings;
+import fr.xephi.authme.util.PlayerUtils;
+import org.bukkit.entity.Player;
+
+import javax.inject.Inject;
+
+/**
+ * Handles the user sessions.
+ */
+public class SessionService implements Reloadable {
+
+    private final CommonService service;
+    private final BukkitService bukkitService;
+    private final DataSource database;
+
+    private boolean isEnabled;
+
+    @Inject
+    SessionService(CommonService service, BukkitService bukkitService, DataSource database) {
+        this.service = service;
+        this.bukkitService = bukkitService;
+        this.database = database;
+        reload();
+    }
+
+    /**
+     * Returns whether the player has a session he can resume.
+     *
+     * @param player the player to check
+     * @return true if there is a current session, false otherwise
+     */
+    public boolean canResumeSession(Player player) {
+        final String name = player.getName();
+        if (isEnabled && database.hasSession(name)) {
+            database.setUnlogged(name);
+            database.revokeSession(name);
+            PlayerAuth auth = database.getAuth(name);
+            if (hasValidSessionData(auth, player)) {
+                RestoreSessionEvent event = bukkitService.createAndCallEvent(
+                    isAsync -> new RestoreSessionEvent(player, isAsync));
+                return !event.isCancelled();
+            } else {
+                service.send(player, MessageKey.SESSION_EXPIRED);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if the given Player has a current session by comparing its properties
+     * with the given PlayerAuth's.
+     *
+     * @param auth the player auth
+     * @param player the associated player
+     * @return true if the player may resume his login session, false otherwise
+     */
+    private boolean hasValidSessionData(PlayerAuth auth, Player player) {
+        if (auth == null) {
+            ConsoleLogger.warning("No PlayerAuth in database for '" + player.getName() + "' during session check");
+            return false;
+        }
+        long timeSinceLastLogin = System.currentTimeMillis() - auth.getLastLogin();
+        return PlayerUtils.getPlayerIp(player).equals(auth.getLastIp())
+            && timeSinceLastLogin > 0
+            && timeSinceLastLogin < service.getProperty(PluginSettings.SESSIONS_TIMEOUT) * 60 * 1000;
+    }
+
+    public void grantSession(String name) {
+        if (isEnabled) {
+            database.grantSession(name);
+        }
+    }
+
+    @Override
+    public void reload() {
+        this.isEnabled = service.getProperty(PluginSettings.SESSIONS_ENABLED);
+    }
+}