You've already forked Arcturus-Morningstar-Extended
mirror of
https://github.com/duckietm/Arcturus-Morningstar-Extended.git
synced 2026-06-19 15:06:19 +00:00
fix(wired): bound user condition inputs
This commit is contained in:
+24
-6
@@ -87,14 +87,32 @@ public class WiredConditionHabboHasEffect extends InteractionWiredCondition {
|
|||||||
@Override
|
@Override
|
||||||
public void loadWiredData(ResultSet set, Room room) throws SQLException {
|
public void loadWiredData(ResultSet set, Room room) throws SQLException {
|
||||||
String wiredData = set.getString("wired_data");
|
String wiredData = set.getString("wired_data");
|
||||||
|
if (wiredData == null || wiredData.isEmpty()) {
|
||||||
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (wiredData.startsWith("{")) {
|
if (wiredData.startsWith("{")) {
|
||||||
JsonData data = WiredManager.getGson().fromJson(wiredData, JsonData.class);
|
JsonData data;
|
||||||
this.effectId = data.effectId;
|
try {
|
||||||
this.userSource = data.userSource;
|
data = WiredManager.getGson().fromJson(wiredData, JsonData.class);
|
||||||
|
} catch (RuntimeException ignored) {
|
||||||
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (data == null) {
|
||||||
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.effectId = WiredUserConditionInputGuard.normalizeEffectId(data.effectId);
|
||||||
|
this.userSource = WiredUserConditionInputGuard.normalizeUserSource(data.userSource);
|
||||||
this.quantifier = this.normalizeQuantifier(data.quantifier, QUANTIFIER_ANY);
|
this.quantifier = this.normalizeQuantifier(data.quantifier, QUANTIFIER_ANY);
|
||||||
} else {
|
} else {
|
||||||
this.effectId = Integer.parseInt(wiredData);
|
try {
|
||||||
|
this.effectId = WiredUserConditionInputGuard.normalizeEffectId(Integer.parseInt(wiredData));
|
||||||
|
} catch (NumberFormatException ignored) {
|
||||||
|
this.effectId = 0;
|
||||||
|
}
|
||||||
this.userSource = WiredSourceUtil.SOURCE_TRIGGER;
|
this.userSource = WiredSourceUtil.SOURCE_TRIGGER;
|
||||||
this.quantifier = QUANTIFIER_ANY;
|
this.quantifier = QUANTIFIER_ANY;
|
||||||
}
|
}
|
||||||
@@ -134,8 +152,8 @@ public class WiredConditionHabboHasEffect extends InteractionWiredCondition {
|
|||||||
public boolean saveData(WiredSettings settings) {
|
public boolean saveData(WiredSettings settings) {
|
||||||
if(settings.getIntParams().length < 1) return false;
|
if(settings.getIntParams().length < 1) return false;
|
||||||
int[] params = settings.getIntParams();
|
int[] params = settings.getIntParams();
|
||||||
this.effectId = params[0];
|
this.effectId = WiredUserConditionInputGuard.normalizeEffectId(params[0]);
|
||||||
this.userSource = (params.length > 1) ? params[1] : WiredSourceUtil.SOURCE_TRIGGER;
|
this.userSource = (params.length > 1) ? WiredUserConditionInputGuard.normalizeUserSource(params[1]) : WiredSourceUtil.SOURCE_TRIGGER;
|
||||||
this.quantifier = (params.length > 2) ? this.normalizeQuantifier(params[2], QUANTIFIER_ANY) : QUANTIFIER_ANY;
|
this.quantifier = (params.length > 2) ? this.normalizeQuantifier(params[2], QUANTIFIER_ANY) : QUANTIFIER_ANY;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
+29
-22
@@ -10,15 +10,12 @@ import com.eu.habbo.habbohotel.wired.core.WiredManager;
|
|||||||
import com.eu.habbo.habbohotel.wired.core.WiredContext;
|
import com.eu.habbo.habbohotel.wired.core.WiredContext;
|
||||||
import com.eu.habbo.habbohotel.wired.core.WiredSourceUtil;
|
import com.eu.habbo.habbohotel.wired.core.WiredSourceUtil;
|
||||||
import com.eu.habbo.messages.ServerMessage;
|
import com.eu.habbo.messages.ServerMessage;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class WiredConditionHabboHasHandItem extends InteractionWiredCondition {
|
public class WiredConditionHabboHasHandItem extends InteractionWiredCondition {
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger(WiredConditionHabboHasHandItem.class);
|
|
||||||
protected static final int QUANTIFIER_ALL = 0;
|
protected static final int QUANTIFIER_ALL = 0;
|
||||||
protected static final int QUANTIFIER_ANY = 1;
|
protected static final int QUANTIFIER_ANY = 1;
|
||||||
|
|
||||||
@@ -62,9 +59,9 @@ public class WiredConditionHabboHasHandItem extends InteractionWiredCondition {
|
|||||||
@Override
|
@Override
|
||||||
public boolean saveData(WiredSettings settings) {
|
public boolean saveData(WiredSettings settings) {
|
||||||
if(settings.getIntParams().length < 1) return false;
|
if(settings.getIntParams().length < 1) return false;
|
||||||
this.handItem = this.normalizeHandItem(settings.getIntParams()[0]);
|
this.handItem = WiredUserConditionInputGuard.normalizeHandItemId(settings.getIntParams()[0]);
|
||||||
int[] params = settings.getIntParams();
|
int[] params = settings.getIntParams();
|
||||||
this.userSource = (params.length > 1) ? params[1] : WiredSourceUtil.SOURCE_TRIGGER;
|
this.userSource = (params.length > 1) ? WiredUserConditionInputGuard.normalizeUserSource(params[1]) : WiredSourceUtil.SOURCE_TRIGGER;
|
||||||
this.quantifier = (params.length > 2) ? this.normalizeQuantifier(params[2]) : QUANTIFIER_ALL;
|
this.quantifier = (params.length > 2) ? this.normalizeQuantifier(params[2]) : QUANTIFIER_ALL;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -99,21 +96,35 @@ public class WiredConditionHabboHasHandItem extends InteractionWiredCondition {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void loadWiredData(ResultSet set, Room room) throws SQLException {
|
public void loadWiredData(ResultSet set, Room room) throws SQLException {
|
||||||
try {
|
String wiredData = set.getString("wired_data");
|
||||||
String wiredData = set.getString("wired_data");
|
if (wiredData == null || wiredData.isEmpty()) {
|
||||||
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (wiredData.startsWith("{")) {
|
if (wiredData.startsWith("{")) {
|
||||||
JsonData data = WiredManager.getGson().fromJson(wiredData, JsonData.class);
|
JsonData data;
|
||||||
this.handItem = this.normalizeHandItem(data.handItemId);
|
try {
|
||||||
this.userSource = data.userSource;
|
data = WiredManager.getGson().fromJson(wiredData, JsonData.class);
|
||||||
this.quantifier = this.normalizeQuantifier(data.quantifier);
|
} catch (RuntimeException ignored) {
|
||||||
} else {
|
this.onPickUp();
|
||||||
this.handItem = this.normalizeHandItem(Integer.parseInt(wiredData));
|
return;
|
||||||
this.userSource = WiredSourceUtil.SOURCE_TRIGGER;
|
|
||||||
this.quantifier = QUANTIFIER_ALL;
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
if (data == null) {
|
||||||
LOGGER.error("Caught exception", e);
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.handItem = WiredUserConditionInputGuard.normalizeHandItemId(data.handItemId);
|
||||||
|
this.userSource = WiredUserConditionInputGuard.normalizeUserSource(data.userSource);
|
||||||
|
this.quantifier = this.normalizeQuantifier(data.quantifier);
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
this.handItem = WiredUserConditionInputGuard.normalizeHandItemId(Integer.parseInt(wiredData));
|
||||||
|
} catch (NumberFormatException ignored) {
|
||||||
|
this.handItem = 0;
|
||||||
|
}
|
||||||
|
this.userSource = WiredSourceUtil.SOURCE_TRIGGER;
|
||||||
|
this.quantifier = QUANTIFIER_ALL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,10 +167,6 @@ public class WiredConditionHabboHasHandItem extends InteractionWiredCondition {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected int normalizeHandItem(int value) {
|
|
||||||
return Math.max(0, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int normalizeQuantifier(int value) {
|
protected int normalizeQuantifier(int value) {
|
||||||
return (value == QUANTIFIER_ANY) ? QUANTIFIER_ANY : QUANTIFIER_ALL;
|
return (value == QUANTIFIER_ANY) ? QUANTIFIER_ANY : QUANTIFIER_ALL;
|
||||||
}
|
}
|
||||||
|
|||||||
+20
-6
@@ -103,14 +103,28 @@ public class WiredConditionHabboWearsBadge extends InteractionWiredCondition {
|
|||||||
@Override
|
@Override
|
||||||
public void loadWiredData(ResultSet set, Room room) throws SQLException {
|
public void loadWiredData(ResultSet set, Room room) throws SQLException {
|
||||||
String wiredData = set.getString("wired_data");
|
String wiredData = set.getString("wired_data");
|
||||||
|
if (wiredData == null) {
|
||||||
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (wiredData.startsWith("{")) {
|
if (wiredData.startsWith("{")) {
|
||||||
JsonData data = WiredManager.getGson().fromJson(wiredData, JsonData.class);
|
JsonData data;
|
||||||
this.badge = data.badge;
|
try {
|
||||||
this.userSource = data.userSource;
|
data = WiredManager.getGson().fromJson(wiredData, JsonData.class);
|
||||||
|
} catch (RuntimeException ignored) {
|
||||||
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (data == null) {
|
||||||
|
this.onPickUp();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.badge = WiredUserConditionInputGuard.normalizeBadgeCode(data.badge);
|
||||||
|
this.userSource = WiredUserConditionInputGuard.normalizeUserSource(data.userSource);
|
||||||
this.quantifier = this.normalizeQuantifier(data.quantifier, QUANTIFIER_ANY);
|
this.quantifier = this.normalizeQuantifier(data.quantifier, QUANTIFIER_ANY);
|
||||||
} else {
|
} else {
|
||||||
this.badge = wiredData;
|
this.badge = WiredUserConditionInputGuard.normalizeBadgeCode(wiredData);
|
||||||
this.userSource = WiredSourceUtil.SOURCE_TRIGGER;
|
this.userSource = WiredSourceUtil.SOURCE_TRIGGER;
|
||||||
this.quantifier = QUANTIFIER_ANY;
|
this.quantifier = QUANTIFIER_ANY;
|
||||||
}
|
}
|
||||||
@@ -147,9 +161,9 @@ public class WiredConditionHabboWearsBadge extends InteractionWiredCondition {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean saveData(WiredSettings settings) {
|
public boolean saveData(WiredSettings settings) {
|
||||||
this.badge = settings.getStringParam();
|
this.badge = WiredUserConditionInputGuard.normalizeBadgeCode(settings.getStringParam());
|
||||||
int[] params = settings.getIntParams();
|
int[] params = settings.getIntParams();
|
||||||
this.userSource = (params.length > 0) ? params[0] : WiredSourceUtil.SOURCE_TRIGGER;
|
this.userSource = (params.length > 0) ? WiredUserConditionInputGuard.normalizeUserSource(params[0]) : WiredSourceUtil.SOURCE_TRIGGER;
|
||||||
this.quantifier = (params.length > 1) ? this.normalizeQuantifier(params[1], QUANTIFIER_ANY) : QUANTIFIER_ANY;
|
this.quantifier = (params.length > 1) ? this.normalizeQuantifier(params[1], QUANTIFIER_ANY) : QUANTIFIER_ANY;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
+45
@@ -0,0 +1,45 @@
|
|||||||
|
package com.eu.habbo.habbohotel.items.interactions.wired.conditions;
|
||||||
|
|
||||||
|
import com.eu.habbo.habbohotel.wired.core.WiredSourceUtil;
|
||||||
|
|
||||||
|
public final class WiredUserConditionInputGuard {
|
||||||
|
public static final int MAX_BADGE_CODE_LENGTH = 64;
|
||||||
|
public static final int MAX_EFFECT_ID = 10_000;
|
||||||
|
public static final int MAX_HAND_ITEM_ID = 10_000;
|
||||||
|
|
||||||
|
private WiredUserConditionInputGuard() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String normalizeBadgeCode(String value) {
|
||||||
|
if (value == null) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
String normalized = value.trim().replace('\t', ' ').replace('\r', ' ').replace('\n', ' ');
|
||||||
|
if (normalized.length() > MAX_BADGE_CODE_LENGTH) {
|
||||||
|
return normalized.substring(0, MAX_BADGE_CODE_LENGTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int normalizeUserSource(int value) {
|
||||||
|
return WiredSourceUtil.isDefaultUserSource(value) ? value : WiredSourceUtil.SOURCE_TRIGGER;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int normalizeEffectId(int value) {
|
||||||
|
if (value < 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.min(value, MAX_EFFECT_ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int normalizeHandItemId(int value) {
|
||||||
|
if (value < 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.min(value, MAX_HAND_ITEM_ID);
|
||||||
|
}
|
||||||
|
}
|
||||||
+33
@@ -0,0 +1,33 @@
|
|||||||
|
package com.eu.habbo.habbohotel.items.interactions.wired.conditions;
|
||||||
|
|
||||||
|
import com.eu.habbo.habbohotel.wired.core.WiredSourceUtil;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||||
|
|
||||||
|
class WiredUserConditionInputGuardTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void badgeCodesAreBoundedAndSingleLine() {
|
||||||
|
assertEquals("", WiredUserConditionInputGuard.normalizeBadgeCode(null));
|
||||||
|
assertEquals("ACH Test", WiredUserConditionInputGuard.normalizeBadgeCode(" ACH\tTest\n"));
|
||||||
|
String normalized = WiredUserConditionInputGuard.normalizeBadgeCode("x".repeat(WiredUserConditionInputGuard.MAX_BADGE_CODE_LENGTH + 10));
|
||||||
|
assertEquals(WiredUserConditionInputGuard.MAX_BADGE_CODE_LENGTH, normalized.length());
|
||||||
|
assertFalse(normalized.contains("\n"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void numericIdsAreNonNegativeAndCapped() {
|
||||||
|
assertEquals(0, WiredUserConditionInputGuard.normalizeEffectId(-1));
|
||||||
|
assertEquals(WiredUserConditionInputGuard.MAX_EFFECT_ID, WiredUserConditionInputGuard.normalizeEffectId(Integer.MAX_VALUE));
|
||||||
|
assertEquals(0, WiredUserConditionInputGuard.normalizeHandItemId(-1));
|
||||||
|
assertEquals(WiredUserConditionInputGuard.MAX_HAND_ITEM_ID, WiredUserConditionInputGuard.normalizeHandItemId(Integer.MAX_VALUE));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void unknownUserSourcesFallBackToTrigger() {
|
||||||
|
assertEquals(WiredSourceUtil.SOURCE_TRIGGER, WiredUserConditionInputGuard.normalizeUserSource(-1));
|
||||||
|
assertEquals(WiredSourceUtil.SOURCE_SELECTOR, WiredUserConditionInputGuard.normalizeUserSource(WiredSourceUtil.SOURCE_SELECTOR));
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user