ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ge: include username in machine hash

Browse Source
This commit is contained in:
Adam
2020-09-11 17:48:18 -04:00
parent dc83821599
commit 14147ce1c5
1 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
View File

@@ -38,6 +38,7 @@ import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.net.SocketException;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
@@ -189,42 +190,14 @@ public class GrandExchangePlugin extends Plugin
@Inject @Inject
private GrandExchangeClient grandExchangeClient; private GrandExchangeClient grandExchangeClient;
private boolean loginBurstGeUpdates; private boolean loginBurstGeUpdates;
private static String machineUuid;
@Inject @Inject
private OSBGrandExchangeClient osbGrandExchangeClient; private OSBGrandExchangeClient osbGrandExchangeClient;
private boolean wasFuzzySearch; private boolean wasFuzzySearch;
static private String machineUuid;
{ private String lastUsername;
try
{
Hasher hasher = Hashing.sha256().newHasher();
Runtime runtime = Runtime.getRuntime();
hasher.putByte((byte) OSType.getOSType().ordinal());
hasher.putByte((byte) runtime.availableProcessors());
hasher.putUnencodedChars(System.getProperty("os.arch", ""));
hasher.putUnencodedChars(System.getProperty("os.version", ""));
hasher.putUnencodedChars(System.getProperty("user.name", ""));
Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements())
{
NetworkInterface networkInterface = networkInterfaces.nextElement();
byte[] hardwareAddress = networkInterface.getHardwareAddress();
if (hardwareAddress != null)
{
hasher.putBytes(hardwareAddress);
}
}
machineUuid = hasher.hash().toString();
}
catch (Exception ex)
{
log.warn("unable to generate machine id", ex);
}
}
/** /**
* Logic from {@link org.apache.commons.text.similarity.FuzzyScore} * Logic from {@link org.apache.commons.text.similarity.FuzzyScore}
@@ -338,7 +311,6 @@ public class GrandExchangePlugin extends Plugin
{ {
grandExchangeClient.setUuid(null); grandExchangeClient.setUuid(null);
} }
grandExchangeClient.setMachineId(machineUuid);
osbItem = -1; osbItem = -1;
osbGrandExchangeResult = null; osbGrandExchangeResult = null;
@@ -352,6 +324,7 @@ public class GrandExchangePlugin extends Plugin
keyManager.unregisterKeyListener(inputListener); keyManager.unregisterKeyListener(inputListener);
grandExchangeText = null; grandExchangeText = null;
grandExchangeItem = null; grandExchangeItem = null;
lastUsername = machineUuid = null;
} }
@Subscribe @Subscribe
@@ -564,6 +537,10 @@ public class GrandExchangePlugin extends Plugin
panel.getOffersPanel().resetOffers(); panel.getOffersPanel().resetOffers();
loginBurstGeUpdates = true; loginBurstGeUpdates = true;
} }
else if (gameStateChanged.getGameState() == GameState.LOGGED_IN)
{
grandExchangeClient.setMachineId(getMachineUuid());
}
} }
@Subscribe @Subscribe
@@ -942,4 +919,47 @@ public class GrandExchangePlugin extends Plugin
+ itemId; + itemId;
LinkBrowser.browse(url); LinkBrowser.browse(url);
} }
private String getMachineUuid()
{
String username = client.getUsername();
if (lastUsername == username)
{
return machineUuid;
}
lastUsername = username;
try
{
Hasher hasher = Hashing.sha256().newHasher();
Runtime runtime = Runtime.getRuntime();
hasher.putByte((byte) OSType.getOSType().ordinal());
hasher.putByte((byte) runtime.availableProcessors());
hasher.putUnencodedChars(System.getProperty("os.arch", ""));
hasher.putUnencodedChars(System.getProperty("os.version", ""));
hasher.putUnencodedChars(System.getProperty("user.name", ""));
Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
while (networkInterfaces.hasMoreElements())
{
NetworkInterface networkInterface = networkInterfaces.nextElement();
byte[] hardwareAddress = networkInterface.getHardwareAddress();
if (hardwareAddress != null)
{
hasher.putBytes(hardwareAddress);
}
}
hasher.putUnencodedChars(username);
machineUuid = hasher.hash().toString();
return machineUuid;
}
catch (SocketException ex)
{
log.debug("unable to generate machine id", ex);
machineUuid = null;
return null;
}
}
} }