ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: fix problems with escaping

Browse source
This commit is contained in:
rr- 2017-01-21 00:12:28 +01:00
parent 1acceb941d
commit 6b42d787a7
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
INSTALL.md
View file

@ -159,13 +159,14 @@ the one in the `config.yaml`, so that client knows how to access the backend!
server { server {
listen 80; listen 80;
server_name great.dude; server_name great.dude;
merge_slashes off; # to support post tags such as ///
location ~ ^/api$ { location ~ ^/api$ {
return 302 /api/; return 302 /api/;
} }
location ~ ^/api/(.*)$ { location ~ ^/api/(.*)$ {
proxy_pass http://127.0.0.1:6666/$1$is_args$args; if ($request_uri ~* "/api/(.*)") { # preserve PATH_INFO as-is
proxy_pass http://127.0.0.1:6666/$1;
}
} }
location / { location / {
root /home/rr-/src/maintained/szurubooru/client/public; root /home/rr-/src/maintained/szurubooru/client/public;

4
client/js/util/uri.js
View file

@ -24,11 +24,11 @@ function formatApiLink(...values) {
} }
function escapeParam(text) { function escapeParam(text) {
return encodeURIComponent(text).replace(/%/g, '$'); return encodeURIComponent(text);
} }
function unescapeParam(text) { function unescapeParam(text) {
return decodeURIComponent(text.replace(/\$/g, '%')); return decodeURIComponent(text);
} }
function formatClientLink(...values) { function formatClientLink(...values) {

2
server/szurubooru/rest/app.py
View file

@ -31,7 +31,7 @@ def _get_headers(env):
def _create_context(env): def _create_context(env):
method = env['REQUEST_METHOD'] method = env['REQUEST_METHOD']
path = urllib.parse.unquote('/' + env['PATH_INFO'].lstrip('/')) path = '/' + env['PATH_INFO'].lstrip('/')
headers = _get_headers(env) headers = _get_headers(env)
files = {} files = {}