@matheusbsbs / matheus-bagliano / commits / 9a6bbee800
Fork 0

credential: avoid writing values with newlines

The credential protocol that we use to speak to helpers can't represent values with newlines in them. This was an intentional design choice to keep the protocol simple, since none of the values we pass should generally have newlines. However, if we _do_ encounter a newline in a value, we blindly transmit it in credential_write(). Such values may break the protocol syntax, or worse, inject new valid lines into the protocol stream. The most likely way for a newline to end up in a credential struct is by decoding a URL with a percent-encoded newline. However, since the bug occurs at the moment we write the value to the protocol, we'll catch it there. That should leave no possibility of accidentally missing a code path that can trigger the problem. At this level of the code we have little choice but to die(). However, since we'd not ever expect to see this case outside of a malicious URL, that's an acceptable outcome. Reported-by: Felix Wilhelm <fwilhelm@google.com>

Jeff King committed Mar 11, 2020 at 17:53 UTC 9a6bbee8006c24b46a85d29e7b38cfa79e9ab21b
2 files changed +8
credential.c
+2
@@ -194,6 +194,8 @@ static void credential_write_item(FILE *fp, const char *key, const char *value)
194 {
195 if (!value)
196 return;
197 + if (strchr(value, '\n'))
198 + die("credential value for %s contains newline", key);
199 fprintf(fp, "%s=%s\n", key, value);
200 }
201
t/t0300-credentials.sh
+6
@@ -309,4 +309,10 @@ test_expect_success 'empty helper spec resets helper list' '
309 EOF
310 '
311
312 +test_expect_success 'url parser rejects embedded newlines' '
313 + test_must_fail git credential fill <<-\EOF
314 + url=https://one.example.com?%0ahost=two.example.com/
315 + EOF
316 +'
317 +
318 test_done