motiejus
/
jgit
1
Fork 0
Code Releases Activity

Fix URIish parsing of absolute scp-style URIs 

We stopped handling URIs such as "example.com:/some/p ath", because
this was confused with the Windows absolute path syntax of "c:/path".
Support absolute style scp URIs again, but only when the host name
is more than 2 characters long.

Change-Id: I9ab049bc9aad2d8d42a78c7ab34fa317a28efc1a
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-11-09 14:36:01 -08:00
parent b087bba3bd
commit 6af7e4d91a
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java
View File

@ -172,7 +172,7 @@ public void testGitProtoWindows() throws Exception {
assertEquals(u, new URIish(str));
}
public void testScpStyleWithoutUser() throws Exception {
public void testScpStyleWithoutUserRelativePath() throws Exception {
final String str = "example.com:some/p ath";
URIish u = new URIish(str);
assertNull(u.getScheme());
@ -184,6 +184,18 @@ public void testScpStyleWithoutUser() throws Exception {
assertEquals(u, new URIish(str));
}
public void testScpStyleWithoutUserAbsolutePath() throws Exception {
final String str = "example.com:/some/p ath";
URIish u = new URIish(str);
assertNull(u.getScheme());
assertTrue(u.isRemote());
assertEquals("/some/p ath", u.getPath());
assertEquals("example.com", u.getHost());
assertEquals(-1, u.getPort());
assertEquals(str, u.toString());
assertEquals(u, new URIish(str));
}
public void testScpStyleWithUser() throws Exception {
final String str = "user@example.com:some/p ath";
URIish u = new URIish(str);

32
org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java
View File

@ -155,7 +155,7 @@ public class URIish implements Serializable {
/**
* A pattern matching a SCP URI's of the form user@host:path/to/repo.git
*/
private static final Pattern SCP_URI = Pattern.compile("^" //
private static final Pattern RELATIVE_SCP_URI = Pattern.compile("^" //
+ OPT_USER_PWD_P //
+ HOST_P //
+ ":(" //
@ -163,6 +163,16 @@ public class URIish implements Serializable {
+ RELATIVE_PATH_P //
+ ")$");
/**
* A pattern matching a SCP URI's of the form user@host:/path/to/repo.git
*/
private static final Pattern ABSOLUTE_SCP_URI = Pattern.compile("^" //
+ OPT_USER_PWD_P //
+ "([^/:]{2,})" //
+ ":(" //
+ "/" + RELATIVE_PATH_P //
+ ")$");
private String scheme;
private String path;
@ -200,19 +210,27 @@ public URIish(String s) throws URISyntaxException {
n2e(matcher.group(6)) + n2e(matcher.group(7)),
scheme);
} else {
matcher = SCP_URI.matcher(s);
matcher = RELATIVE_SCP_URI.matcher(s);
if (matcher.matches()) {
user = matcher.group(1);
pass = matcher.group(2);
host = matcher.group(3);
path = matcher.group(4);
} else {
matcher = LOCAL_FILE.matcher(s);
matcher = ABSOLUTE_SCP_URI.matcher(s);
if (matcher.matches()) {
path = matcher.group(1);
} else
throw new URISyntaxException(s,
JGitText.get().cannotParseGitURIish);
user = matcher.group(1);
pass = matcher.group(2);
host = matcher.group(3);
path = matcher.group(4);
} else {
matcher = LOCAL_FILE.matcher(s);
if (matcher.matches()) {
path = matcher.group(1);
} else
throw new URISyntaxException(s,
JGitText.get().cannotParseGitURIish);
}
}
}
}