Skip to content

Secure authored JavaScript text segments #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenCodez wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Secure authored JavaScript text segments #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed18691
Secure authored JavaScript text segments
BenCodez Aug 28, 2026
8c628d1
Add temporary #303 review-fix script
BenCodez Aug 28, 2026
ab0be58
Run validated fixes for PR #303
BenCodez Aug 28, 2026
6769caa
Fix JavaScript placeholder parsing and escape handling
BenCodez Aug 29, 2026
a36da3e
Isolate concurrent JavaScript evaluations
BenCodez Aug 29, 2026
fb003af
Preserve placeholders when JavaScript is disabled
BenCodez Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions AdvancedCore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@
<shadedPattern>
${project.groupId}.advancedcore.folialib</shadedPattern>
</relocation>
<relocation>
<pattern>org.mozilla.javascript</pattern>
<shadedPattern>${project.groupId}.advancedcore.rhino</shadedPattern>
</relocation>
</relocations>
<artifactSet>
<excludes>
Expand Down Expand Up @@ -231,6 +235,11 @@
<version>2.12.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
Expand Down
68 changes: 54 additions & 14 deletions AdvancedCore/src/main/java/com/bencodez/advancedcore/api/javascript/JavascriptEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.bencodez.advancedcore.api.javascript;

import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;

import javax.script.ScriptEngine;
Expand All @@ -16,17 +17,20 @@
import com.bencodez.simpleapi.messages.MessageAPI;

public class JavascriptEngine {
private HashMap<String, Object> engineAPI;
private final HashMap<String, Object> engineAPI;
private final HashMap<String, String> placeholders;
private OfflinePlayer placeholderPlayer;

public JavascriptEngine() {
engineAPI = new HashMap<>();
placeholders = new HashMap<>();
}

public JavascriptEngine addPlayer(AdvancedCoreUser user) {
placeholderPlayer = user.getOfflinePlayer();
addToEngine("PlayerName", user.getPlayerName());
addToEngine("PlayerUUID", user.getUUID());
addToEngine("AdvancedCoreUser", user);
// addToEngine("CommandSender", player);

for (JavascriptPlaceholderRequest request : AdvancedCorePlugin.getInstance().getJavascriptEngineRequests()) {
addToEngine(request.getStr(), request.getObject(user.getOfflinePlayer()));
Expand All @@ -42,6 +46,7 @@ public JavascriptEngine addPlayer(CommandSender player) {
addToEngine("CommandSender", player);
if (player instanceof Player) {
Player p = (Player) player;
placeholderPlayer = p;
addToEngine("Player", p);
addToEngine("PlayerName", p.getName());
addToEngine("PlayerUUID", p.getUniqueId().toString());
Expand All @@ -58,6 +63,7 @@ public JavascriptEngine addPlayer(CommandSender player) {
}

public JavascriptEngine addPlayer(OfflinePlayer player) {
placeholderPlayer = player;
addToEngine("Player", player);
addToEngine("PlayerName", player.getName());
addToEngine("PlayerUUID", player.getUniqueId().toString());
Expand All @@ -76,6 +82,7 @@ public JavascriptEngine addPlayer(OfflinePlayer player) {

public JavascriptEngine addPlayer(Player player) {
if (player != null) {
placeholderPlayer = player;
addToEngine("Player", player);
addToEngine("PlayerName", player.getName());
addToEngine("PlayerUUID", player.getUniqueId().toString());
Expand All @@ -90,6 +97,13 @@ public JavascriptEngine addPlayer(Player player) {
return this;
}

public JavascriptEngine addPlaceholders(Map<String, String> placeholders) {
if (placeholders != null && !placeholders.isEmpty()) {
this.placeholders.putAll(placeholders);
}
return this;
}

public JavascriptEngine addToEngine(HashMap<String, Object> engineAPI) {
if (engineAPI != null && !engineAPI.isEmpty()) {
this.engineAPI.putAll(engineAPI);
Expand Down Expand Up @@ -119,7 +133,7 @@ public boolean getBooleanValue(String expression) {
}

public Object getResult(String expression) {
if (!expression.equals("")) {
if (expression != null && !expression.isEmpty()) {
if (!AdvancedCorePlugin.getInstance().getOptions().isJavascriptEngineEnabled()) {
return null;
}
Expand All @@ -128,21 +142,32 @@ public Object getResult(String expression) {
AdvancedCorePlugin.getInstance().debug("Failed to process javascript, engine == null");
return null;
}
engine.put("Bukkit", Bukkit.getServer());
engine.put("AdvancedCore", AdvancedCorePlugin.getInstance());
engine.put("Console", Bukkit.getConsoleSender());
engine.put("UserManager", AdvancedCorePlugin.getInstance().getUserManager());
engine.put("RewardHandler", AdvancedCorePlugin.getInstance().getRewardHandler());
engine.put("MessageAPI", MessageAPI.class);

engineAPI.putAll(AdvancedCorePlugin.getInstance().getJavascriptEngine());

for (Entry<String, Object> entry : engineAPI.entrySet()) {
engine.put(entry.getKey(), entry.getValue());
HashMap<String, Object> placeholderBindings = new HashMap<>();
String preparedExpression;
try {
preparedExpression = JavascriptPlaceholderBinder.bind(expression, placeholderPlayer, placeholders,
placeholderBindings);
} catch (IllegalArgumentException e) {
AdvancedCorePlugin.getInstance().getLogger()
.warning("Failed to safely prepare javascript placeholders: " + e.getMessage());
AdvancedCorePlugin.getInstance().debug(e);
return null;
}

HashMap<String, Object> evaluationBindings = new HashMap<>();
evaluationBindings.put("Bukkit", Bukkit.getServer());
evaluationBindings.put("AdvancedCore", AdvancedCorePlugin.getInstance());
evaluationBindings.put("Console", Bukkit.getConsoleSender());
evaluationBindings.put("UserManager", AdvancedCorePlugin.getInstance().getUserManager());
evaluationBindings.put("RewardHandler", AdvancedCorePlugin.getInstance().getRewardHandler());
evaluationBindings.put("MessageAPI", MessageAPI.class);
evaluationBindings.putAll(engineAPI);
evaluationBindings.putAll(placeholderBindings);
evaluationBindings.putAll(AdvancedCorePlugin.getInstance().getJavascriptEngine());

try {
return engine.eval(expression);
return evaluateWithBindings(engine, preparedExpression, evaluationBindings);
} catch (ScriptException e) {
AdvancedCorePlugin.getInstance().getLogger().warning(
"Error occoured while evaluating javascript, turn debug on to see stacktrace: " + e.toString());
Expand All @@ -152,6 +177,21 @@ public Object getResult(String expression) {
return null;
}

/**
* The configured engine is cached and shared by every JavascriptEngine wrapper.
* Keep binding writes and evaluation under the same lock so concurrent rewards
* cannot observe or overwrite one another's per-evaluation values.
*/
static Object evaluateWithBindings(ScriptEngine engine, String expression, Map<String, Object> bindings)
throws ScriptException {
synchronized (engine) {
for (Entry<String, Object> entry : bindings.entrySet()) {
engine.put(entry.getKey(), entry.getValue());
}
return engine.eval(expression);
}
}

public String getStringValue(String expression) {
try {
Object result = getResult(expression);
Expand Down
Loading
Loading