Commit 3b7fdcf48c9ddf50d5feb89c4d8f032039b7b838
2020-02-14T23:23:47
improve gw_blob querystring checking
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
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index ca4789a..47073da 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -390,8 +390,9 @@ done:
static const struct got_error *
gw_blob(struct gw_trans *gw_trans)
{
- const struct got_error *error = NULL;
+ const struct got_error *error = NULL, *err = NULL;
struct gw_header *header = NULL;
+ enum kcgi_err kerr = KCGI_OK;
if (pledge("stdio rpath wpath cpath proc exec sendfd unveil",
NULL) == -1)
@@ -404,13 +405,37 @@ gw_blob(struct gw_trans *gw_trans)
if (error)
goto done;
+ /* check querystring */
+ if (gw_trans->repo_file == NULL) {
+ error = got_error_msg(GOT_ERR_QUERYSTRING,
+ "file required in querystring");
+ goto done;
+ }
+ if (gw_trans->commit_id == NULL) {
+ error = got_error_msg(GOT_ERR_QUERYSTRING,
+ "commit required in querystring");
+ goto done;
+ }
error = gw_get_header(gw_trans, header, 1);
if (error)
goto done;
error = gw_output_blob_buf(gw_trans);
done:
+
+ if (error) {
+ gw_trans->mime = KMIME_TEXT_PLAIN;
+ err = gw_display_index(gw_trans);
+ if (err) {
+ error = err;
+ goto errored;
+ }
+ kerr = khttp_puts(gw_trans->gw_req, error->msg);
+ }
+errored:
gw_free_header(header);
+ if (error == NULL && kerr != KCGI_OK)
+ error = gw_kcgi_error(kerr);
return error;
}
@@ -3548,7 +3573,6 @@ gw_output_blob_buf(struct gw_trans *gw_trans)
const uint8_t *buf;
enum kcgi_err kerr = KCGI_OK;
- /* XXX repo_file could be NULL if not present in querystring */
if (asprintf(&path, "%s%s%s",
gw_trans->repo_folder ? gw_trans->repo_folder : "",
gw_trans->repo_folder ? "/" : "",
@@ -3611,7 +3635,7 @@ gw_output_blob_buf(struct gw_trans *gw_trans)
if (error)
goto done;
}
- khttp_write(gw_trans->gw_req, buf, len - hdrlen);
+ kerr = khttp_write(gw_trans->gw_req, buf, len - hdrlen);
hdrlen = 0;
} while (len != 0);
done: