Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 20:15:52 +01:00
Code Issues Packages Projects Releases Activity

Fix path traversal vulnerability

Browse Source
This commit is contained in:
Sebastian Sdorra
2022-01-17 15:33:42 +01:00
committed by René Pfeuffer
parent 0fe8914f9d
commit 1021640a4c
2 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
scm-webapp/src/main/java/sonia/scm/plugin/PathWebResourceLoader.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.plugin;
import org.slf4j.Logger;
@@ -38,37 +38,32 @@ import java.nio.file.Path;
* @author Sebastian Sdorra
* @since 2.0.0
*/
public class PathWebResourceLoader implements WebResourceLoader
{
public class PathWebResourceLoader implements WebResourceLoader {
private static final String SEPARATOR = "/";
private final Path directory;
/**
* the logger for PathWebResourceLoader
*/
private static final Logger LOG =
LoggerFactory.getLogger(PathWebResourceLoader.class);
private static final Logger LOG = LoggerFactory.getLogger(PathWebResourceLoader.class);
public PathWebResourceLoader(Path directory)
{
this.directory = directory;
public PathWebResourceLoader(Path directory) {
this.directory = directory.toAbsolutePath().normalize();
}
@Override
public URL getResource(String path) {
URL resource = null;
Path file = directory.resolve(filePath(path));
Path file = directory.resolve(filePath(path)).toAbsolutePath().normalize();
if (Files.exists(file) && ! Files.isDirectory(file))
{
if (isValidPath(file)) {
LOG.trace("found path {} at {}", path, file);
try
{
try {
resource = file.toUri().toURL();
}
catch (MalformedURLException ex)
{
} catch (MalformedURLException ex) {
LOG.error("could not transform path to url", ex);
}
} else {
@@ -78,6 +73,12 @@ public class PathWebResourceLoader implements WebResourceLoader
return resource;
}
private boolean isValidPath(Path file) {
return Files.exists(file)
&& !Files.isDirectory(file)
&& file.startsWith(directory);
}
private String filePath(String path) {
if (path.startsWith(SEPARATOR)) {
return path.substring(1);
@@ -85,8 +86,4 @@ public class PathWebResourceLoader implements WebResourceLoader
return path;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private final Path directory;
}