seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #351 from eclipse-che/che-21635 

fix: Allow to get files from git repository if file name starts with dot
pull/354/head
Vitaliy Gulyy 2022-09-09 19:26:55 +03:00 committed by GitHub
parent 77926d847d feb63108be
commit 7c7b9ef52e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerAuthorizingFileContentProviderTest.java
View File

@ -112,7 +112,6 @@ public class BitbucketServerAuthorizingFileContentProviderTest {
public static Object[][] relativePathsProvider() {
return new Object[][] {
{"./file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
{"../file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
{"/file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
{"file.txt", "https://foo.bar/rest/api/1.0/projects/proj/repos/repo/raw/file.txt", null},
{

8
wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/AuthorizingFileContentProvider.java
View File

@ -139,14 +139,16 @@ public class AuthorizingFileContentProvider<T extends RemoteFactoryUrl>
return false;
}
private String formatUrl(String fileURL) throws DevfileException {
protected String formatUrl(String fileURL) throws DevfileException {
String requestURL;
try {
if (new URI(fileURL).isAbsolute()) {
requestURL = fileURL;
} else {
// since files retrieved via REST, we cannot use path symbols like . ./ so cut them off
requestURL = remoteFactoryUrl.rawFileLocation(fileURL.replaceAll("^[/.]+", ""));
// since files retrieved via REST, we cannot use path like '.' or one that starts with './'
// so cut them off
requestURL =
remoteFactoryUrl.rawFileLocation(fileURL.replaceAll("^(?:\\.?\\/)|(?:\\.$)", ""));
}
} catch (URISyntaxException e) {
throw new DevfileException(e.getMessage(), e);

21
wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/scm/AuthorizingFactoryParameterResolverTest.java
View File

@ -11,11 +11,13 @@
*/
package org.eclipse.che.api.factory.server.scm;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
import org.eclipse.che.api.workspace.server.devfile.URLFetcher;
@ -34,20 +36,20 @@ public class AuthorizingFactoryParameterResolverTest {
@Mock private GitCredentialManager gitCredentialManager;
@Mock private PersonalAccessToken personalAccessToken;
private AuthorizingFileContentProvider provider;
private AuthorizingFileContentProvider<?> provider;
@BeforeMethod
public void setUp() throws Exception {
provider =
new AuthorizingFileContentProvider(
new AuthorizingFileContentProvider<>(
remoteFactoryUrl, urlFetcher, personalAccessTokenManager, gitCredentialManager);
when(remoteFactoryUrl.getHostName()).thenReturn("hostName");
when(remoteFactoryUrl.rawFileLocation(anyString())).thenReturn("rawFileLocation");
when(remoteFactoryUrl.rawFileLocation(anyString())).thenAnswer(returnsFirstArg());
}
@Test
public void shouldFetchContentWithAuthentication() throws Exception {
// given
when(remoteFactoryUrl.getHostName()).thenReturn("hostName");
when(urlFetcher.fetch(anyString(), anyString())).thenReturn("content");
when(personalAccessTokenManager.fetchAndSave(any(Subject.class), anyString()))
.thenReturn(personalAccessToken);
@ -62,6 +64,7 @@ public class AuthorizingFactoryParameterResolverTest {
@Test
public void shouldFetchContentWithoutAuthentication() throws Exception {
// given
when(remoteFactoryUrl.getHostName()).thenReturn("hostName");
when(urlFetcher.fetch(anyString())).thenReturn("content");
// when
@ -70,4 +73,14 @@ public class AuthorizingFactoryParameterResolverTest {
// then
verify(personalAccessTokenManager, never()).fetchAndSave(any(Subject.class), anyString());
}
@Test
public void shouldOmitDotInTheResourceName() throws Exception {
assertEquals(provider.formatUrl("./pom.xml"), "pom.xml");
}
@Test
public void shouldKeepResourceNameUnchanged() throws Exception {
assertEquals(provider.formatUrl(".gitconfig"), ".gitconfig");
}
}