Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement AuthMeBungee autologin (#1402)

Browse Source 
* Implement AuthMeBungee autologin

There is a failing test due to cyclic dependency injection, @ljacqu could you take a quick look at this?

* Try to fix recursive dependency injection

* Fix codestyle

* Fix the subchannel name, again...

* Split BungeeService into BungeeSender and BungeeReceiver
This commit is contained in:
Gabriele C
2017-11-09 11:19:24 +01:00
committed by GitHub
parent 7e079d0b9c
commit b7c3d4b42e
24 changed files with 241 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/service/bungeecord/BungeeReceiver.java
+92
View File
@@ -0,0 +1,92 @@
package fr.xephi.authme.service.bungeecord;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.initialization.SettingsDependent;
import fr.xephi.authme.process.Management;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.HooksSettings;
import org.bukkit.entity.Player;
import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.plugin.messaging.PluginMessageListener;
import javax.inject.Inject;
public class BungeeReceiver implements PluginMessageListener, SettingsDependent {
private final AuthMe plugin;
private final BukkitService bukkitService;
private final Management management;
private final DataSource dataSource;
private boolean isEnabled;
@Inject
BungeeReceiver(AuthMe plugin, BukkitService bukkitService, Management management, DataSource dataSource,
Settings settings) {
this.plugin = plugin;
this.bukkitService = bukkitService;
this.management = management;
this.dataSource = dataSource;
reload(settings);
}
@Override
public void reload(Settings settings) {
this.isEnabled = settings.getProperty(HooksSettings.BUNGEECORD);
if (this.isEnabled) {
Messenger messenger = plugin.getServer().getMessenger();
if (!messenger.isIncomingChannelRegistered(plugin, "BungeeCord")) {
messenger.registerIncomingPluginChannel(plugin, "BungeeCord", this);
}
}
}
@Override
public void onPluginMessageReceived(String channel, Player player, byte[] data) {
if (!isEnabled) {
return;
}
ByteArrayDataInput in = ByteStreams.newDataInput(data);
String subchannel = in.readUTF();
if (!"AuthMe".equals(subchannel)) {
return;
}
String type = in.readUTF();
String name = in.readUTF();
switch (type) {
case MessageType.UNREGISTER:
dataSource.invalidateCache(name);
break;
case MessageType.REFRESH_PASSWORD:
case MessageType.REFRESH_QUITLOC:
case MessageType.REFRESH_EMAIL:
case MessageType.REFRESH:
dataSource.refreshCache(name);
break;
case MessageType.BUNGEE_LOGIN:
handleBungeeLogin(name);
break;
default:
ConsoleLogger.debug("Received unsupported bungeecord message type! ({0})", type);
}
}
private void handleBungeeLogin(String name) {
Player player = bukkitService.getPlayerExact(name);
if (player != null && player.isOnline()) {
management.forceLogin(player);
ConsoleLogger.info("The user " + player.getName() + " has been automatically logged in, "
+ "as requested by the AuthMeBungee integration.");
}
}
}
src/main/java/fr/xephi/authme/service/bungeecord/BungeeSender.java
+82
View File
@@ -0,0 +1,82 @@
package fr.xephi.authme.service.bungeecord;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.initialization.SettingsDependent;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.HooksSettings;
import org.bukkit.entity.Player;
import org.bukkit.plugin.messaging.Messenger;
import javax.inject.Inject;
public class BungeeSender implements SettingsDependent {
private final AuthMe plugin;
private final BukkitService bukkitService;
private boolean isEnabled;
private String destinationServerOnLogin;
/*
* Constructor.
*/
@Inject
BungeeSender(AuthMe plugin, BukkitService bukkitService, Settings settings) {
this.plugin = plugin;
this.bukkitService = bukkitService;
reload(settings);
}
@Override
public void reload(Settings settings) {
this.isEnabled = settings.getProperty(HooksSettings.BUNGEECORD);
this.destinationServerOnLogin = settings.getProperty(HooksSettings.BUNGEECORD_SERVER);
if (this.isEnabled) {
Messenger messenger = plugin.getServer().getMessenger();
if (!messenger.isOutgoingChannelRegistered(plugin, "BungeeCord")) {
messenger.registerOutgoingPluginChannel(plugin, "BungeeCord");
}
}
}
public boolean isEnabled() {
return isEnabled;
}
private void sendBungeecordMessage(String... data) {
ByteArrayDataOutput out = ByteStreams.newDataOutput();
for (String element : data) {
out.writeUTF(element);
}
bukkitService.sendPluginMessage("BungeeCord", out.toByteArray());
}
/**
* Send a player to a specified server. If no server is configured, this will
* do nothing.
*
* @param player The player to send.
*/
public void connectPlayerOnLogin(Player player) {
if (isEnabled && !destinationServerOnLogin.isEmpty()) {
bukkitService.scheduleSyncDelayedTask(() ->
sendBungeecordMessage("Connect", player.getName(), destinationServerOnLogin), 20L);
}
}
/**
* Sends a message to the AuthMe plugin messaging channel, if enabled.
*
* @param type The message type, See {@link MessageType}
* @param playerName the player related to the message
*/
public void sendAuthMeBungeecordMessage(String type, String playerName) {
if (isEnabled) {
sendBungeecordMessage("AuthMe", type, playerName.toLowerCase());
}
}
}
src/main/java/fr/xephi/authme/service/bungeecord/BungeeService.java
-121
View File
@@ -1,121 +0,0 @@
package fr.xephi.authme.service.bungeecord;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.initialization.SettingsDependent;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.HooksSettings;
import org.bukkit.entity.Player;
import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.plugin.messaging.PluginMessageListener;
import javax.inject.Inject;
/**
* Class to manage all BungeeCord related processes.
*/
public class BungeeService implements SettingsDependent, PluginMessageListener {
private final AuthMe plugin;
private final BukkitService service;
private final DataSource dataSource;
private boolean isEnabled;
private String destinationServerOnLogin;
/*
* Constructor.
*/
@Inject
BungeeService(AuthMe plugin, BukkitService service, Settings settings, DataSource dataSource) {
this.plugin = plugin;
this.service = service;
this.dataSource = dataSource;
reload(settings);
}
@Override
public void reload(Settings settings) {
this.isEnabled = settings.getProperty(HooksSettings.BUNGEECORD);
this.destinationServerOnLogin = settings.getProperty(HooksSettings.BUNGEECORD_SERVER);
Messenger messenger = plugin.getServer().getMessenger();
if (!this.isEnabled) {
return;
}
if (!messenger.isOutgoingChannelRegistered(plugin, "BungeeCord")) {
messenger.registerOutgoingPluginChannel(plugin, "BungeeCord");
}
if (!messenger.isIncomingChannelRegistered(plugin, "BungeeCord")) {
messenger.registerIncomingPluginChannel(plugin, "BungeeCord", this);
}
}
private void sendBungeecordMessage(String... data) {
ByteArrayDataOutput out = ByteStreams.newDataOutput();
for (String element : data) {
out.writeUTF(element);
}
service.sendPluginMessage("BungeeCord", out.toByteArray());
}
/**
* Send a player to a specified server. If no server is configured, this will
* do nothing.
*
* @param player The player to send.
*/
public void connectPlayerOnLogin(Player player) {
if (isEnabled && !destinationServerOnLogin.isEmpty()) {
service.scheduleSyncDelayedTask(() ->
sendBungeecordMessage("Connect", player.getName(), destinationServerOnLogin), 20L);
}
}
/**
* Sends a message to the AuthMe plugin messaging channel, if enabled.
*
* @param type The message type, See {@link MessageType}
* @param playerName the player related to the message
*/
public void sendAuthMeBungeecordMessage(String type, String playerName) {
if (isEnabled) {
sendBungeecordMessage("AuthMe", type, playerName.toLowerCase());
}
}
@Override
public void onPluginMessageReceived(String channel, Player player, byte[] data) {
if (!isEnabled) {
return;
}
ByteArrayDataInput in = ByteStreams.newDataInput(data);
String subchannel = in.readUTF();
if (!"AuthMe".equals(subchannel)) {
return;
}
String type = in.readUTF();
String name = in.readUTF();
switch (type) {
case MessageType.UNREGISTER:
dataSource.invalidateCache(name);
break;
case MessageType.REFRESH_PASSWORD:
case MessageType.REFRESH_QUITLOC:
case MessageType.REFRESH_EMAIL:
case MessageType.REFRESH:
dataSource.refreshCache(name);
break;
default:
ConsoleLogger.debug("Received unsupported bungeecord message type! ({0})", type);
}
}
}
src/main/java/fr/xephi/authme/service/bungeecord/MessageType.java
+1
View File
@@ -11,6 +11,7 @@ public final class MessageType {
public static final String REFRESH_QUITLOC = "refresh.quitloc";
public static final String REFRESH_EMAIL = "refresh.email";
public static final String REFRESH = "refresh";
public static final String BUNGEE_LOGIN = "bungeelogin";
private MessageType() {
}