The Unified and Autonomous Development Platform
Fix security vulnerability issue regarding site/* access
Robin Shen8aa94e0daf84
diff --git a/pom.xml b/pom.xmlindex 7ffeadd026..76468b4dbe 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 21553c1929..b8de22e95f 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex 6b1d2acff2..561ba3b819 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -487,17 +487,48 @@ public class Upgrade extends DefaultPersistManager {FileUtils.deleteFile(new File(upgradeDir, "boot/system.classpath"));cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));-- for (File file: new File(Bootstrap.getSiteDir(), "avatars").listFiles()) {++ FileUtils.createDir(new File(upgradeDir, "site/assets"));+ if (new File(upgradeDir, "site/robots.txt").exists()) {+ try {+ FileUtils.copyFile(+ new File(upgradeDir, "site/robots.txt"),+ new File(upgradeDir, "site/assets/robots.txt"));+ FileUtils.deleteFile(new File(upgradeDir, "site/robots.txt"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ if (new File(upgradeDir, "site/logo.png").exists()) {+ try {+ FileUtils.copyFile(+ new File(upgradeDir, "site/logo.png"),+ new File(upgradeDir, "site/assets/logo.png"));+ FileUtils.deleteFile(new File(upgradeDir, "site/logo.png"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ if (new File(upgradeDir, "site/avatars").exists()) {+ try {+ FileUtils.copyDirectory(+ new File(upgradeDir, "site/avatars"),+ new File(upgradeDir, "site/assets/avatars"));+ FileUtils.deleteDir(new File(upgradeDir, "site/avatars"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ for (File file: new File(Bootstrap.getSiteDir(), "assets/avatars").listFiles()) {if (file.isFile()) {try {- FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));+ FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/assets/avatars"));} catch (IOException e) {throw new RuntimeException(e);}}}- File uploadedDir = new File(upgradeDir, "site/avatars/uploaded");+ File uploadedDir = new File(upgradeDir, "site/assets/avatars/uploaded");File userUploadsDir = new File(uploadedDir, "users");if (uploadedDir.exists() && !userUploadsDir.exists()) {FileUtils.createDir(userUploadsDir);diff --git a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.javaindex 89bb7ba21d..4b53d39f02 100644--- a/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java+++ b/server-core/src/main/java/io/onedev/server/web/avatar/DefaultAvatarManager.java@@ -93,7 +93,7 @@ public class DefaultAvatarManager implements AvatarManager {if (StringUtils.isBlank(secondaryName))secondaryName = primaryName;- File avatarFile = new File(Bootstrap.getSiteDir(), "avatars/generated/" + encoded + ".png");+ File avatarFile = new File(Bootstrap.getSiteDir(), "assets/avatars/generated/" + encoded + ".png");if (!avatarFile.exists()) {Lock avatarLock = LockUtils.getLock("generated-avatar:" + encoded);avatarLock.lock();@@ -129,7 +129,7 @@ public class DefaultAvatarManager implements AvatarManager {@Overridepublic File getUploaded(User user) {- return new File(Bootstrap.getSiteDir(), "avatars/uploaded/users/" + user.getId() + ".jpg");+ return new File(Bootstrap.getSiteDir(), "assets/avatars/uploaded/users/" + user.getId() + ".jpg");}@Sessional@@ -170,7 +170,7 @@ public class DefaultAvatarManager implements AvatarManager {@Overridepublic File getUploaded(Long projectId) {- return new File(Bootstrap.getSiteDir(), "avatars/uploaded/projects/" + projectId + ".jpg");+ return new File(Bootstrap.getSiteDir(), "assets/avatars/uploaded/projects/" + projectId + ".jpg");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.javaindex b62fbeb492..bbe13aa168 100644--- a/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/brandlogo/BrandLogoPanel.java@@ -18,7 +18,7 @@ public class BrandLogoPanel extends Panel {}private File getCustomLogoFile() {- return new File(Bootstrap.getSiteDir(), "logo.png");+ return new File(Bootstrap.getSiteDir(), "assets/logo.png");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.javaindex 2ee3609aa7..1140346da7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java@@ -33,7 +33,7 @@ public class BrandingSettingPage extends AdministrationPage {}private File getLogoFile() {- return new File(Bootstrap.getSiteDir(), "logo.png");+ return new File(Bootstrap.getSiteDir(), "assets/logo.png");}@Overridediff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex c129970758..bc0397ec1d 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 67bc2989ab..23f8bcd253 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex ab645b1517..122658b81e 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex c0f12764b0..c8d965f66b 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 49dd5eaa28..46330c303a 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 7563567833..3f496589c2 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 0a738453ef..46adda523a 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex 3081652858..b472eb5d0d 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex a352a0b645..8a8f2589f2 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex 6f6ba9a469..ee376ee88e 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex ddf186f641..3a37c5f466 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex 27233b5210..d0aeb6219b 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex 615dd9a16c..2d31d28fdc 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex beb9fc646c..658134b1fb 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex c52f3a1c44..84b61bac90 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex 1989fd8ab5..0c7b73a7cf 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex 7de73694d8..e5f492cc24 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex 1887a67b6d..e45ba20a67 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex 714f093627..e008643ec4 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex 4e1dcb71a6..5c784bbe74 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex d1a6b58f40..ecace1be7c 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex 7168ef266e..66689cc4ce 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 00b3e0606c..1213859283 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 4dd4999915..8e5575073c 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex cc9c50a437..5a96657e1b 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 726d5d095a..a52d024339 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex d3436fccce..aac302355b 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex 42a45ec7bd..3bd62fbfd8 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex e9ce35777e..9591fd3ca4 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex 0dc9cb1c37..7f2ff212a7 100644--- a/server-plugin/server-plugin-sso-discord/pom.xml+++ b/server-plugin/server-plugin-sso-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex f0e4bbd789..c7c4231b78 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-product/pom.xml b/server-product/pom.xmlindex 61d68069a5..d7a24c8914 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.2.9</version>+ <version>7.3.0</version></parent><dependencies><dependency>diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.javaindex 6dc591896a..6072bfa428 100644--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java@@ -1,5 +1,6 @@package io.onedev.server.product;+import java.io.File;import java.util.EnumSet;import javax.inject.Inject;@@ -119,8 +120,10 @@ public class ProductServletConfigurator implements ServletConfigurator {* Configure a servlet to serve contents under site folder. Site folder can be used* to hold site specific web assets.*/- ServletHolder fileServletHolder = new ServletHolder(new FileAssetServlet(Bootstrap.getSiteDir()));+ File assetsDir = new File(Bootstrap.getSiteDir(), "assets");+ ServletHolder fileServletHolder = new ServletHolder(new FileAssetServlet(assetsDir));context.addServlet(fileServletHolder, "/site/*");+context.addServlet(fileServletHolder, "/robots.txt");context.addServlet(new ServletHolder(jerseyServlet), "/api/*");diff --git a/server-product/system/site/avatars/onedev.png b/server-product/system/site/assets/avatars/onedev.pngsimilarity index 100%rename from server-product/system/site/avatars/onedev.pngrename to server-product/system/site/assets/avatars/onedev.pngdiff --git a/server-product/system/site/avatars/project.png b/server-product/system/site/assets/avatars/project.pngsimilarity index 100%rename from server-product/system/site/avatars/project.pngrename to server-product/system/site/assets/avatars/project.pngdiff --git a/server-product/system/site/avatars/user.png b/server-product/system/site/assets/avatars/user.pngsimilarity index 100%rename from server-product/system/site/avatars/user.pngrename to server-product/system/site/assets/avatars/user.pngdiff --git a/server-product/system/site/robots.txt b/server-product/system/site/assets/robots.txtsimilarity index 100%rename from server-product/system/site/robots.txtrename to server-product/system/site/assets/robots.txt