Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-10 13:49:17 +01:00
Code Issues Projects Releases Wiki Activity

Remove null character stuff from Join address & truncate

Browse Source 
- Truncated the address to 255 characters in case the null character removal doesn't work
  for some reason.

Affects issues:
- Fixed #1842
This commit is contained in:
Risto Lahtela 2021-04-15 09:36:50 +03:00
parent c401a7516a
commit d860fbb606
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plan/common/src/main/java/com/djrapitops/plan/storage/database/transactions/events/PlayerServerRegisterTransaction.java
View File

@ -19,6 +19,7 @@ package com.djrapitops.plan.storage.database.transactions.events;
import com.djrapitops.plan.identification.ServerUUID; import com.djrapitops.plan.identification.ServerUUID;
import com.djrapitops.plan.storage.database.queries.DataStoreQueries; import com.djrapitops.plan.storage.database.queries.DataStoreQueries;
import com.djrapitops.plan.storage.database.queries.PlayerFetchQueries; import com.djrapitops.plan.storage.database.queries.PlayerFetchQueries;
import org.apache.commons.lang3.StringUtils;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
@ -46,7 +47,7 @@ public class PlayerServerRegisterTransaction extends PlayerRegisterTransaction {
protected void performOperations() { protected void performOperations() {
super.performOperations(); super.performOperations();
long registerDate = registered.getAsLong(); long registerDate = registered.getAsLong();
String joinAddress = this.getJoinAddress.get(); String joinAddress = getJoinAddress();
if (Boolean.FALSE.equals(query(PlayerFetchQueries.isPlayerRegisteredOnServer(playerUUID, serverUUID)))) { if (Boolean.FALSE.equals(query(PlayerFetchQueries.isPlayerRegisteredOnServer(playerUUID, serverUUID)))) {
execute(DataStoreQueries.registerUserInfo(playerUUID, registerDate, serverUUID, joinAddress)); execute(DataStoreQueries.registerUserInfo(playerUUID, registerDate, serverUUID, joinAddress));
@ -60,4 +61,16 @@ public class PlayerServerRegisterTransaction extends PlayerRegisterTransaction {
execute(DataStoreQueries.updateJoinAddress(playerUUID, serverUUID, joinAddress)); execute(DataStoreQueries.updateJoinAddress(playerUUID, serverUUID, joinAddress));
} }
private String getJoinAddress() {
String joinAddress = this.getJoinAddress.get();
// Removes client information given by Forge Mod Loader or Geysir
if (joinAddress != null && StringUtils.contains(joinAddress, '\u0000')) {
String[] split = StringUtils.split(joinAddress, "\u0000", 2);
joinAddress = split.length > 0 ? split[0] : joinAddress;
}
// Truncates the address to fit database.
return StringUtils.truncate(joinAddress, 255);
}
} }