Merge branch 'master' into portal-latest

This commit is contained in:
Matthew Sevey 2022-02-09 12:20:55 -05:00
commit 76dec235fc
No known key found for this signature in database
GPG Key ID: 9ADDD344F13057F6
2 changed files with 7 additions and 1 deletions

View File

@ -0,0 +1 @@
- fixed a bug when accessing file from skylink via subdomain with a filename that had escaped characters

View File

@ -6,7 +6,12 @@ include /etc/nginx/conf.d/include/init-optional-variables;
location / {
set_by_lua_block $skylink { return string.match(ngx.var.host, "%w+") }
set $path $uri;
set_by_lua_block $path {
-- strip ngx.var.request_uri from query params - this is basically the same as ngx.var.uri but
-- do not use ngx.var.uri because it will already be unescaped and we need to use escaped path
-- examples: escaped uri "/b%20r56+7" and unescaped uri "/b r56 7"
return string.gsub(ngx.var.request_uri, "?.*", "")
}
include /etc/nginx/conf.d/include/location-skylink;
}