The Unified and Autonomous Development Platform
Fix issue #1168 - Site publish: accessing directory should redirect to index.html under that directory
Robin Shen651c42da2752
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 9f46d1ded8..f4e7c79558 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -1,30 +1,28 @@package io.onedev.server.entitymanager;-import java.io.File;-import java.util.Collection;-import java.util.List;-import java.util.Map;-import java.util.UUID;-import java.util.concurrent.Future;--import javax.annotation.Nullable;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;--import io.onedev.server.cluster.ProjectServer;-import io.onedev.server.model.support.code.GitPackConfig;-import io.onedev.server.util.artifact.FileInfo;-import org.apache.shiro.authz.Permission;-import org.eclipse.jgit.lib.Repository;-import io.onedev.server.cluster.ClusterTask;+import io.onedev.server.cluster.ProjectServer;import io.onedev.server.model.Project;+import io.onedev.server.model.support.code.GitPackConfig;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.artifact.ArtifactInfo;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.util.facade.ProjectFacade;+import org.apache.shiro.authz.Permission;+import org.eclipse.jgit.lib.Repository;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import java.io.File;+import java.util.Collection;+import java.util.List;+import java.util.Map;+import java.util.UUID;+import java.util.concurrent.Future;public interface ProjectManager extends EntityManager<Project> {@@ -97,7 +95,8 @@ public interface ProjectManager extends EntityManager<Project> {Collection<String> getReservedNames();- FileInfo getSiteFileInfo(Long projectId, String siteFilePath);+ @Nullable+ ArtifactInfo getSiteArtifactInfo(Long projectId, String siteArtifactPath);void checkGitConfig(Long projectId, GitPackConfig gitPackConfig);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex a1e9bef68f..f7e45ee31d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -57,6 +57,8 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.AccessProject;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ProjectNameReservation;+import io.onedev.server.util.artifact.ArtifactInfo;+import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.util.facade.ProjectCache;@@ -1094,23 +1096,32 @@ public class DefaultProjectManager extends BaseEntityManager<Project>return reservedNames;}+ @Nullable@Override- public FileInfo getSiteFileInfo(Long projectId, String filePath) {- return runOnProjectServer(projectId, new ClusterTask<FileInfo>() {+ public ArtifactInfo getSiteArtifactInfo(Long projectId, String siteArtifactPath) {+ return runOnProjectServer(projectId, new ClusterTask<ArtifactInfo>() {private static final long serialVersionUID = 1L;@Override- public FileInfo call() throws Exception {- return LockUtils.read(Project.getSiteLockName(projectId), new Callable<FileInfo>() {+ public ArtifactInfo call() throws Exception {+ return LockUtils.read(Project.getSiteLockName(projectId), new Callable<ArtifactInfo>() {@Override- public FileInfo call() throws Exception {- File siteFile = new File(storageManager.getProjectSiteDir(projectId), filePath);- String mediaType = Files.probeContentType(siteFile.toPath());- if (mediaType == null)- mediaType = MediaType.APPLICATION_OCTET_STREAM;- return new FileInfo(filePath, siteFile.length(), siteFile.lastModified(), mediaType);+ public ArtifactInfo call() throws Exception {+ File siteArtifact = new File(storageManager.getProjectSiteDir(projectId), siteArtifactPath);+ if (siteArtifact.exists()) {+ if (siteArtifact.isFile()) {+ String mediaType = Files.probeContentType(siteArtifact.toPath());+ if (mediaType == null)+ mediaType = MediaType.APPLICATION_OCTET_STREAM;+ return new FileInfo(siteArtifactPath, siteArtifact.length(), siteArtifact.lastModified(), mediaType);+ } else {+ return new DirectoryInfo(siteArtifactPath, siteArtifact.lastModified(), null);+ }+ } else {+ return null;+ }}});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 022a5527bb..19a59a6216 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@@ -14,10 +14,13 @@ import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ExceptionUtils;import io.onedev.server.util.IOUtils;import io.onedev.server.util.LongRange;+import io.onedev.server.util.artifact.ArtifactInfo;+import io.onedev.server.util.artifact.DirectoryInfo;import io.onedev.server.util.artifact.FileInfo;import io.onedev.server.web.mapper.ProjectMapperUtils;import io.onedev.server.web.util.WicketUtils;import org.apache.shiro.authz.UnauthorizedException;+import org.apache.wicket.request.flow.RedirectToUrlException;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.AbstractResource;import org.eclipse.jetty.io.EofException;@@ -25,11 +28,13 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import javax.persistence.EntityNotFoundException;+import javax.servlet.http.HttpServletResponse;import javax.ws.rs.client.Client;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 java.io.*;import java.net.URLEncoder;@@ -38,6 +43,7 @@ import java.util.ArrayList;import java.util.List;import java.util.UUID;import java.util.concurrent.Callable;+import java.util.concurrent.atomic.AtomicReference;public class SiteFileResource extends AbstractResource {@@ -66,18 +72,40 @@ public class SiteFileResource extends AbstractResource {filePathSegments.add(segment);}- String filePath;- if (!filePathSegments.isEmpty())- filePath = Joiner.on("/").join(filePathSegments);- else+ FileInfo fileInfo;+ String filePath = Joiner.on("/").join(filePathSegments);+ if (filePath.length() != 0) {+ ArtifactInfo artifactInfo = getProjectManager().getSiteArtifactInfo(projectId, filePath);+ if (artifactInfo instanceof DirectoryInfo) {+ if (attributes.getRequest().getUrl().getPath().endsWith("/")) {+ filePath += "/index.html";+ artifactInfo = getProjectManager().getSiteArtifactInfo(projectId, filePath);+ if (artifactInfo instanceof FileInfo)+ fileInfo = (FileInfo) artifactInfo;+ else+ return newNotFoundResponse(filePath);+ } else {+ throw new RedirectToUrlException(attributes.getRequest().getUrl().getPath() + "/");+ }+ } else if (artifactInfo instanceof FileInfo) {+ fileInfo = (FileInfo) artifactInfo;+ } else {+ return newNotFoundResponse(filePath);+ }+ } else if (attributes.getRequest().getUrl().getPath().endsWith("/")) {filePath = "index.html";-+ ArtifactInfo artifactInfo = getProjectManager().getSiteArtifactInfo(projectId, filePath);+ if (artifactInfo instanceof FileInfo)+ fileInfo = (FileInfo) artifactInfo;+ else+ return newNotFoundResponse(filePath);+ } else {+ throw new RedirectToUrlException(attributes.getRequest().getUrl().getPath() + "/");+ }+ResourceResponse response = new ResourceResponse();response.setAcceptRange(ContentRangeType.BYTES);-- FileInfo fileInfo = getProjectManager().getSiteFileInfo(projectId, filePath);response.setContentType(fileInfo.getMediaType());-response.setContentLength(fileInfo.getLength());try {@@ -86,6 +114,7 @@ public class SiteFileResource extends AbstractResource {throw new RuntimeException(e);}+ String finalFilePath = filePath;response.setWriteCallback(new WriteCallback() {private void handle(Exception e) {@@ -106,7 +135,7 @@ public class SiteFileResource extends AbstractResource {@Overridepublic Void call() {- File file = new File(getStorageManager().getProjectSiteDir(projectId), filePath);+ File file = new File(getStorageManager().getProjectSiteDir(projectId), finalFilePath);try (InputStream is = new FileInputStream(file)) {IOUtils.copyRange(is, attributes.getResponse().getOutputStream(), range);} catch (IOException e) {@@ -123,7 +152,7 @@ public class SiteFileResource extends AbstractResource {WebTarget target = client.target(serverUrl);target = target.path("~api/cluster/site").queryParam("projectId", project.getId())- .queryParam("filePath", filePath);+ .queryParam("filePath", finalFilePath);Invocation.Builder builder = target.request();builder.header(HttpHeaders.AUTHORIZATION,KubernetesHelper.BEARER + " " + getClusterManager().getCredentialValue());@@ -146,6 +175,19 @@ public class SiteFileResource extends AbstractResource {return response;}++ private ResourceResponse newNotFoundResponse(String filePath) {+ ResourceResponse response = new ResourceResponse();+ response.setStatusCode(HttpServletResponse.SC_NOT_FOUND).setContentType(MediaType.TEXT_PLAIN);+ return new ResourceResponse().setWriteCallback(new WriteCallback() {+ @Override+ public void writeData(Attributes attributes) throws IOException {+ attributes.getResponse().write("Site file not found: " + filePath);+ }++ });++ }private ProjectManager getProjectManager() {return OneDev.getInstance(ProjectManager.class);