The Unified and Autonomous Development Platform
Fix issue #1009 - Sanitize content type when view raw blob to avoid potential XSS attack
Robin Shen9de56d5aa93c
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex d2244aac46..8f223023c1 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -16,6 +16,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.FileInfo;+import io.onedev.server.util.MimeFileInfo;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.StatusInfo;@@ -86,7 +87,7 @@ public interface BuildManager extends EntityManager<Build> {List<ProjectBuildStats> queryStats(Collection<Project> projects);- long getArtifactSize(Build build, String artifactPath);+ MimeFileInfo getArtifactInfo(Build build, String artifactPath);void deleteArtifact(Build build, String artifactPath);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 9b72b71e74..a83b6020f9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -3,6 +3,7 @@ package io.onedev.server.entitymanager.impl;import java.io.File;import java.io.ObjectStreamException;import java.io.Serializable;+import java.nio.file.Files;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -91,6 +92,7 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessBuild;import io.onedev.server.security.permission.JobPermission;import io.onedev.server.util.FileInfo;+import io.onedev.server.util.MimeFileInfo;import io.onedev.server.util.ProjectBuildStats;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.StatusInfo;@@ -948,20 +950,21 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui}@Override- public long getArtifactSize(Build build, String artifactPath) {+ public MimeFileInfo getArtifactInfo(Build build, String artifactPath) {Long projectId = build.getProject().getId();Long buildNumber = build.getNumber();- return projectManager.runOnProjectServer(projectId, new ClusterTask<Long>() {+ return projectManager.runOnProjectServer(projectId, new ClusterTask<MimeFileInfo>() {private static final long serialVersionUID = 1L;@Override- public Long call() throws Exception {+ public MimeFileInfo call() throws Exception {File artifactsDir = Build.getArtifactsDir(projectId, buildNumber);File artifactFile = new File(artifactsDir, artifactPath);if (artifactFile.exists() && artifactFile.isFile()) {- return artifactFile.length();+ return new MimeFileInfo(artifactPath, artifactFile.lastModified(),+ artifactFile.length(), Files.probeContentType(artifactFile.toPath()));} else {String errorMessage = String.format("Specified artifact path does not exist or is a directory (project: %s, build number: %d, path: %s)",diff --git a/server-core/src/main/java/io/onedev/server/util/MimeFileInfo.java b/server-core/src/main/java/io/onedev/server/util/MimeFileInfo.javaindex ec6b8efb6d..87d7ff08a4 100644--- a/server-core/src/main/java/io/onedev/server/util/MimeFileInfo.java+++ b/server-core/src/main/java/io/onedev/server/util/MimeFileInfo.java@@ -11,7 +11,7 @@ public class MimeFileInfo extends FileInfo {this.type = type;}- public String getType() {+ public String getMediaType() {return type;}diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.javaindex 204ecf8cdd..80a6829f01 100644--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java@@ -311,7 +311,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new BasePageMapper("~projects/import/${importer}", ProjectImportPage.class));// For backward compatibility- add(new BasePageMapper("projects", ProjectDashboardPage.class));+ add(new BasePageMapper("projects/${project}", ProjectDashboardPage.class));add(new ProjectPageMapper("${project}", ProjectDashboardPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.javaindex 028875e03e..1391f051ff 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/ArtifactResource.java@@ -47,6 +47,8 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.MimeFileInfo;+import io.onedev.server.web.util.MimeUtils;public class ArtifactResource extends AbstractResource {@@ -79,7 +81,7 @@ public class ArtifactResource extends AbstractResource {String artifactPath = Joiner.on("/").join(pathSegments);- long artifactSize = -1;+ MimeFileInfo fileInfo = null;if (!SecurityUtils.getUserId().equals(User.SYSTEM_ID)) {Project project = OneDev.getInstance(ProjectManager.class).load(projectId);@@ -94,12 +96,11 @@ public class ArtifactResource extends AbstractResource {if (!SecurityUtils.canAccess(build))throw new UnauthorizedException();- artifactSize = getBuildManager().getArtifactSize(build, artifactPath);+ fileInfo = getBuildManager().getArtifactInfo(build, artifactPath);}ResourceResponse response = new ResourceResponse();response.getHeaders().addHeader("X-Content-Type-Options", "nosniff");- response.setContentType(MimeTypes.OCTET_STREAM);response.disableCaching();String fileName = artifactPath;@@ -111,8 +112,12 @@ public class ArtifactResource extends AbstractResource {throw new RuntimeException(e);}- if (artifactSize != -1)- response.setContentLength(artifactSize);+ if (fileInfo != null) {+ response.setContentLength(fileInfo.getLength());+ response.setContentType(MimeUtils.sanitize(fileInfo.getMediaType()));+ } else {+ response.setContentType(MimeTypes.OCTET_STREAM);+ }response.setWriteCallback(new WriteCallback() {diff --git a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.javaindex 5bb39300f0..9c93795143 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java@@ -16,7 +16,6 @@ import javax.ws.rs.client.ClientBuilder;import javax.ws.rs.client.Invocation;import javax.ws.rs.client.WebTarget;import javax.ws.rs.core.HttpHeaders;-import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;import org.apache.commons.lang3.StringUtils;@@ -45,6 +44,7 @@ import io.onedev.server.util.ExceptionUtils;import io.onedev.server.util.IOUtils;import io.onedev.server.util.LongRange;import io.onedev.server.web.mapper.ProjectMapperUtils;+import io.onedev.server.web.util.MimeUtils;import io.onedev.server.web.util.WicketUtils;public class RawBlobResource extends AbstractResource {@@ -83,16 +83,14 @@ public class RawBlobResource extends AbstractResource {ResourceResponse response = new ResourceResponse();response.setAcceptRange(ContentRangeType.BYTES);- response.setContentType(project.detectMediaType(blob.getIdent()).toString());+ response.getHeaders().addHeader("X-Content-Type-Options", "nosniff");+ response.setContentType(MimeUtils.sanitize(project.detectMediaType(blob.getIdent()).toString()));if (blob.getLfsPointer() != null)response.setContentLength(blob.getLfsPointer().getObjectSize());elseresponse.setContentLength(blob.getSize());- if (response.getContentType().equals(MediaType.TEXT_HTML))- response.setContentType(MediaType.TEXT_PLAIN);-if (!ObjectId.isId(revision))response.disableCaching();diff --git a/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.java b/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.javaindex 834ed27cfa..f7d0f35ffe 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/SiteFileResource.java@@ -83,7 +83,7 @@ public class SiteFileResource extends AbstractResource {response.setAcceptRange(ContentRangeType.BYTES);MimeFileInfo mimeFileInfo = getProjectManager().getSiteFileInfo(projectId, filePath);- response.setContentType(mimeFileInfo.getType());+ response.setContentType(mimeFileInfo.getMediaType());response.setContentLength(mimeFileInfo.getLength());diff --git a/server-core/src/main/java/io/onedev/server/web/util/MimeUtils.java b/server-core/src/main/java/io/onedev/server/web/util/MimeUtils.javanew file mode 100644index 0000000000..4f108ee91e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/MimeUtils.java@@ -0,0 +1,17 @@+package io.onedev.server.web.util;++import org.apache.tika.mime.MimeTypes;++public class MimeUtils {++ public static String sanitize(String mediaType) {+ if (mediaType.startsWith("image/") || mediaType.startsWith("video/")+ || mediaType.equals("application/json") || mediaType.equals("application/xml")) {+ return mediaType;+ } else if (mediaType.startsWith("text/")) {+ return MimeTypes.PLAIN_TEXT;+ } else {+ return MimeTypes.OCTET_STREAM;+ }+ }+}