While our ETag patch works pretty fine if it comes to serving data off store paths, it unfortunately broke something that might be a bit more common, namely when using regexes to extract path components of location directives for example. Recently, @devhell has reported a bug with a nginx location directive like this: location ~^/\~([a-z0-9_]+)(/.*)?$" { alias /home/$1/public_html$2; } While this might look harmless at first glance, it does however cause issues with our ETag patch. The alias directive gets broken up by nginx like this: *2 http script copy: "/home/" *2 http script capture: "foo" *2 http script copy: "/public_html/" *2 http script capture: "bar.txt" In our patch however, we use realpath(3) to get the canonicalised path from ngx_http_core_loc_conf_s.root, which returns the *configured* value from the root or alias directive. So in the example above, realpath(3) boils down to the following syscalls: lstat("/home", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0 lstat("/home/$1", 0x7ffd08da6f60) = -1 ENOENT (No such file or directory) During my review[1] of the initial patch, I didn't actually notice that what we're doing here is returning NGX_ERROR if the realpath(3) call fails, which in turn causes an HTTP 500 error. Since our patch actually made the canonicalisation (and thus additional syscalls) necessary, we really shouldn't introduce an additional error so let's - at least for now - silently skip return value if realpath(3) has failed. However since we're using the unaltered root from the config we have another issue, consider this root: /nix/store/...-abcde/$1 Calling realpath(3) on this path will fail (except if there's a file called "$1" of course), so even this fix is not enough because it results in the ETag not being set to the store path hash. While this is very ugly and we should fix this very soon, it's not as serious as getting HTTP 500 errors for serving static files. I added a small NixOS VM test, which uses the example above as a regression test. It seems that my memory is failing these days, since apparently I *knew* about this issue since digging for existing issues in nixpkgs, I found this similar pull request which I even reviewed: https://github.com/NixOS/nixpkgs/pull/66532 However, since the comments weren't addressed and the author hasn't responded to the pull request, I decided to keep this very commit and do a follow-up pull request. [1]: https://github.com/NixOS/nixpkgs/pull/48337 Signed-off-by: aszlig <aszlig@nix.build> Reported-by: @devhell Acked-by: @7c6f434c Acked-by: @yorickvP Merges: https://github.com/NixOS/nixpkgs/pull/80671 Fixes: https://github.com/NixOS/nixpkgs/pull/66532
86 lines
2.7 KiB
Diff
86 lines
2.7 KiB
Diff
This patch makes it possible to serve static content from Nix store paths, by
|
|
using the hash of the store path for the ETag header.
|
|
|
|
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
|
|
index cb49ef74..7b456993 100644
|
|
--- a/src/http/ngx_http_core_module.c
|
|
+++ b/src/http/ngx_http_core_module.c
|
|
@@ -1583,6 +1583,8 @@ ngx_http_set_etag(ngx_http_request_t *r)
|
|
{
|
|
ngx_table_elt_t *etag;
|
|
ngx_http_core_loc_conf_t *clcf;
|
|
+ u_char *real, *ptr1, *ptr2;
|
|
+ ngx_err_t err;
|
|
|
|
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
|
|
|
|
@@ -1598,16 +1600,60 @@ ngx_http_set_etag(ngx_http_request_t *r)
|
|
etag->hash = 1;
|
|
ngx_str_set(&etag->key, "ETag");
|
|
|
|
- etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
|
|
- if (etag->value.data == NULL) {
|
|
- etag->hash = 0;
|
|
- return NGX_ERROR;
|
|
+ err = ngx_errno;
|
|
+ real = ngx_realpath(clcf->root.data, NULL);
|
|
+ ngx_set_errno(err);
|
|
+
|
|
+ #define NIX_STORE_DIR "@nixStoreDir@"
|
|
+ #define NIX_STORE_LEN @nixStoreDirLen@
|
|
+
|
|
+ if (r->headers_out.last_modified_time == 1
|
|
+ && real != NULL
|
|
+ && !ngx_strncmp(real, NIX_STORE_DIR, NIX_STORE_LEN)
|
|
+ && real[NIX_STORE_LEN] == '/'
|
|
+ && real[NIX_STORE_LEN + 1] != '\0')
|
|
+ {
|
|
+ ptr1 = real + NIX_STORE_LEN;
|
|
+ *ptr1 = '"';
|
|
+
|
|
+ ptr2 = (u_char *) ngx_strchr(ptr1, '-');
|
|
+
|
|
+ if (ptr2 == NULL) {
|
|
+ ngx_free(real);
|
|
+ etag->hash = 0;
|
|
+ return NGX_ERROR;
|
|
+ }
|
|
+
|
|
+ *ptr2++ = '"';
|
|
+ *ptr2 = '\0';
|
|
+
|
|
+ etag->value.len = ngx_strlen(ptr1);
|
|
+ etag->value.data = ngx_pnalloc(r->pool, etag->value.len);
|
|
+
|
|
+ if (etag->value.data == NULL) {
|
|
+ ngx_free(real);
|
|
+ etag->hash = 0;
|
|
+ return NGX_ERROR;
|
|
+ }
|
|
+
|
|
+ ngx_memcpy(etag->value.data, ptr1, etag->value.len);
|
|
+ ngx_http_clear_last_modified(r);
|
|
+ } else {
|
|
+ etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
|
|
+
|
|
+ if (etag->value.data == NULL) {
|
|
+ ngx_free(real);
|
|
+ etag->hash = 0;
|
|
+ return NGX_ERROR;
|
|
+ }
|
|
+
|
|
+ etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
|
|
+ r->headers_out.last_modified_time,
|
|
+ r->headers_out.content_length_n)
|
|
+ - etag->value.data;
|
|
}
|
|
|
|
- etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
|
|
- r->headers_out.last_modified_time,
|
|
- r->headers_out.content_length_n)
|
|
- - etag->value.data;
|
|
+ ngx_free(real);
|
|
|
|
r->headers_out.etag = etag;
|
|
|