This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new ac2270118d Fixed: Use replace() instead of replaceAll() when a regex
is not used (OFBIZ-10934)
ac2270118d is described below
commit ac2270118df04bc593d4af029942478f85f13f01
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Oct 11 11:36:32 2022 +0200
Fixed: Use replace() instead of replaceAll() when a regex is not used
(OFBIZ-10934)
Regexp needs to double the backslash, so replaceAll() needs too, but not
replace()
This fixes all cases put in with previous commits
---
framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java | 2 +-
.../base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java | 2 +-
.../common/src/main/java/org/apache/ofbiz/common/CommonEvents.java | 2 +-
.../security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java | 2 +-
.../src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java | 2 +-
.../java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
index 0a76169b5c..972d83e3ec 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/FileUtil.java
@@ -151,7 +151,7 @@ public final class FileUtil {
private static String getPatchedFileName(String path, String fileName)
throws IOException {
// make sure the export directory exists
if (UtilValidate.isNotEmpty(path)) {
- path = path.replace("\\\\", "/");
+ path = path.replace("\\", "/");
File parentDir = new File(path);
if (!parentDir.exists()) {
if (!parentDir.mkdir()) {
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
index 6075240bf0..91b79239bc 100755
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/KeyStoreUtil.java
@@ -136,7 +136,7 @@ public final class KeyStoreUtil {
static Map<String, String> getX500Map(Principal x500) {
Map<String, String> x500Map = new HashMap<>();
- String name = x500.getName().replace("\\\\,", "&com;");
+ String name = x500.getName().replace("\\,", "&com;");
String[] x500Opts = name.split("\\,");
for (String opt: x500Opts) {
if (opt.indexOf("=") > -1) {
diff --git
a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
index 68ef797e97..c430bb5418 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/CommonEvents.java
@@ -477,7 +477,7 @@ public class CommonEvents {
String platformSpecificPath = sourceFileUrl.getFile();
// ensure file separator in location is correct
if (!platformSpecificPath.contains(File.separator) &&
"\\".equals(File.separator)) {
- platformSpecificPath =
platformSpecificPath.replace("/", "\\\\");
+ platformSpecificPath =
platformSpecificPath.replace("/", "\\");
}
// get line number
int lineNumber = 1;
diff --git
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
index 6e6b0c8463..ca1bd09e5e 100644
---
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
+++
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
@@ -146,7 +146,7 @@ public class SecuredUpload {
// More about that:
https://docs.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
if (fileToCheck.length() > 259) {
Debug.logError("Uploaded file name too long", MODULE);
- } else if (p.toString().contains(imageServerUrl.replace("/",
"\\\\"))) {
+ } else if (p.toString().contains(imageServerUrl.replace("/",
"\\"))) {
// TODO check this is still useful in at least 1 case
if (fileName.matches("[a-zA-Z0-9-_ ()]{1,249}.[a-zA-Z0-9-_
]{1,10}")) { // "(" and ")" for duplicates files
wrongFile = false;
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
index d20d68e93c..401edd3a9c 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
@@ -1243,7 +1243,7 @@ public final class LoginWorker {
Map<String, String> x500Map =
KeyStoreUtil.getCertX500Map(clientCerts[i]);
if (i == 0) {
String cn = x500Map.get("CN");
- cn = cn.replace("\\\\", "");
+ cn = cn.replace("\\", "");
Matcher m = pattern.matcher(cn);
if (m.matches()) {
userLoginId = m.group(1);
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
index 3e4e88dddf..bc995cdd00 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
@@ -135,7 +135,7 @@ public final class MacroFormRenderer implements
FormStringRenderer {
}
private static String encodeDoubleQuotes(String htmlString) {
- return htmlString.replace("\"", "\\\\\"");
+ return htmlString.replace("\"", "\\\"");
}
public boolean getRenderPagination() {
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
index 90178d2624..0a5b96310d 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
@@ -124,7 +124,7 @@ public class MacroMenuRenderer implements
MenuStringRenderer {
Object value = parameter.getValue();
if (value instanceof String) {
sb.append('"');
- sb.append(((String) value).replaceAll("\"", "\\\\\""));
+ sb.append(((String) value).replace("\"", "\\\""));
sb.append('"');
} else {
sb.append(value);
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
index 53a0ab39bc..49edbc32b4 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
@@ -292,7 +292,7 @@ public class MacroTreeRenderer implements
TreeStringRenderer {
sr.append("\" linkText=\"");
sr.append(linkText);
sr.append("\" imgStr=\"");
- sr.append(imgStr.replace("\"", "\\\\\""));
+ sr.append(imgStr.replace("\"", "\\\""));
sr.append("\" />");
executeMacro(sr.toString().replace("|", "%7C")); // Fix for OFBIZ-9191
}
