The Unified and Autonomous Development Platform
feat: Add submodule support for wiki
Robin Shend0c83b8d4fe4
diff --git a/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.java b/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.javaindex 82ff53b1c9..be21a6212e 100644--- a/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/wiki/WikiSetting.java@@ -12,8 +12,10 @@ public class WikiSetting implements Serializable {private static final long serialVersionUID = 1L;private WikiFolder folder;- @Editable(name="Wiki Folder", placeholder="Inherit from parent", rootPlaceholder="Use folder 'wiki'",- description="Repository root or specified folder containing Markdown wiki pages. Leave empty to inherit from parent (defaults to wiki)")+ @Editable(name="Wiki Folder", placeholder="Inherit from parent", rootPlaceholder="Use folder 'wiki'", description="""+ Specify the repository folder to store wiki pages. Leave empty to inherit from parent.+ If you do not want to store wiki pages in the project repository, the specified folder+ can be a Git submodule""")@Validpublic WikiFolder getFolder() {return folder;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.htmlindex 1b62fdf8c3..4b2467a5a7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.html@@ -1,4 +1,7 @@<wicket:extend>+ <div wicket:id="wikiWarning" class="bg-white flex-grow-1 d-flex flex-column p-5">+ <div wicket:id="message" class="alert alert-notice alert-light-warning"></div>+ </div><div wicket:id="empty" class="bg-white flex-grow-1 d-flex flex-column p-5"><div class="alert alert-notice alert-light-warning"><wicket:t>Home page not found</wicket:t>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.javaindex 4356bf20e4..4672291898 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/wiki/ProjectWikiPage.java@@ -60,6 +60,7 @@ import io.onedev.server.git.BlobEdits;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;import io.onedev.server.git.GitUtils;+import io.onedev.server.git.Submodule;import io.onedev.server.git.exception.BlobEditException;import io.onedev.server.git.exception.NotTreeException;import io.onedev.server.git.exception.ObjectAlreadyExistsException;@@ -70,6 +71,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.code.ConventionalCommitChecker;import io.onedev.server.search.commit.PathCriteria;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.SettingService;import io.onedev.server.util.CryptoUtils;import io.onedev.server.util.FileExtension;import io.onedev.server.util.FilenameUtils;@@ -101,7 +104,10 @@ import io.onedev.server.web.util.WikiUtils;public class ProjectWikiPage extends ProjectPage {private String revision;private String page;- private final @Nullable String folder;+ private @Nullable String folder;+ private boolean submodule;+ private Long wikiProjectId;+ private String wikiWarning;private final boolean editing;private final boolean creating;private String returnPage;@@ -144,6 +150,47 @@ public class ProjectWikiPage extends ProjectPage {return OneDev.getInstance(GitService.class);}+ private Project getWikiProject() {+ return wikiProjectId != null ? OneDev.getInstance(ProjectService.class).load(wikiProjectId) : getProject();+ }++ private void resolveWikiProject() {+ if (commitId == null || folder == null)+ return;+ var ident = git().getBlobIdent(getProject(), commitId, folder);+ if (ident == null || !ident.isGitLink())+ return;+ submodule = true;+ var target = Submodule.fromString(getProject().getBlob(ident, true).getText().getContent());+ commitId = null;+ if (target.getUrl() == null) {+ wikiWarning = _T("Wiki submodule URL is not configured.");+ return;+ }+ String serverUrl = OneDev.getInstance(SettingService.class).getSystemSetting().getServerUrl();+ String projectPath = WikiUtils.submoduleProjectPath(serverUrl, getProject().getPath(), target.getUrl());+ if (projectPath == null) {+ wikiWarning = _T("Cannot display wiki pages hosted on other servers.");+ return;+ }+ var project = OneDev.getInstance(ProjectService.class).findByPath(projectPath);+ if (project == null && projectPath.endsWith(".git"))+ project = OneDev.getInstance(ProjectService.class).findByPath(projectPath.substring(0, projectPath.length() - 4));+ if (project == null) {+ wikiWarning = _T("Wiki project not found.");+ } else if (!SecurityUtils.canReadCode(project)) {+ wikiWarning = _T("No permission to access wiki project.");+ } else {+ wikiProjectId = project.getId();+ folder = null;+ commitId = project.getObjectId(target.getCommitId(), false);+ if (commitId == null || project.getRevCommit(commitId, false) == null) {+ commitId = null;+ wikiWarning = _T("Wiki revision not found.");+ }+ }+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -164,6 +211,11 @@ public class ProjectWikiPage extends ProjectPage {});if (revision != null)commitId = getProject().getObjectId(revision, true).copy();+ resolveWikiProject();+ var wikiWarningContainer = new WebMarkupContainer("wikiWarning");+ wikiWarningContainer.setVisible(wikiWarning != null);+ wikiWarningContainer.add(new Label("message", wikiWarning));+ add(wikiWarningContainer);String path = WikiUtils.pagePath(folder, page);String content = read(page);if ((editing || creating) && !canEdit(path))@@ -171,15 +223,15 @@ public class ProjectWikiPage extends ProjectPage {if (commitId != null && content == null && !page.equals("Home") && !editing && !creating)throw new NotFoundException("Wiki page not found: " + page);- boolean missingHome = content == null && !editing && !creating;+ boolean missingHome = wikiWarning == null && content == null && !editing && !creating;WebMarkupContainer empty = new WebMarkupContainer("empty");- empty.setVisible(getProject().getDefaultBranch() == null && !editing && !creating);+ empty.setVisible(wikiWarning == null && getProject().getDefaultBranch() == null && !editing && !creating);empty.add(link("addHome", "Home", true, false).setVisible(canEdit(WikiUtils.pagePath(folder, "Home"))));add(empty);WebMarkupContainer wiki = new WebMarkupContainer("wiki");- wiki.setVisible(!empty.isVisible());+ wiki.setVisible(wikiWarning == null && !empty.isVisible());wiki.setOutputMarkupId(true);add(wiki);wiki.add(new RevisionPicker("revision", new LoadableDetachableModel<Project>() {@@ -553,9 +605,9 @@ public class ProjectWikiPage extends ProjectPage {}}.setVisible(canEdit(WikiUtils.pagePath(folder, "New-page"))));actions.add(new ViewStateAwarePageLink<Void>("history", ProjectCommitsPage.class,- ProjectCommitsPage.paramsOf(getProject(), new PathCriteria(List.of(path)).toString(),+ ProjectCommitsPage.paramsOf(getWikiProject(), new PathCriteria(List.of(path)).toString(),commitId != null ? commitId.name() : null))- .setVisible(SecurityUtils.canReadCode(getProject()) && content != null));+ .setVisible(SecurityUtils.canReadCode(getWikiProject()) && content != null));actions.add(link("edit", page, true, false).setVisible(canEdit(path)));actions.add(new AjaxLink<Void>("delete") {@Override@@ -585,7 +637,8 @@ public class ProjectWikiPage extends ProjectPage {}private void selectPage(AjaxRequestTarget target, String destination) {- if (editing || creating || !isPermitted())+ if (editing || creating || !isPermitted() || wikiWarning != null+ || submodule && !SecurityUtils.canReadCode(getWikiProject()))throw new UnauthorizedException();WikiUtils.pagePath(folder, destination);String content = read(destination);@@ -776,19 +829,19 @@ public class ProjectWikiPage extends ProjectPage {}private String read(String name) {- if (commitId == null)+ if (commitId == null || submodule && !SecurityUtils.canReadCode(getWikiProject()))return null;- var blob = getProject().getBlob(new BlobIdent(commitId.name(), WikiUtils.pagePath(folder, name), FileMode.REGULAR_FILE.getBits()), false);+ var blob = getWikiProject().getBlob(new BlobIdent(commitId.name(), WikiUtils.pagePath(folder, name), FileMode.REGULAR_FILE.getBits()), false);if (blob == null || blob.getText() == null || blob.getLfsPointer() != null || !blob.getIdent().isFile())return null;return blob.getText().getContent();}private void collectPages(@Nullable String directory, List<String> pages) {- var ident = directory != null ? git().getBlobIdent(getProject(), commitId, directory)+ var ident = directory != null ? git().getBlobIdent(getWikiProject(), commitId, directory): new BlobIdent(commitId.name(), null, FileMode.TREE.getBits());if (ident != null && ident.isTree()) {- for (var child : git().getChildren(getProject(), commitId, directory, BlobIdentFilter.ALL, false)) {+ for (var child : git().getChildren(getWikiProject(), commitId, directory, BlobIdentFilter.ALL, false)) {if (child.isTree()) {collectPages(child.path, pages);} else if (child.isFile() && child.path.endsWith(".md")) {@@ -812,8 +865,9 @@ public class ProjectWikiPage extends ProjectPage {if (markdown == null)return "";var service = OneDev.getInstance(MarkdownService.class);- String html = service.process(service.render(markdown), getProject(), null, null, false);- return new WikiLinkResolver(getProject(), revision, folder, currentPath, returnPage).resolve(html);+ String html = service.process(service.render(markdown), getWikiProject(), null, null, false);+ return new WikiLinkResolver(getProject(), revision, folder, currentPath, returnPage,+ getWikiProject(), submodule && commitId != null ? commitId.name() : revision, submodule).resolve(html);}private static String folderOf(String path) {@@ -822,7 +876,7 @@ public class ProjectWikiPage extends ProjectPage {}private boolean canEdit(String path) {- return Objects.equals(folder, getProject().getWikiFolder().getPath()) && SecurityUtils.canEditWikiPage(getProject(), revision, path);+ return !submodule && Objects.equals(folder, getProject().getWikiFolder().getPath()) && SecurityUtils.canEditWikiPage(getProject(), revision, path);}private void save(Form<?> form, String name, String text, String message, boolean delete, boolean existed) {diff --git a/server-core/src/main/java/io/onedev/server/web/util/WikiLinkResolver.java b/server-core/src/main/java/io/onedev/server/web/util/WikiLinkResolver.javaindex a0d0d2183c..7100ad251a 100644--- a/server-core/src/main/java/io/onedev/server/web/util/WikiLinkResolver.java+++ b/server-core/src/main/java/io/onedev/server/web/util/WikiLinkResolver.java@@ -25,6 +25,9 @@ import io.onedev.server.web.resource.RawBlobResourceReference;public class WikiLinkResolver {private final Project project;+ private final Project wikiProject;+ private final String wikiRevision;+ private final boolean readOnly;private final String revision;private final @Nullable String folder;private final String currentPath;@@ -32,6 +35,14 @@ public class WikiLinkResolver {public WikiLinkResolver(Project project, @Nullable String revision, @Nullable String folder,String currentPath, String returnPage) {+ this(project, revision, folder, currentPath, returnPage, project, revision, false);+ }++ public WikiLinkResolver(Project project, @Nullable String revision, @Nullable String folder,+ String currentPath, String returnPage, Project wikiProject, @Nullable String wikiRevision, boolean readOnly) {+ this.wikiProject = wikiProject;+ this.wikiRevision = wikiRevision;+ this.readOnly = readOnly;this.project = project;this.revision = revision;this.folder = folder;@@ -61,7 +72,7 @@ public class WikiLinkResolver {public String resolve(String html) {html = WikiUtils.resolveRelativeLinks(html, currentPath,path -> fileUrl(path, false), path -> fileUrl(path, true),- path -> project.getMode(revision, path) == 0, this::addFileUrl, addIconHref());+ path -> wikiProject.getMode(wikiRevision, path) == 0, this::addFileUrl, addIconHref());return resolvePageLinks(html);}@@ -69,7 +80,7 @@ public class WikiLinkResolver {public String resolvePageLinks(String html) {return WikiUtils.resolvePageLinks(html,destination -> WikiUtils.resolvePagePath(currentPath, destination), this::pageUrl,- path -> project.getBlob(new BlobIdent(revision, path), false) == null,+ path -> wikiProject.getBlob(new BlobIdent(wikiRevision, path), false) == null,this::addPageUrl, addIconHref());}@@ -90,13 +101,13 @@ public class WikiLinkResolver {if (!image && path.endsWith(".md"))return pageUrl(path);return RequestCycle.get().urlFor(new RawBlobResourceReference(),- RawBlobResource.paramsOf(project, new BlobIdent(revision, path))).toString();+ RawBlobResource.paramsOf(wikiProject, new BlobIdent(wikiRevision, path))).toString();}private String repositoryUrl(String path, boolean image) {- int mode = project.getMode(revision, path);- var ident = new BlobIdent(revision, path, mode != 0 ? mode : FileMode.REGULAR_FILE.getBits());- var params = ProjectBlobPage.paramsOf(project, ident);+ int mode = wikiProject.getMode(wikiRevision, path);+ var ident = new BlobIdent(wikiRevision, path, mode != 0 ? mode : FileMode.REGULAR_FILE.getBits());+ var params = ProjectBlobPage.paramsOf(wikiProject, ident);if (image)params.add("raw", true);var cycle = RequestCycle.get();@@ -109,7 +120,7 @@ public class WikiLinkResolver {}private @Nullable String addPageUrl(String path, String originalPath) {- if (!Objects.equals(folder, project.getWikiFolder().getPath()) || !WikiUtils.isUnderFolder(folder, path)+ if (readOnly || !Objects.equals(folder, project.getWikiFolder().getPath()) || !WikiUtils.isUnderFolder(folder, path)|| !SecurityUtils.canEditWikiPage(project, revision, path))return null;String destination = pageName(path);@@ -121,7 +132,7 @@ public class WikiLinkResolver {}private @Nullable String addFileUrl(String path) {- if (!SecurityUtils.canModifyFile(project, revision, path))+ if (readOnly || !SecurityUtils.canModifyFile(project, revision, path))return null;var state = new ProjectBlobPage.State(new BlobIdent(revision, currentPath, FileMode.REGULAR_FILE.getBits()));state.mode = Mode.ADD;diff --git a/server-core/src/main/java/io/onedev/server/web/util/WikiUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WikiUtils.javaindex bc94b5ef1c..b1a4d542a3 100644--- a/server-core/src/main/java/io/onedev/server/web/util/WikiUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/WikiUtils.java@@ -17,12 +17,32 @@ import io.onedev.server.exception.NotAcceptableException;import io.onedev.server.git.GitUtils;import io.onedev.server.markdown.LinkUtils;import io.onedev.server.util.HtmlUtils;+import io.onedev.server.util.UrlUtils;import io.onedev.server.validation.validator.PathValidator;public class WikiUtils {private static final Pattern REFERENCE = Pattern.compile("\\[\\[([^\\]\\r\\n]+)\\]\\]");+ /** Resolve Git-relative URLs against the containing repository, keeping the configured server root. */+ public static @Nullable String submoduleProjectPath(String serverUrl, String projectPath, @Nullable String url) {+ if (url == null)+ return null;+ try {+ String root = serverUrl.replaceAll("/+$", "") + "/";+ var target = java.net.URI.create(url);+ if (url.startsWith("./") || url.startsWith("../"))+ target = java.net.URI.create(root + projectPath + "/").resolve(target);+ String normalized = target.normalize().toString();+ if (!normalized.startsWith(root) || target.getQuery() != null || target.getFragment() != null)+ return null;+ String path = UrlUtils.decodePath(normalized.substring(root.length()));+ return path.isEmpty() ? null : path.replaceAll("/+$", "");+ } catch (IllegalArgumentException e) {+ return null;+ }+ }+public static boolean isUnderFolder(@Nullable String folder, String path) {return path != null && (folder == null || path.startsWith(folder + "/"));}diff --git a/server-core/src/test/java/io/onedev/server/web/page/project/wiki/ProjectWikiPageTest.java b/server-core/src/test/java/io/onedev/server/web/page/project/wiki/ProjectWikiPageTest.javanew file mode 100644index 0000000000..da2a90ab9a--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/web/page/project/wiki/ProjectWikiPageTest.java@@ -0,0 +1,93 @@+package io.onedev.server.web.page.project.wiki;++import static org.junit.Assert.*;+import static org.mockito.ArgumentMatchers.*;+import static org.mockito.Mockito.*;++import java.nio.charset.StandardCharsets;++import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;+import org.junit.Test;++import io.onedev.server.OneDev;+import io.onedev.server.git.Blob;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.service.GitService;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.SystemSetting;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.SettingService;++public class ProjectWikiPageTest {++ @Test+ public void resolvesSubmoduleBeforeReadingHomeAndAlwaysDeniesEdits() throws Exception {+ var owner = mock(Project.class);+ var target = mock(Project.class);+ var git = mock(GitService.class);+ var projects = mock(ProjectService.class);+ var settings = mock(SettingService.class);+ var system = mock(SystemSetting.class);+ when(settings.getSystemSetting()).thenReturn(system);+ when(system.getServerUrl()).thenReturn("https://server");+ when(owner.getPath()).thenReturn("app");+ when(target.getId()).thenReturn(2L);+ when(projects.load(2L)).thenReturn(target);+ var ownerCommit = ObjectId.fromString("1111111111111111111111111111111111111111");+ var targetCommit = ObjectId.fromString("2222222222222222222222222222222222222222");+ var ident = new BlobIdent(ownerCommit.name(), "wiki", FileMode.GITLINK.getBits());+ when(git.getBlobIdent(owner, ownerCommit, "wiki")).thenReturn(ident);+ when(target.getObjectId(targetCommit.name(), false)).thenReturn(targetCommit);+ when(target.getRevCommit(targetCommit, false)).thenReturn(mock(RevCommit.class));+ try (var oneDev = mockStatic(OneDev.class); var security = mockStatic(SecurityUtils.class)) {+ oneDev.when(() -> OneDev.getInstance(GitService.class)).thenReturn(git);+ oneDev.when(() -> OneDev.getInstance(ProjectService.class)).thenReturn(projects);+ oneDev.when(() -> OneDev.getInstance(SettingService.class)).thenReturn(settings);+ for (String scenario : new String[] {"external", "missing", "denied", "allowed"}) {+ clearInvocations(target);+ String url = scenario.equals("external") ? "https://other/docs" : "https://server/docs";+ byte[] content = (url + ":" + targetCommit.name()).getBytes(StandardCharsets.UTF_8);+ when(owner.getBlob(ident, true)).thenReturn(new Blob(ident, ownerCommit, content, content.length));+ when(projects.findByPath("docs")).thenReturn(scenario.equals("missing") ? null : target);+ security.when(() -> SecurityUtils.canReadCode(target)).thenReturn(scenario.equals("allowed"));+ var page = mock(ProjectWikiPage.class, CALLS_REAL_METHODS);+ doReturn(owner).when(page).getProject();+ set(page, "folder", "wiki");+ set(page, "commitId", ownerCommit);+ invoke(page, "resolveWikiProject");+ assertEquals(false, invoke(page, "canEdit", "Home.md"));+ invoke(page, "read", "Home");+ if (scenario.equals("allowed")) {+ assertNull(get(page, "wikiWarning"));+ verify(target).getBlob(argThat(it -> targetCommit.name().equals(it.revision)+ && "Home.md".equals(it.path)), eq(false));+ } else {+ assertNotNull(get(page, "wikiWarning"));+ verifyNoInteractions(target);+ }+ }+ }+ }++ private static void set(ProjectWikiPage page, String name, Object value) throws Exception {+ var field = ProjectWikiPage.class.getDeclaredField(name);+ field.setAccessible(true);+ field.set(page, value);+ }++ private static Object get(ProjectWikiPage page, String name) throws Exception {+ var field = ProjectWikiPage.class.getDeclaredField(name);+ field.setAccessible(true);+ return field.get(page);+ }++ private static Object invoke(ProjectWikiPage page, String name, String... args) throws Exception {+ var method = args.length == 0 ? ProjectWikiPage.class.getDeclaredMethod(name)+ : ProjectWikiPage.class.getDeclaredMethod(name, String.class);+ method.setAccessible(true);+ return method.invoke(page, (Object[]) args);+ }+}diff --git a/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.java b/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.javaindex d1d7e19825..5645454c72 100644--- a/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.java+++ b/server-core/src/test/java/io/onedev/server/web/util/WikiLinkResolverTest.java@@ -151,6 +151,36 @@ public class WikiLinkResolverTest {}}+ @Test+ public void submoduleLinksKeepWikiNavigationButReadTargetCommitWithoutCreationActions() {+ var project = mock(Project.class);+ var target = mock(Project.class);+ when(project.getPath()).thenReturn("project");+ var cycle = mock(RequestCycle.class);+ when(cycle.urlFor(eq(ProjectWikiPage.class), any(PageParameters.class)))+ .thenAnswer(it -> url("~wiki", it.getArgument(1)));+ when(cycle.urlFor(any(RawBlobResourceReference.class), any(PageParameters.class))).thenAnswer(it -> {+ PageParameters params = it.getArgument(1);+ assertEquals("pinned", params.get("revision").toString());+ return "/target/raw/" + params.get("file");+ });+ try (var requestCycle = mockStatic(RequestCycle.class); var sprite = mockStatic(SpriteImage.class);+ var security = mockStatic(SecurityUtils.class)) {+ requestCycle.when(RequestCycle::get).thenReturn(cycle);+ security.when(() -> SecurityUtils.canModifyFile(any(), any(), any())).thenReturn(true);+ security.when(() -> SecurityUtils.canEditWikiPage(any(), any(), any())).thenReturn(true);+ var resolver = new WikiLinkResolver(project, "main", null, "Home.md", "Home", target, "pinned", true);+ var document = Jsoup.parseBodyFragment(resolver.resolve(+ "[[Missing]] <a href='Guide.md'>Guide</a><img src='logo.png'><a href='missing.pdf'>File</a>"));+ assertEquals("/project/~wiki/main/Missing", document.selectFirst("a").attr("href"));+ assertEquals(1, document.select("a[href=/project/~wiki/main/Guide]").size());+ assertEquals("/target/raw/logo.png", document.selectFirst("img").attr("src"));+ assertTrue(document.select("a.add-missing").isEmpty());+ verify(target).getBlob(argThat(it -> "pinned".equals(it.revision) && "Missing.md".equals(it.path)), eq(false));+ verify(target, atLeastOnce()).getMode(eq("pinned"), anyString());+ }+ }+private static String url(String route, PageParameters params) {String path = java.util.stream.IntStream.range(0, params.getIndexedCount()).mapToObj(i -> params.get(i).toString()).collect(java.util.stream.Collectors.joining("/"));diff --git a/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.java b/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.javaindex 183c32846a..1482356fb0 100644--- a/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.java+++ b/server-core/src/test/java/io/onedev/server/web/util/WikiUtilsTest.java@@ -25,6 +25,20 @@ import io.onedev.server.security.permission.WriteCode;public class WikiUtilsTest {+ @Test+ public void resolvesOnlySubmodulesUnderConfiguredServerRoot() {+ assertEquals("team/wiki", WikiUtils.submoduleProjectPath("https://host/onedev", "team/app", "https://host/onedev/team/wiki"));+ assertEquals("team/wiki", WikiUtils.submoduleProjectPath("https://host/onedev/", "team/app", "../wiki"));+ assertEquals("team/wiki.git", WikiUtils.submoduleProjectPath("https://host", "team/app", "https://host/team/wiki.git"));+ for (String url : new String[] {"https://other/team/wiki", "https://host.evil/onedev/team/wiki",+ "https://host/onedev-other/wiki", "http://host/onedev/wiki", "ssh://host/onedev/wiki",+ "git@host:team/wiki", "//other/wiki", "../../../wiki", "https://host/onedev/../wiki",+ "https://host/onedev/wiki?query", null}) {+ assertEquals(null, WikiUtils.submoduleProjectPath("https://host/onedev", "team/app", url));+ }+ }++@Testpublic void insertsWikiReferencesRelativeToCurrentPage() {assertEquals("[[../Home|Home]]", WikiUtils.pageReference("wiki", "wiki/Guides/Page.md", "wiki/Home.md", null));