motiejus
/
jgit
1
Fork 0
Code Releases Activity

Strip "<", ">", and "\n" from name/email in UserConfig 

This matches what C Git does, see "stripped" in `man git-commit-tree`.

It also fixes the bug of the user where an user.email like "<>" would
show up as "<<>>" in EGit.

Bug: 439844
Change-Id: I567a3c620e191ce9d37d318417e63cb5d4483419
Signed-off-by: Robin Stocker <robin@nibor.org>
This commit is contained in:
Robin Stocker 2014-08-21 23:10:55 +10:00
parent 30953bbb67
commit ce312d8afb
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java
View File

@ -213,6 +213,20 @@ public void test007_readUserConfig() {
assertFalse(localConfig.get(UserConfig.KEY).isCommitterEmailImplicit());
}
@Test
public void testReadUserConfigWithInvalidCharactersStripped() {
final MockSystemReader mockSystemReader = new MockSystemReader();
final Config localConfig = new Config(mockSystemReader.openUserConfig(
null, FS.DETECTED));
localConfig.setString("user", null, "name", "foo<bar");
localConfig.setString("user", null, "email", "baz>\nqux@example.com");
UserConfig userConfig = localConfig.get(UserConfig.KEY);
assertEquals("foobar", userConfig.getAuthorName());
assertEquals("bazqux@example.com", userConfig.getAuthorEmail());
}
@Test
public void testReadBoolean_TrueFalse1() throws ConfigInvalidException {
final Config c = parse("[s]\na = true\nb = false\n");

8
org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java
View File

@ -180,7 +180,7 @@ private static String getNameInternal(Config rc, String envKey) {
username = system().getenv(envKey);
}
return username;
return stripInvalidCharacters(username);
}
/**
@ -204,7 +204,11 @@ private static String getEmailInternal(Config rc, String envKey) {
email = system().getenv(envKey);
}
return email;
return stripInvalidCharacters(email);
}
private static String stripInvalidCharacters(String s) {
return s == null ? null : s.replaceAll("<|>|\n", ""); //$NON-NLS-1$//$NON-NLS-2$
}
/**