commit - 150487bcf0472263c8149811f1c26e0353e13da7ce2740e3f5f7ee28f870d849
commit + 1aa169e576cf86f8693b9d47b513d4f3c75cb94b697bc0e2f570bc98e3c66fb7
blob - ebeadd92c0ea7e383c8ec940b4964716401e23dba58f1b41d7bdca6d7834d1b4
blob + c7bf114be08d24f4fa08bf391df07ffe425699bac0b116a62f0f0d6e18419f86
--- gotwebd/fcgi.c
+++ gotwebd/fcgi.c
}
static const struct got_error *
+validate_path(const char *path)
+{
+ size_t len = strlen(path);
+
+ if (len >= 3 && strncmp(path, "../", 3) == 0)
+ return got_error(GOT_ERR_BAD_QUERYSTRING);
+
+ if (len >= 4 && strstr(path, "/../") != NULL)
+ return got_error(GOT_ERR_BAD_QUERYSTRING);
+
+ if (len >= 3 && strcmp(path + len - 3, "/..") == 0)
+ return got_error(GOT_ERR_BAD_QUERYSTRING);
+
+ return NULL;
+
+}
+
+static const struct got_error *
assign_querystring(struct querystring *qs, char *key, char *value)
{
const struct got_error *error = NULL;
}
break;
case RFILE:
+ error = validate_path(value);
+ if (error)
+ goto done;
if (strlcpy(qs->file, value, sizeof(qs->file)) >=
sizeof(qs->file)) {
error = got_error_msg(GOT_ERR_NO_SPACE,
}
break;
case FOLDER:
+ error = validate_path(value);
+ if (error)
+ goto done;
if (strlcpy(qs->folder, value[0] ? value : "/",
sizeof(qs->folder)) >= sizeof(qs->folder)) {
error = got_error_msg(GOT_ERR_NO_SPACE,
}
break;
case HEADREF:
+ error = validate_path(value);
+ if (error)
+ goto done;
if (strlcpy(qs->headref, value, sizeof(qs->headref)) >=
sizeof(qs->headref)) {
error = got_error_msg(GOT_ERR_NO_SPACE,
}
break;
case PATH:
+ error = validate_path(value);
+ if (error)
+ goto done;
if (strlcpy(qs->path, value, sizeof(qs->path)) >=
sizeof(qs->path)) {
error = got_error_msg(GOT_ERR_NO_SPACE,
blob - 7669b8ab44fb30a849679eb63a369b7515fee51bcc703d68f99a6a93e0e11310
blob + 5817e35016c8a1bab3dfc9aa8d31e6edb298e85417ae456b82d44ae5b5f51b36
--- gotwebd/gotweb.c
+++ gotwebd/gotweb.c
return gotweb_render_url(c, url);
}
+/*
+ * Ensure that a path sent in the request will not escape from the given
+ * parent directory. This matters for got-portable where we are not
+ * necessarily running in chroot and cannot be protected by unveil(2).
+ */
static const struct got_error *
+validate_path(const char *path, const char *parent_path,
+ const char *orig_path)
+{
+ const struct got_error *error = NULL;
+ char *abspath;
+
+ abspath = realpath(path, NULL);
+ if (abspath == NULL) {
+ /* Paths which cannot be resolved are safe. */
+ if (errno == ENOENT || errno == EACCES || errno == ENOTDIR)
+ return NULL;
+ return got_error_from_errno("realpath");
+ }
+
+ if (!got_path_is_child(abspath, parent_path, strlen(parent_path)))
+ error = got_error_path(orig_path, GOT_ERR_NOT_GIT_REPO);
+
+ free(abspath);
+ return error;
+}
+
+static const struct got_error *
gotweb_load_got_path(struct repo_dir **rp, const char *dir,
struct request *c)
{
GOTWEB_GIT_DIR) == -1)
return got_error_from_errno("asprintf");
+ error = validate_path(dir_test, srv->repos_path, dir);
+ if (error) {
+ free(dir_test);
+ return error;
+ }
+
dt = opendir(dir_test);
if (dt == NULL) {
free(dir_test);