------------------------------------------------------------------------ r1866920 | jleroux | 2019-09-14 10:19:18 +0200 (sam. 14 sept. 2019) | 18 lignes Fixed: Path Traversal in webtools/control/FetchLogs and ViewFile (OFBIZ-11196) These are not really path traversal issues. We can't solve them using the traditional way to fix path traversal issues (ie normalising path). Because Fetchlogs and ViewFile are actually reading files and if you have the right to read these files then nothing will prevent you to read them. The problem is more what those requests are supposed to do. Fetchlogs is supposed to read a log in the log dir and ViewFile is supposed to read a file containing labels (ie either an XML or Properties file). So the solution is to allow these requests to only do what they are supposed to do. This is what is done in ViewFile and FetLogs Groovy files. ------------------------------------------------------------------------ git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1866922 13f79535-47bb-0310-9956-ffa450edef68
41 lines
1.6 KiB
Groovy
41 lines
1.6 KiB
Groovy
/*
|
|
* Licensed to the Apache Software Foundation (ASF) under one
|
|
* or more contributor license agreements. See the NOTICE file
|
|
* distributed with this work for additional information
|
|
* regarding copyright ownership. The ASF licenses this file
|
|
* to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
import java.net.URI
|
|
import org.apache.ofbiz.base.util.*
|
|
import org.w3c.dom.*
|
|
import java.io.ByteArrayOutputStream
|
|
import org.apache.commons.lang.StringEscapeUtils
|
|
|
|
fileString = ""
|
|
if (parameters.fileName) {
|
|
file = new File(parameters.fileName)
|
|
if (parameters.fileName.endsWith(".xml")) {
|
|
Document document = UtilXml.readXmlDocument(file.toURL(), false)
|
|
ByteArrayOutputStream os = new ByteArrayOutputStream()
|
|
UtilXml.writeXmlDocument(document, os, "UTF-8", true, true, 4)
|
|
os.close()
|
|
fileString = os.toString()
|
|
} else if (parameters.fileName.endsWith(".properties")) {
|
|
fileString = FileUtil.readString("UTF-8", file)
|
|
}
|
|
rows = fileString.split(System.getProperty("line.separator"))
|
|
context.rows = rows.size()
|
|
}
|
|
context.fileString = fileString
|