Commit 13555e04f090597ce528af657bf0da6eff0a9849
2019-09-28T12:26:47
Show only whitelisted commit headers in 'got log' Generic way to deal with gpgsig header or extra headers added by some tools. All headers still available via 'got cat' ok stsp@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
diff --git a/lib/object_parse.c b/lib/object_parse.c
old mode 100644
new mode 100640
index b6cd712..4066dbb
--- a/lib/object_parse.c
+++ b/lib/object_parse.c
@@ -419,16 +419,13 @@ got_object_commit_get_committer_gmtoff(struct got_commit_object *commit)
return commit->committer_gmtoff;
}
-#define GOT_GPG_BEGIN_STR "gpgsig -----BEGIN PGP SIGNATURE-----"
-#define GOT_GPG_END_STR " -----END PGP SIGNATURE-----"
-
const struct got_error *
got_object_commit_get_logmsg(char **logmsg, struct got_commit_object *commit)
{
const struct got_error *err = NULL;
- int gpgsig = 0;
char *msg0, *msg, *line, *s;
size_t len;
+ int headers = 1;
*logmsg = NULL;
@@ -436,32 +433,36 @@ got_object_commit_get_logmsg(char **logmsg, struct got_commit_object *commit)
if (msg0 == NULL)
return got_error_from_errno("strdup");
- /* Copy log message line by line to strip out GPG sigs... */
+ /* Copy log message line by line to strip out unusual headers... */
msg = msg0;
do {
- line = strsep(&msg, "\n");
-
- if (line) {
- /* Skip over GPG signatures. */
- if (gpgsig) {
- if (strcmp(line, GOT_GPG_END_STR) == 0) {
- gpgsig = 0;
- /* Skip empty line after sig. */
- line = strsep(&msg, "\n");
- }
- continue;
- } else if (strcmp(line, GOT_GPG_BEGIN_STR) == 0) {
- gpgsig = 1;
+ if ((line = strsep(&msg, "\n")) == NULL)
+ break;
+
+ if (headers == 1) {
+ if (line[0] != '\0' &&
+ strncmp(line, GOT_COMMIT_LABEL_TREE,
+ strlen(GOT_COMMIT_LABEL_TREE)) != 0 &&
+ strncmp(line, GOT_COMMIT_LABEL_AUTHOR,
+ strlen(GOT_COMMIT_LABEL_AUTHOR)) != 0 &&
+ strncmp(line, GOT_COMMIT_LABEL_PARENT,
+ strlen(GOT_COMMIT_LABEL_PARENT)) != 0 &&
+ strncmp(line, GOT_COMMIT_LABEL_COMMITTER,
+ strlen(GOT_COMMIT_LABEL_COMMITTER)) != 0)
continue;
- }
- if (asprintf(&s, "%s%s\n",
- *logmsg ? *logmsg : "", line) == -1) {
- err = got_error_from_errno("asprintf");
- goto done;
- }
- free(*logmsg);
- *logmsg = s;
+
+ if (line[0] == '\0')
+ headers = 0;
+ }
+
+ if (asprintf(&s, "%s%s\n",
+ *logmsg ? *logmsg : "", line) == -1) {
+ err = got_error_from_errno("asprintf");
+ goto done;
}
+ free(*logmsg);
+ *logmsg = s;
+
} while (line);
/* Trim redundant trailing whitespace. */