TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-29 18:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix address rotating for contacting the Mojang API

Browse Source
This commit is contained in:
games647
2017-10-07 19:48:29 +02:00
parent df945146b8
commit c7c0782071
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/com/github/games647/fastlogin/core/BalancedSSLFactory.java
View File

@ -1,27 +1,23 @@
package com.github.games647.fastlogin.core;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.Iterator;
import javax.net.ssl.SSLSocketFactory;
public class BalancedSSLFactory extends SSLSocketFactory {
private final SSLSocketFactory oldFactory;
//in order to be thread-safe
private final List<InetAddress> localAddresses;
private AtomicInteger id;
private final Iterator<InetAddress> iterator;
private final SSLSocketFactory oldFactory;
public BalancedSSLFactory(SSLSocketFactory oldFactory, Iterable<InetAddress> localAddresses) {
this.oldFactory = oldFactory;
this.localAddresses = ImmutableList.copyOf(localAddresses);
this.iterator = Iterables.cycle(localAddresses).iterator();
}
@Override
@ -63,7 +59,8 @@ public class BalancedSSLFactory extends SSLSocketFactory {
}
private InetAddress getNextLocalAddress() {
int index = id.incrementAndGet() % localAddresses.size();
return localAddresses.get(index);
synchronized (iterator) {
return iterator.next();
}
}
}

3
core/src/main/java/com/github/games647/fastlogin/core/CommonUtil.java
View File

@ -68,8 +68,7 @@ public class CommonUtil {
Class<JDK14LoggerAdapter> adapterClass = JDK14LoggerAdapter.class;
Constructor<JDK14LoggerAdapter> cons = adapterClass.getDeclaredConstructor(java.util.logging.Logger.class);
cons.setAccessible(true);
JDK14LoggerAdapter logger = cons.newInstance(parent);
return logger;
return cons.newInstance(parent);
} catch (ReflectiveOperationException reflectEx) {
parent.log(Level.WARNING, "Cannot create slf4j logging adapter", reflectEx);
parent.log(Level.WARNING, "Creating logger instance manually...");

2
core/src/main/java/com/github/games647/fastlogin/core/mojang/MojangApiConnector.java
View File

@ -153,7 +153,7 @@ public class MojangApiConnector {
}
private SSLSocketFactory buildAddresses(Logger logger, Collection<String> localAddresses) {
if (!localAddresses.isEmpty()) {
if (localAddresses.isEmpty()) {
return HttpsURLConnection.getDefaultSSLSocketFactory();
}

2
core/src/main/java/com/github/games647/fastlogin/core/shared/JoinManagement.java
View File

@ -65,7 +65,7 @@ public abstract class JoinManagement<P extends C, C, S extends LoginSource> {
}
private boolean checkPremiumName(S source, String username, PlayerProfile profile) throws Exception {
core.getPlugin().getLog().debug("GameProfile {} uses a premium username", username);
core.getPlugin().getLog().info("GameProfile {} uses a premium username", username);
if (core.getConfig().get("autoRegister", false) && (authHook == null || !authHook.isRegistered(username))) {
requestPremiumLogin(source, profile, username, false);
return true;