mirrors
/
gitblit
зеркало из https://github.com/gitblit/gitblit.git
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Релизы 43 Вики Активность
Просмотр исходного кода

raw: Strip leading and trailing slash from repo and path names for link 

When creating a link for raw display, a trailing slash is stripped from
the end of the base URL. Also do this for the repository, as well as
stripping leading slashes from the repository and the path values.
tags/v1.9.2
Florian Zschocke 3 лет назад
Родитель
a02159e637
Сommit
dd56cd8571
3 измененных файлов: 696 добавлений и 0 удалений
Разделённый вид Показать статистику Diff
  1. 9
    0
      src/main/java/com/gitblit/servlet/RawServlet.java
  2. 675
    0
      src/test/java/com/gitblit/servlet/RawServletTest.java
  3. 12
    0
      src/test/java/com/gitblit/tests/mock/MockGitblitContext.java

+ 9
- 0
src/main/java/com/gitblit/servlet/RawServlet.java Просмотреть файл

@@ -99,6 +99,12 @@ public class RawServlet extends HttpServlet {
if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') {
baseURL = baseURL.substring(0, baseURL.length() - 1);
}
if (repository.length() > 0 && repository.charAt(repository.length() - 1) == '/') {
repository = repository.substring(0, repository.length() - 1);
}
if (repository.length() > 0 && repository.charAt(0) == '/') {
repository = repository.substring(1);
}

char fsc = '!';
char c = GitblitContext.getManager(IRuntimeManager.class).getSettings().getChar(Keys.web.forwardSlashCharacter, '/');
@@ -109,6 +115,9 @@ public class RawServlet extends HttpServlet {
branch = Repository.shortenRefName(branch).replace('/', fsc);
}

if (path != null && path.length() > 0 && path.charAt(0) == '/') {
path = path.substring(1);
}
String encodedPath = path == null ? "" : path.replace('/', fsc);
return baseURL + Constants.RAW_PATH + repository + "/" + (branch == null ? "" : (branch + "/" + encodedPath));
}

+ 675
- 0
src/test/java/com/gitblit/servlet/RawServletTest.java Просмотреть файл

@@ -0,0 +1,675 @@
package com.gitblit.servlet;

import com.gitblit.Constants;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.tests.mock.MockGitblitContext;
import com.gitblit.tests.mock.MockRuntimeManager;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;


import static org.junit.Assert.*;

public class RawServletTest
{
private final static String FSC = "!";

private static IStoredSettings settings;


@BeforeClass
public static void init()
{
MockGitblitContext gitblitContext = new MockGitblitContext();
MockRuntimeManager mockRuntimeManager = new MockRuntimeManager();
gitblitContext.addManager(mockRuntimeManager);
settings = mockRuntimeManager.getSettings();
}

@Before
public void setUp()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, "/");
}



@Test
public void asLink_HttpUrlRepo()
{
String baseUrl = "http://localhost";
String repository = "test.git";
String branch = null;
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/", link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepo()
{
String baseUrl = "http://localhost/";
String repository = "test.git";
String branch = null;
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository + "/", link);
}

@Test
public void asLink_HttpUrlRepoLeadingSlash()
{
String baseUrl = "http://localhost";
String repository = "/test.git";
String branch = null;
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository.substring(1) + "/", link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoLeadingSlash()
{
String baseUrl = "http://localhost/";
String repository = "/test.git";
String branch = null;
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository.substring(1) + "/", link);
}

@Test
public void asLink_HttpUrlRepoBranch()
{
String baseUrl = "http://localhost";
String repository = "test.git";
String branch = "b52";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/" + branch + "/", link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoBranch()
{
String baseUrl = "http://localhost/";
String repository = "test.git";
String branch = "branch";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository + "/" + branch + "/", link);
}

@Test
public void asLink_HttpUrlRepoLeadingSlashBranch()
{
String baseUrl = "http://localhost";
String repository = "/test.git";
String branch = "featureOne";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository.substring(1) + "/" + branch + "/", link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoLeadingSlashBranch()
{
String baseUrl = "http://localhost/";
String repository = "/test.git";
String branch = "b";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository.substring(1) + "/" + branch + "/", link);
}


@Test
public void asLink_HttpUrlRepoBranchWithSlash()
{
String baseUrl = "http://localhost";
String repository = "test.git";
String branch = "feature/whatever";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/" + branch.replaceAll("/", FSC) + "/", link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoBranchWithSlash()
{
String baseUrl = "http://localhost/";
String repository = "test.git";
String branch = "branch/for/issue/16";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", FSC) + "/", link);
}

@Test
public void asLink_HttpUrlRepoLeadingSlashBranchWithSlash()
{
String baseUrl = "http://localhost";
String repository = "/test.git";
String branch = "releases/1.2.3";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository.substring(1) + "/"
+ branch.replaceAll("/", FSC) + "/", link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoLeadingSlashBranchWithSlash()
{
String baseUrl = "http://localhost/";
String repository = "/test.git";
String branch = "b/52";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository.substring(1) + "/"
+ branch.replaceAll("/", FSC) + "/", link);
}


@Test
public void asLink_HttpUrlRepoBranchPathFile()
{
String baseUrl = "http://localhost";
String repository = "test.git";
String branch = "b52";
String path = "file.txt";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/" + branch + "/" + path, link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoBranchPathFolderFile()
{
String baseUrl = "http://localhost/";
String repository = "test.git";
String branch = "branch";
String path = "path/to/file.png";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository + "/"
+ branch + "/" + path.replaceAll("/", FSC), link);
}

@Test
public void asLink_HttpUrlRepoLeadingSlashBranchPathFolderLeadingSlash()
{
String baseUrl = "http://localhost";
String repository = "/test.git";
String branch = "featureOne";
String path = "/folder";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository.substring(1) + "/" + branch + path, link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoLeadingSlashBranchSubFolder()
{
String baseUrl = "http://localhost/";
String repository = "/test.git";
String branch = "b";
String path = "sub/folder";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository.substring(1) + "/"
+ branch + "/" + path.replaceAll("/", FSC), link);
}


@Test
public void asLink_HttpUrlRepoBranchWithSlashPathFolder()
{
String baseUrl = "http://localhost";
String repository = "test.git";
String branch = "feature/whatever";
String path = "folder";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", FSC) + "/" + path, link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoBranchWithSlashPathFolderFile()
{
String baseUrl = "http://localhost/";
String repository = "test.git";
String branch = "branch/for/issue/16";
String path = "a/file.gif";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", FSC) + "/" + path.replaceAll("/", FSC), link);
}

@Test
public void asLink_HttpUrlRepoLeadingSlashBranchWithSlashPathFile()
{
String baseUrl = "http://localhost";
String repository = "/test.git";
String branch = "releases/1.2.3";
String path = "hurray.png";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository.substring(1) + "/"
+ branch.replaceAll("/", FSC) + "/" + path, link);
}

@Test
public void asLink_HttpUrlTrailingSlashRepoLeadingSlashBranchWithSlashPathFolderFile()
{
String baseUrl = "http://localhost/";
String repository = "/test.git";
String branch = "b/52";
String path = "go/to/f.k";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl.substring(0, baseUrl.length()-1) + Constants.RAW_PATH + repository.substring(1) + "/"
+ branch.replaceAll("/", FSC) + "/" + path.replaceAll("/", FSC), link);
}

@Test
public void asLink_HttpUrlRepoInFolder()
{
String baseUrl = "http://localhost";
String repository = "project/repo.git";
String branch = null;
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/", link);
}

@Test
public void asLink_HttpUrlRepoInSubFolder()
{
String baseUrl = "http://localhost";
String repository = "some/project/repo.git";
String branch = null;
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/", link);
}

@Test
public void asLink_HttpUrlRepoInSubFolderBranch()
{
String baseUrl = "http://localhost";
String repository = "some/project/repo.git";
String branch = "laluna";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/", link);
}

@Test
public void asLink_HttpUrlRepoInSubFolderBranchWithSlash()
{
String baseUrl = "http://localhost";
String repository = "some/project/repo.git";
String branch = "la/le/lu";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", FSC) + "/", link);
}

@Test
public void asLink_HttpUrlRepoInSubFolderBranchPathFile()
{
String baseUrl = "http://localhost";
String repository = "some/project/repo.git";
String branch = "laluna";
String path = "elrtkx.fg";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/" + path, link);
}

@Test
public void asLink_HttpUrlRepoInSubFolderLeadingSlashBranchWithSlashPathFolderFile()
{
String baseUrl = "http://localhost";
String repository = "/some/project/repo.git";
String branch = "la/le/lu";
String path = "doremi/fa/SOLA/di.mp3";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository.substring(1) + "/"
+ branch.replaceAll("/", FSC) + "/" + path.replaceAll("/", FSC), link);
}

@Test
public void asLink_HttpUrlRepoPathFolderFile()
{
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = null;
String path = "doko/di.mp3";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/", link);
}

@Test
public void asLink_HttpUrlRepoTrailingSlashPathFileLeadingSlash()
{
String baseUrl = "http://localhost";
String repository = "repo.git/";
String branch = null;
String path = "/di.mp3";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository, link);
}

@Test
public void asLink_HttpUrlRepoBranchPathFileLeadingSlash()
{
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "bee";
String path = "/bop.mp3";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + path, link);
}

@Test
public void asLink_HttpUrlRepoBranchPathFolderLeadingSlashTrailingSlash()
{
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "bee";
String path = "/bam/";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/bam" + FSC, link);
}

@Test
public void asLink_HttpUrlRepoBranchPathSubFolderLeadingSlashTrailingSlash()
{
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "bee";
String path = "/bapedi/boo/";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/" + "bapedi" + FSC + "boo" + FSC, link);
}

@Test
public void asLink_HttpUrlRepoCommitId()
{
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "c7eef37bfe5ae246cdf5ca5c502e4b5471290cb1";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/" , link);
}

@Test
public void asLink_HttpUrlRepoCommitIdPathFile()
{
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "c7eef37bfe5ae246cdf5ca5c502e4b5471290cb1";
String path = "file";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/" + path, link);
}

@Test
public void asLink_HttpUrlRepoCommitIdPathFolderFileFile()
{
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "c7eef37bfe5ae246cdf5ca5c502e4b5471290cb1";
String path = "file/in/folder";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/" + path.replaceAll("/", FSC), link);
}

@Test
public void asLink_HttpUrlRepoBranchWithSlash_differentFsc()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, "|");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "some/feature";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", "|") + "/", link);
}

@Test
public void asLink_HttpUrlRepoBranchWithSlashPathFolderFile_differentFsc()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, ";");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "some/feature";
String path = "file/in/folder";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", ";") + "/" + path.replaceAll("/", ";"), link);
}

@Test
public void asLink_HttpUrlRepoBranchWithSlash_explicitFscSameAsDefault()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, "!");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "some/feature";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", "!") + "/", link);
}

@Test
public void asLink_HttpUrlRepoBranchWithSlashPathFolderFile_explicitFscSameAsDefault()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, "!");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "some/feature";
String path = "file/in/folder";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", "!") + "/" + path.replaceAll("/", "!"), link);
}

@Test
public void asLink_HttpUrlRepoBranchWithDefaultFsc_differentFsc()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, ":");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "important" + FSC + "feature";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch + "/", link);
}

@Test
public void asLink_HttpUrlRepoBranchWithSlashPathFileWithDefaultFsc_differentFsc()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, "|");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "some/feature";
String path = "large" + FSC + "file";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", "|") + "/" + path, link);
}

@Test
public void asLink_HttpUrlRepoBranchWithDefaultFscAndSlash_differentFsc()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, ":");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "hotf" + FSC + "x/issue/1234";
String path = null;

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", ":") + "/", link);
}

@Test
public void asLink_HttpUrlRepoBranchWithDefaultFscAndSlashPathFolderFileWithDefaultFsc_differentFsc()
{
settings.overrideSetting(Keys.web.forwardSlashCharacter, "|");
String baseUrl = "http://localhost";
String repository = "repo.git";
String branch = "some/feature" + FSC + "in/here";
String path = "large" + FSC + "stuff/folder/file" + FSC + "16";

String link = RawServlet.asLink(baseUrl, repository, branch, path);

assertNotNull(link);
assertEquals(baseUrl + Constants.RAW_PATH + repository + "/"
+ branch.replaceAll("/", "|") + "/" + path.replaceAll("/", "|"), link);
}


@Test
public void getBranch()
{
}

@Test
public void getPath()
{
}
}

+ 12
- 0
src/test/java/com/gitblit/tests/mock/MockGitblitContext.java Просмотреть файл

@@ -0,0 +1,12 @@
package com.gitblit.tests.mock;

import com.gitblit.manager.IManager;
import com.gitblit.servlet.GitblitContext;

public class MockGitblitContext extends GitblitContext
{
public <X extends IManager> void addManager(X x)
{
startManager(x);
}
}

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить