Skip to content

fix(QTDI-2856): fix RegExp loading via SPI #1222

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
undx wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −0
Open

fix(QTDI-2856): fix RegExp loading via SPI #1222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions ...core/src/main/java/org/talend/sdk/component/form/internal/validation/JavascriptRegex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
*/
package org.talend.sdk.component.form.internal.validation;

import java.util.ServiceLoader;
import java.util.function.Predicate;

import org.mozilla.javascript.Context;
import org.mozilla.javascript.RegExpLoader;
import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.Scriptable;

public class JavascriptRegex implements Predicate<CharSequence> {
Expand Down Expand Up @@ -47,6 +50,15 @@ public boolean test(final CharSequence text) {
final String script = "new RegExp(regex, indicators).test(text)";
final Context context = Context.enter();
try {
// Rhino 1.9.0+: RegExp is registered via ServiceLoader<RegExpLoader>.
// The ServiceLoader uses Thread.currentThread().getContextClassLoader() by default,
// which may not find the service in an isolated classloader context.
// Explicitly register RegExpProxy using Rhino's own classloader as fallback.
if (ScriptRuntime.getRegExpProxy(context) == null) {
ServiceLoader.load(RegExpLoader.class, context.getClass().getClassLoader())
.findFirst()
.ifPresent(loader -> ScriptRuntime.setRegExpProxy(context, loader.newProxy()));
}
final Scriptable scope = context.initStandardObjects();
scope.put("text", scope, text);
scope.put("regex", scope, regex);
Expand Down
13 changes: 13 additions & 0 deletions ...ger/src/main/java/org/talend/sdk/component/runtime/manager/reflect/ReflectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Expand All @@ -69,6 +70,8 @@
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.UnsetPropertiesRecipe;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.RegExpLoader;
import org.mozilla.javascript.ScriptRuntime;
import org.mozilla.javascript.Scriptable;
import org.talend.sdk.component.api.record.Schema;
import org.talend.sdk.component.api.service.configuration.Configuration;
Expand Down Expand Up @@ -855,6 +858,16 @@ public boolean test(final CharSequence text) {
final String script = "new RegExp(regex, indicators).test(text)";
final Context context = Context.enter();
try {
// Rhino 1.9.0+: RegExp is registered via ServiceLoader<RegExpLoader>.
// The ServiceLoader uses Thread.currentThread().getContextClassLoader() by default,
// which may not find the service in an isolated classloader context.
// Explicitly register RegExpProxy using Rhino's own classloader as fallback.
if (ScriptRuntime.getRegExpProxy(context) == null) {
ServiceLoader
.load(RegExpLoader.class, context.getClass().getClassLoader())
.findFirst()
.ifPresent(loader -> ScriptRuntime.setRegExpProxy(context, loader.newProxy()));
}
final Scriptable scope = context.initStandardObjects();
scope.put("text", scope, text);
scope.put("regex", scope, regex);
Expand Down
Loading