The Unified and Autonomous Development Platform
feat: An project setting to require login for automatic code indexing
Robin Shen1fb84aea05fb
diff --git a/e2e-test/tests/api.js b/e2e-test/tests/api.jsindex 14ccd39559..ee948cecf1 100644--- a/e2e-test/tests/api.js+++ b/e2e-test/tests/api.js@@ -27,7 +27,7 @@ export class FixturesApi {async createProject(name = `e2e-${randomUUID()}`) {const id = await this.json('post', '~api/projects', { data: {- name, codeManagement: true, wikiManagement: true, codeAnalysisSetting: {}, gitPackConfig: {},+ name, codeManagement: true, wikiManagement: true, codeIndexingSetting: {}, gitPackConfig: {},} });this.projects.push(id);return { id, name };diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex c9cd7f1210..af228e104c 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -9553,4 +9553,18 @@ public class DataMigrator {}}+ private void migrate249(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ var dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var codeAnalysisSettingElement = element.element("codeAnalysisSetting");+ if (codeAnalysisSettingElement != null)+ codeAnalysisSettingElement.setName("codeIndexingSetting");+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex b623bca531..a14e90183b 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -97,7 +97,7 @@ import io.onedev.server.git.service.RefFacade;import io.onedev.server.git.signatureverification.SignatureVerificationService;import io.onedev.server.git.signatureverification.VerificationSuccessful;import io.onedev.server.model.Build.Status;-import io.onedev.server.model.support.CodeAnalysisSetting;+import io.onedev.server.model.support.CodeIndexingSetting;import io.onedev.server.model.support.LabelSupport;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedCommitQuery;@@ -418,7 +418,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel@Lob@Column(length=65535)- private CodeAnalysisSetting codeAnalysisSetting = new CodeAnalysisSetting();+ private CodeIndexingSetting codeIndexingSetting = new CodeIndexingSetting();@Lob@Column(length=65535)@@ -1181,12 +1181,12 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn new SpecifiedPath();}- public CodeAnalysisSetting getCodeAnalysisSetting() {- return codeAnalysisSetting;+ public CodeIndexingSetting getCodeIndexingSetting() {+ return codeIndexingSetting;}- public void setCodeAnalysisSetting(CodeAnalysisSetting codeAnalysisSetting) {- this.codeAnalysisSetting = codeAnalysisSetting;+ public void setCodeIndexingSetting(CodeIndexingSetting codeIndexingSetting) {+ this.codeIndexingSetting = codeIndexingSetting;}public ProjectAiSetting getAiSetting() {@@ -2112,14 +2112,25 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelpublic String findCodeAnalysisFiles() {Project current = this;do {- if (current.getCodeAnalysisSetting().getAnalyzeFiles() != null)- return current.getCodeAnalysisSetting().getAnalyzeFiles();+ if (current.getCodeIndexingSetting().getAnalyzeFiles() != null)+ return current.getCodeIndexingSetting().getAnalyzeFiles();current = current.getParent();} while (current != null);return "**";}+ public boolean findRequireLoginForAutoIndexing() {+ Project current = this;+ do {+ if (current.getCodeIndexingSetting().getRequireLoginForAutoIndexing() != null)+ return current.getCodeIndexingSetting().getRequireLoginForAutoIndexing();+ current = current.getParent();+ } while (current != null);++ return false;+ }+@Nullablepublic String findIssueBranchPrefix() {Project current = this;diff --git a/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java b/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.javadeleted file mode 100644index 7814dbfc45..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/CodeAnalysisSetting.java+++ /dev/null@@ -1,33 +0,0 @@-package io.onedev.server.model.support;--import io.onedev.server.rest.annotation.Api;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Patterns;--import org.jspecify.annotations.Nullable;-import java.io.Serializable;--@Editable-public class CodeAnalysisSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- @Api(description = "Leave empty to inherit from parent project, or all files if no parent")- private String analysisFiles;-- @Editable(order=100, name="Files to Be Analyzed", placeholder="Inherit from parent", rootPlaceholder ="All files", description="""- OneDev analyzes repository files for code search, line statistics, and code contribution statistics. This setting tells which files should be analyzed.- <b>NOTE: </b> Changing this setting only affects new commits. To apply the change to history commits, please stop the server and delete folder- <code>index</code> and <code>info/commit</code> under <a href='https://docs.onedev.io/concepts#project-storage' target='_blank'>project's storage directory</a>.- The repository will be re-analyzed when server is started""")- @Patterns(path=true)- @Nullable- public String getAnalyzeFiles() {- return analysisFiles;- }-- public void setAnalyzeFiles(@Nullable String analyzeFiles) {- this.analysisFiles = analyzeFiles;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/CodeIndexingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/CodeIndexingSetting.javanew file mode 100644index 0000000000..2ab4138fa5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/CodeIndexingSetting.java@@ -0,0 +1,47 @@+package io.onedev.server.model.support;++import io.onedev.server.rest.annotation.Api;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Patterns;++import org.jspecify.annotations.Nullable;+import java.io.Serializable;++@Editable+public class CodeIndexingSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ @Api(description = "Files to analyze during code indexing. Leave empty to inherit from parent project, or all files if no parent")+ private String analysisFiles;++ @Api(description = "Leave empty to inherit from parent project, or false if no parent")+ private Boolean requireLoginForAutoIndexing;++ @Editable(order=100, name="Files to Be Indexed", placeholder="Inherit from parent", rootPlaceholder ="All files", description="""+ Specify which repository files OneDev should index. During indexing, OneDev analyzes these files for code search, line statistics, and code contribution statistics.+ <b>NOTE: </b> Changing this setting only affects new commits. To apply the change to history commits, please stop the server and delete folder+ <code>index</code> and <code>info/commit</code> under <a href='https://docs.onedev.io/concepts#project-storage' target='_blank'>project's storage directory</a>.+ The repository will be re-indexed when the server is started""")+ @Patterns(path=true)+ @Nullable+ public String getAnalyzeFiles() {+ return analysisFiles;+ }++ public void setAnalyzeFiles(@Nullable String analyzeFiles) {+ this.analysisFiles = analyzeFiles;+ }++ @Editable(order=200, name="Require Login for Automatic Indexing", placeholder="Inherit from parent", rootPlaceholder="No", description="""+ If enabled, a login session is required to automatically trigger code indexing when browsing repository files or viewing diffs""")+ @Nullable+ public Boolean getRequireLoginForAutoIndexing() {+ return requireLoginForAutoIndexing;+ }++ public void setRequireLoginForAutoIndexing(@Nullable Boolean requireLoginForAutoIndexing) {+ this.requireLoginForAutoIndexing = requireLoginForAutoIndexing;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.javaindex 6bb9e1d513..7962367da5 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java@@ -50,7 +50,7 @@ import io.onedev.server.model.Iteration;import io.onedev.server.model.Project;import io.onedev.server.model.ProjectLabel;import io.onedev.server.model.UserAuthorization;-import io.onedev.server.model.support.CodeAnalysisSetting;+import io.onedev.server.model.support.CodeIndexingSetting;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.WebHook;@@ -496,7 +496,7 @@ public class ProjectResource {private GitPackConfig gitPackConfig;@Api(order = 900)- private CodeAnalysisSetting codeAnalysisSetting;+ private CodeIndexingSetting codeIndexingSetting;public Long getId() {return id;@@ -621,12 +621,12 @@ public class ProjectResource {}@NotNull- public CodeAnalysisSetting getCodeAnalysisSetting() {- return codeAnalysisSetting;+ public CodeIndexingSetting getCodeIndexingSetting() {+ return codeIndexingSetting;}- public void setCodeAnalysisSetting(CodeAnalysisSetting codeAnalysisSetting) {- this.codeAnalysisSetting = codeAnalysisSetting;+ public void setCodeIndexingSetting(CodeIndexingSetting codeIndexingSetting) {+ this.codeIndexingSetting = codeIndexingSetting;}public void populate(Project project, ProjectService projectService) {@@ -648,7 +648,7 @@ public class ProjectResource {project.setTimeTracking(isTimeTracking());project.setServiceDeskEmailAddress(getServiceDeskEmailAddress());project.setGitPackConfig(getGitPackConfig());- project.setCodeAnalysisSetting(getCodeAnalysisSetting());+ project.setCodeIndexingSetting(getCodeIndexingSetting());}public static ProjectData from(Project project) {@@ -668,7 +668,7 @@ public class ProjectResource {data.setTimeTracking(project.isTimeTracking());data.setServiceDeskEmailAddress(project.getServiceDeskEmailAddress());data.setGitPackConfig(project.getGitPackConfig());- data.setCodeAnalysisSetting(project.getCodeAnalysisSetting());+ data.setCodeIndexingSetting(project.getCodeIndexingSetting());return data;}diff --git a/server-core/src/main/java/io/onedev/server/util/HttpUtils.java b/server-core/src/main/java/io/onedev/server/util/HttpUtils.javaindex 9e2f8e9dab..9b1b8a1777 100644--- a/server-core/src/main/java/io/onedev/server/util/HttpUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/HttpUtils.java@@ -1,5 +1,7 @@package io.onedev.server.util;+import java.util.Locale;+import org.apache.commons.codec.binary.Base64;import org.jspecify.annotations.Nullable;@@ -12,6 +14,15 @@ import static org.apache.commons.lang3.StringUtils.substringBefore;public class HttpUtils {+ public static boolean isBot(HttpServletRequest request) {+ var userAgent = request.getHeader("User-Agent");+ if (userAgent == null)+ return false;+ userAgent = userAgent.toLowerCase(Locale.ROOT);+ return userAgent.contains("bot") || userAgent.contains("crawler")+ || userAgent.contains("spider") || userAgent.contains("crawling");+ }+@Nullablepublic static String getAuthBasicUser(HttpServletRequest request) {var auth = request.getHeader(HttpHeaders.AUTHORIZATION);diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 5c8d6b7552..497d6cb9da 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -420,6 +420,12 @@ public abstract class RevisionDiffPanel extends Panel {protected void onConfigure() {super.onConfigure();+ if (WicketUtils.isBot()+ || (getProject().findRequireLoginForAutoIndexing() && SecurityUtils.getAuthUser() == null)) {+ setVisible(false);+ return;+ }+ObjectId oldCommit = getOldCommitId();ObjectId newCommit = getNewCommitId();boolean oldCommitIndexed = oldCommit.equals(ObjectId.zeroId())diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.javaindex 43694e24cb..704538da71 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java@@ -152,7 +152,7 @@ public abstract class ForkOptionPanel extends Panel {newProject.setIssueManagement(editProject.isIssueManagement());newProject.setWikiManagement(editProject.isWikiManagement());newProject.setTimeTracking(editProject.isTimeTracking());- newProject.setCodeAnalysisSetting(getProject().getCodeAnalysisSetting());+ newProject.setCodeIndexingSetting(getProject().getCodeIndexingSetting());newProject.setGitPackConfig(getProject().getGitPackConfig());newProject.getBuildSetting().setBuildPreservations(getProject().getBuildSetting().getBuildPreservations());newProject.getBuildSetting().setCachePreserveDays(getProject().getBuildSetting().getCachePreserveDays());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 9c944040f1..227dd12cdc 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@@ -148,7 +148,7 @@ import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPimport io.onedev.server.web.page.project.setting.build.JobPropertiesPage;import io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.cache.CacheManagementPage;-import io.onedev.server.web.page.project.setting.code.analysis.CodeAnalysisSettingPage;+import io.onedev.server.web.page.project.setting.code.analysis.CodeIndexingSettingPage;import io.onedev.server.web.page.project.setting.code.branchprotection.BranchProtectionsPage;import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;@@ -491,7 +491,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new ProjectPageMapper("${project}/~settings/avatar-edit", AvatarEditPage.class));add(new ProjectPageMapper("${project}/~settings/branch-protection", BranchProtectionsPage.class));add(new ProjectPageMapper("${project}/~settings/tag-protection", TagProtectionsPage.class));- add(new ProjectPageMapper("${project}/~settings/code-analysis", CodeAnalysisSettingPage.class));+ add(new ProjectPageMapper("${project}/~settings/code-analysis", CodeIndexingSettingPage.class));add(new ProjectPageMapper("${project}/~settings/git-pack-config", GitPackConfigPage.class));add(new ProjectPageMapper("${project}/~settings/pull-request", PullRequestSettingPage.class));add(new ProjectPageMapper("${project}/~settings/build/job-secrets", JobSecretsPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex a30692b65c..da8b43fd85 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -101,7 +101,7 @@ import io.onedev.server.web.page.project.setting.build.DefaultFixedIssueFiltersPimport io.onedev.server.web.page.project.setting.build.JobPropertiesPage;import io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.cache.CacheManagementPage;-import io.onedev.server.web.page.project.setting.code.analysis.CodeAnalysisSettingPage;+import io.onedev.server.web.page.project.setting.code.analysis.CodeIndexingSettingPage;import io.onedev.server.web.page.project.setting.code.branchprotection.BranchProtectionsPage;import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;@@ -288,8 +288,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware, ChBranchProtectionsPage.class, BranchProtectionsPage.paramsOf(getProject())));codeSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Tag Protection"),TagProtectionsPage.class, TagProtectionsPage.paramsOf(getProject())));- codeSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Code Analysis"),- CodeAnalysisSettingPage.class, CodeAnalysisSettingPage.paramsOf(getProject())));+ codeSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Code Indexing"),+ CodeIndexingSettingPage.class, CodeIndexingSettingPage.paramsOf(getProject())));if (getProject().isCodeManagement()) {codeSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Git Pack Config"),GitPackConfigPage.class, GitPackConfigPage.paramsOf(getProject())));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 196e16c669..903ff12f61 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -139,6 +139,7 @@ import io.onedev.server.web.resource.RawBlobResource;import io.onedev.server.web.resource.RawBlobResourceReference;import io.onedev.server.web.upload.FileUpload;import io.onedev.server.web.util.EditParamsAware;+import io.onedev.server.web.util.WicketUtils;public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,EditParamsAware, JobAuthorizationContextAware, ProjectScopedCommitAware {@@ -282,7 +283,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,protected void onConfigure() {super.onConfigure();- if (resolvedRevision != null) {+ if (resolvedRevision != null && !WicketUtils.isBot()+ && (!getProject().findRequireLoginForAutoIndexing() || SecurityUtils.getAuthUser() != null)) {RevCommit commit = getProject().getRevCommit(resolvedRevision, true);if (!codeIndexService.isIndexed(getProject().getId(), commit)) {codeIndexService.indexAsync(getProject().getId(), commit);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeIndexingSettingPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeIndexingSettingPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeIndexingSettingPage.javasimilarity index 74%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeIndexingSettingPage.javaindex db3fd263fa..7aa337a377 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeAnalysisSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/code/analysis/CodeIndexingSettingPage.java@@ -13,7 +13,7 @@ import io.onedev.server.OneDev;import io.onedev.server.data.migration.VersionedXmlDoc;import io.onedev.server.service.ProjectService;import io.onedev.server.model.Project;-import io.onedev.server.model.support.CodeAnalysisSetting;+import io.onedev.server.model.support.CodeIndexingSetting;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.editable.BeanContext;@@ -21,9 +21,9 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.overview.ProjectOverviewPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;-public class CodeAnalysisSettingPage extends ProjectSettingPage {+public class CodeIndexingSettingPage extends ProjectSettingPage {- public CodeAnalysisSettingPage(PageParameters params) {+ public CodeIndexingSettingPage(PageParameters params) {super(params);}@@ -31,7 +31,7 @@ public class CodeAnalysisSettingPage extends ProjectSettingPage {protected void onInitialize() {super.onInitialize();- CodeAnalysisSetting bean = getProject().getCodeAnalysisSetting();+ CodeIndexingSetting bean = getProject().getCodeIndexingSetting();var oldAuditContent = VersionedXmlDoc.fromBean(bean).toXML();Form<?> form = new Form<Void>("form") {@@ -40,11 +40,11 @@ public class CodeAnalysisSettingPage extends ProjectSettingPage {super.onSubmit();var newAuditContent = VersionedXmlDoc.fromBean(bean).toXML();- getProject().setCodeAnalysisSetting(bean);+ getProject().setCodeIndexingSetting(bean);OneDev.getInstance(ProjectService.class).update(getProject());- auditService.audit(getProject(), "changed code analysis settings", oldAuditContent, newAuditContent);- setResponsePage(CodeAnalysisSettingPage.class, CodeAnalysisSettingPage.paramsOf(getProject()));- Session.get().success(_T("Code analysis settings updated"));+ auditService.audit(getProject(), "changed code indexing settings", oldAuditContent, newAuditContent);+ setResponsePage(CodeIndexingSettingPage.class, CodeIndexingSettingPage.paramsOf(getProject()));+ Session.get().success(_T("Code indexing settings updated"));}};@@ -55,13 +55,13 @@ public class CodeAnalysisSettingPage extends ProjectSettingPage {@Overrideprotected Component newProjectTitle(String componentId) {- return new Label(componentId, "<span class='text-truncate'>" + _T("Code Analysis Settings") + "</span>").setEscapeModelStrings(false);+ return new Label(componentId, "<span class='text-truncate'>" + _T("Code Indexing Settings") + "</span>").setEscapeModelStrings(false);}@Overrideprotected BookmarkablePageLink<Void> navToProject(String componentId, Project project) {if (SecurityUtils.canManageProject(project))- return new ViewStateAwarePageLink<Void>(componentId, CodeAnalysisSettingPage.class, paramsOf(project.getId()));+ return new ViewStateAwarePageLink<Void>(componentId, CodeIndexingSettingPage.class, paramsOf(project.getId()));elsereturn new ViewStateAwarePageLink<Void>(componentId, ProjectOverviewPage.class, ProjectPage.paramsOf(project.getId()));}diff --git a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.javaindex 5ab3c9d4d2..aef22e62cf 100644--- a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java@@ -3,6 +3,7 @@ package io.onedev.server.web.util;import io.onedev.server.OneDev;import io.onedev.server.SubscriptionService;import io.onedev.server.service.ProjectService;+import io.onedev.server.util.HttpUtils;import io.onedev.server.util.LongRange;import io.onedev.server.util.facade.ProjectCache;import io.onedev.server.web.WebSession;@@ -133,6 +134,11 @@ public class WicketUtils {return "web-request:" + sessionId;}+ public static boolean isBot() {+ var request = (HttpServletRequest) RequestCycle.get().getRequest().getContainerRequest();+ return HttpUtils.isBot(request);+ }+public static boolean isDevice() {HttpServletRequest request = (HttpServletRequest) RequestCycle.get().getRequest().getContainerRequest();String userAgent = request.getHeader("User-Agent").toLowerCase();diff --git a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.javaindex 88f66285cb..ba697b6913 100644--- a/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java+++ b/server-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java@@ -18,6 +18,7 @@ package org.apache.wicket.protocol.http.servlet;import java.io.IOException;import java.time.Instant;+import io.onedev.server.util.HttpUtils;import jakarta.servlet.http.Cookie;import jakarta.servlet.http.HttpServletRequest;import jakarta.servlet.http.HttpServletResponse;@@ -289,13 +290,7 @@ public class ServletWebResponse extends WebResponse}else{- String userAgent = webRequest.getContainerRequest().getHeader("User-Agent");- if (userAgent != null)- userAgent = userAgent.toLowerCase();- else- userAgent = "";- if (userAgent.contains("bot") || userAgent.contains("crawler")- || userAgent.contains("spider") || userAgent.contains("crawling")) {+ if (HttpUtils.isBot(webRequest.getContainerRequest())) {httpServletResponse.sendRedirect(url);} else {httpServletResponse.resetBuffer();