Remove Rakamak converter
This commit is contained in:
parent
2ad33f4567
commit
839e192711
@ -9,7 +9,6 @@ import fr.xephi.authme.datasource.converter.Converter;
|
|||||||
import fr.xephi.authme.datasource.converter.CrazyLoginConverter;
|
import fr.xephi.authme.datasource.converter.CrazyLoginConverter;
|
||||||
import fr.xephi.authme.datasource.converter.LoginSecurityConverter;
|
import fr.xephi.authme.datasource.converter.LoginSecurityConverter;
|
||||||
import fr.xephi.authme.datasource.converter.MySqlToSqlite;
|
import fr.xephi.authme.datasource.converter.MySqlToSqlite;
|
||||||
import fr.xephi.authme.datasource.converter.RakamakConverter;
|
|
||||||
import fr.xephi.authme.datasource.converter.RoyalAuthConverter;
|
import fr.xephi.authme.datasource.converter.RoyalAuthConverter;
|
||||||
import fr.xephi.authme.datasource.converter.SqliteToH2;
|
import fr.xephi.authme.datasource.converter.SqliteToH2;
|
||||||
import fr.xephi.authme.datasource.converter.SqliteToSql;
|
import fr.xephi.authme.datasource.converter.SqliteToSql;
|
||||||
@ -85,7 +84,6 @@ public class ConverterCommand implements ExecutableCommand {
|
|||||||
return ImmutableSortedMap.<String, Class<? extends Converter>>naturalOrder()
|
return ImmutableSortedMap.<String, Class<? extends Converter>>naturalOrder()
|
||||||
.put("xauth", XAuthConverter.class)
|
.put("xauth", XAuthConverter.class)
|
||||||
.put("crazylogin", CrazyLoginConverter.class)
|
.put("crazylogin", CrazyLoginConverter.class)
|
||||||
.put("rakamak", RakamakConverter.class)
|
|
||||||
.put("royalauth", RoyalAuthConverter.class)
|
.put("royalauth", RoyalAuthConverter.class)
|
||||||
.put("vauth", VAuthConverter.class)
|
.put("vauth", VAuthConverter.class)
|
||||||
.put("sqlitetosql", SqliteToSql.class)
|
.put("sqlitetosql", SqliteToSql.class)
|
||||||
|
|||||||
@ -1,96 +0,0 @@
|
|||||||
package fr.xephi.authme.datasource.converter;
|
|
||||||
|
|
||||||
import fr.xephi.authme.ConsoleLogger;
|
|
||||||
import fr.xephi.authme.data.auth.PlayerAuth;
|
|
||||||
import fr.xephi.authme.datasource.DataSource;
|
|
||||||
import fr.xephi.authme.initialization.DataFolder;
|
|
||||||
import fr.xephi.authme.output.ConsoleLoggerFactory;
|
|
||||||
import fr.xephi.authme.security.PasswordSecurity;
|
|
||||||
import fr.xephi.authme.security.crypts.HashedPassword;
|
|
||||||
import fr.xephi.authme.settings.Settings;
|
|
||||||
import fr.xephi.authme.settings.properties.ConverterSettings;
|
|
||||||
import fr.xephi.authme.util.Utils;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
|
|
||||||
import javax.inject.Inject;
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Map.Entry;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author Xephi59
|
|
||||||
*/
|
|
||||||
public class RakamakConverter implements Converter {
|
|
||||||
|
|
||||||
private final ConsoleLogger logger = ConsoleLoggerFactory.get(RakamakConverter.class);
|
|
||||||
private final DataSource database;
|
|
||||||
private final Settings settings;
|
|
||||||
private final File pluginFolder;
|
|
||||||
private final PasswordSecurity passwordSecurity;
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
RakamakConverter(@DataFolder File dataFolder, DataSource dataSource, Settings settings,
|
|
||||||
PasswordSecurity passwordSecurity) {
|
|
||||||
this.database = dataSource;
|
|
||||||
this.settings = settings;
|
|
||||||
this.pluginFolder = dataFolder;
|
|
||||||
this.passwordSecurity = passwordSecurity;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
//TODO ljacqu 20151229: Restructure this into smaller portions
|
|
||||||
public void execute(CommandSender sender) {
|
|
||||||
boolean useIp = settings.getProperty(ConverterSettings.RAKAMAK_USE_IP);
|
|
||||||
String fileName = settings.getProperty(ConverterSettings.RAKAMAK_FILE_NAME);
|
|
||||||
String ipFileName = settings.getProperty(ConverterSettings.RAKAMAK_IP_FILE_NAME);
|
|
||||||
File source = new File(pluginFolder, fileName);
|
|
||||||
File ipFiles = new File(pluginFolder, ipFileName);
|
|
||||||
Map<String, String> playerIp = new HashMap<>();
|
|
||||||
Map<String, HashedPassword> playerPassword = new HashMap<>();
|
|
||||||
try {
|
|
||||||
BufferedReader ipFile = new BufferedReader(new FileReader(ipFiles));
|
|
||||||
String line;
|
|
||||||
if (useIp) {
|
|
||||||
String tempLine;
|
|
||||||
while ((tempLine = ipFile.readLine()) != null) {
|
|
||||||
if (tempLine.contains("=")) {
|
|
||||||
String[] args = tempLine.split("=");
|
|
||||||
playerIp.put(args[0], args[1]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ipFile.close();
|
|
||||||
|
|
||||||
BufferedReader users = new BufferedReader(new FileReader(source));
|
|
||||||
while ((line = users.readLine()) != null) {
|
|
||||||
if (line.contains("=")) {
|
|
||||||
String[] arguments = line.split("=");
|
|
||||||
HashedPassword hashedPassword = passwordSecurity.computeHash(arguments[1], arguments[0]);
|
|
||||||
playerPassword.put(arguments[0], hashedPassword);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
users.close();
|
|
||||||
for (Entry<String, HashedPassword> m : playerPassword.entrySet()) {
|
|
||||||
String playerName = m.getKey();
|
|
||||||
HashedPassword psw = playerPassword.get(playerName);
|
|
||||||
String ip = playerIp.get(playerName);
|
|
||||||
PlayerAuth auth = PlayerAuth.builder()
|
|
||||||
.name(playerName)
|
|
||||||
.realName(playerName)
|
|
||||||
.lastIp(ip)
|
|
||||||
.password(psw)
|
|
||||||
.build();
|
|
||||||
database.saveAuth(auth);
|
|
||||||
database.updateSession(auth);
|
|
||||||
}
|
|
||||||
Utils.logAndSendMessage(sender, "Rakamak database has been imported successfully");
|
|
||||||
} catch (IOException ex) {
|
|
||||||
logger.logException("Can't open the rakamak database file! Does it exist?", ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user