Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-16 00:00:07 +01:00
Code Issues Releases Wiki Activity

uridecoding disallow uriencoded equals in name part

Browse source 
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2016-01-20 09:37:08 +08:00
parent 466ad50d6a
commit 7070968f94
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/parsers.c
View file

@ -334,11 +334,20 @@ int lws_parse(struct lws *wsi, unsigned char c)
if (ah->nfrag >= ARRAY_SIZE(ah->frags)) if (ah->nfrag >= ARRAY_SIZE(ah->frags))
goto excessive; goto excessive;
/* start next fragment after the & */ /* start next fragment after the & */
wsi->u.hdr.post_literal_equal = 0;
ah->frags[ah->nfrag].offset = ah->pos; ah->frags[ah->nfrag].offset = ah->pos;
ah->frags[ah->nfrag].len = 0; ah->frags[ah->nfrag].len = 0;
ah->frags[ah->nfrag].nfrag = 0; ah->frags[ah->nfrag].nfrag = 0;
goto swallow; goto swallow;
} }
/* uriencoded = in the name part, disallow */
if (c == '=' && enc && !wsi->u.hdr.post_literal_equal)
c = '_';
/* after the real =, we don't care how many = */
if (c == '=' && !enc)
wsi->u.hdr.post_literal_equal = 1;
/* + to space */ /* + to space */
if (c == '+' && !enc) if (c == '+' && !enc)
c = ' '; c = ' ';
@ -413,6 +422,7 @@ int lws_parse(struct lws *wsi, unsigned char c)
ah->frags[ah->nfrag].len = 0; ah->frags[ah->nfrag].len = 0;
ah->frags[ah->nfrag].nfrag = 0; ah->frags[ah->nfrag].nfrag = 0;
wsi->u.hdr.post_literal_equal = 0;
ah->frag_index[WSI_TOKEN_HTTP_URI_ARGS] = ah->nfrag; ah->frag_index[WSI_TOKEN_HTTP_URI_ARGS] = ah->nfrag;
wsi->u.hdr.ups = URIPS_IDLE; wsi->u.hdr.ups = URIPS_IDLE;
goto swallow; goto swallow;

1
lib/private-libwebsockets.h
View file

@ -810,6 +810,7 @@ struct _lws_header_related {
enum uri_path_states ups; enum uri_path_states ups;
enum uri_esc_states ues; enum uri_esc_states ues;
char esc_stash; char esc_stash;
char post_literal_equal;
}; };
struct _lws_websocket_related { struct _lws_websocket_related {

6
test-server/attack.sh
View file

@ -90,6 +90,12 @@ echo -e "GET /cgi-bin/settings.js?key1=value1 HTTP/1.1\x0d\x0a\x0d\x0a" | nc $SE
check 1 "key1=value1" check 1 "key1=value1"
check check
echo
echo "---- ? processing (/test?key1%3d2=value1)"
rm -f /tmp/lwscap
echo -e "GET /test?key1%3d2=value1 HTTP/1.1\x0d\x0a\x0d\x0a" | nc $SERVER $PORT | sed '1,/^\r$/d'> /tmp/lwscap
check 1 "key1_2=value1"
check
echo echo
echo "---- ? processing (%2f%2e%2e%2f%2e./test.html?arg=1)" echo "---- ? processing (%2f%2e%2e%2f%2e./test.html?arg=1)"