You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by st...@apache.org on 2025/12/18 08:25:33 UTC
(felix-dev) branch master updated: FELIX-6813 Revert escaping introduced via FELIX-6757
This is an automated email from the ASF dual-hosted git repository.
stbischof pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 60dc7d4e35 FELIX-6813 Revert escaping introduced via FELIX-6757
60dc7d4e35 is described below
commit 60dc7d4e351c14b9711d536f9d755d2b4f8f53de
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Nov 28 13:26:55 2025 +0100
FELIX-6813 Revert escaping introduced via FELIX-6757
Escaping is already done in JSONWriter.quote when emitting the bundle
properties as JSON.
When emitting as text (via BundlesServlet.print(...)) no escaping is
necessary at all.
---
.../java/org/apache/felix/webconsole/internal/core/BundlesServlet.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
index 93ba3a2538..37b79f1db5 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
@@ -77,7 +77,6 @@ import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
-import org.owasp.encoder.Encode;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
@@ -764,7 +763,7 @@ public class BundlesServlet extends AbstractOsgiManagerPlugin implements Invento
final Map<String, Object> obj = new LinkedHashMap<String, Object>();
obj.put("key", key);
if ( val instanceof String ) {
- obj.put("value", Encode.forJavaScript((String)val));
+ obj.put("value", val); // escaping happens when writing into JSON via JSONWriter
} else {
obj.put("value", val);
}