Skip to content

Commit

Permalink
Fixed #74892 - Fixed URL rewriting for urls started with #
Browse files Browse the repository at this point in the history 
(cherry picked from commit 6c32d27)

This should have already been merged via
9cd82df, but that merge went wrong.
  • Loading branch information
@andrewnester @cmb69
andrewnester authored and cmb69 committed Apr 12, 2018
1 parent 0d87a0b commit 68296c4
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 48 deletions.
23 changes: 23 additions & 0 deletions ext/session/tests/bug74892.phpt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
Bug #74892 Url Rewriting (trans_sid) not working on urls that start with #
--FILE--
<?php
ini_set('session.use_cookies', '0');
ini_set('session.use_only_cookies',0);
ini_set('session.use_trans_sid',1);
ini_set('session.trans_sid_hosts','php.net');
session_id('sessionidhere');
session_start();

?>
<p><a href="index.php">Click This Anchor Tag!</a></p>
<p><a href="index.php#place">External link with anchor</a></p>
<p><a href="http://php.net#foo">External link with anchor 2</a></p>
<p><a href="#place">Internal link</a></p>
===DONE===
--EXPECT--
<p><a href="index.php?PHPSESSID=sessionidhere">Click This Anchor Tag!</a></p>
<p><a href="index.php?PHPSESSID=sessionidhere#place">External link with anchor</a></p>
<p><a href="http://php.net?PHPSESSID=sessionidhere#foo">External link with anchor 2</a></p>
<p><a href="#place">Internal link</a></p>
===DONE===
98 changes: 52 additions & 46 deletions ext/standard/url_scanner_ex.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
return;
}

/* Don't modify URLs of the format "#mark" */
if (url_parts->fragment && '#' == ZSTR_VAL(url->s)[0]) {
smart_str_append_smart_str(dest, url);
php_url_free(url_parts);
return;
}

/* Check protocol. Only http/https is allowed. */
if (url_parts->scheme
&& strcasecmp("http", url_parts->scheme)
Expand All @@ -217,13 +224,12 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
* When URL does not have path and query string add "/?".
* i.e. If URL is only "?foo=bar", should not add "/?".
*/
if (!url_parts->path && !url_parts->query) {
if (!url_parts->path && !url_parts->query && !url_parts->fragment) {
/* URL is http://php.net or like */
smart_str_append_smart_str(dest, url);
smart_str_appendc(dest, '/');
smart_str_appendc(dest, '?');
smart_str_append_smart_str(dest, url_app);
/* There should not be fragment. Just return */
php_url_free(url_parts);
return;
}
Expand Down Expand Up @@ -513,7 +519,7 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
state_plain:
start = YYCURSOR;

#line 517 "ext/standard/url_scanner_ex.c"
#line 523 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
Expand Down Expand Up @@ -563,22 +569,22 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
if (yybm[0+yych] & 128) {
goto yy2;
}
#line 520 "ext/standard/url_scanner_ex.re"
#line 526 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain; }
#line 569 "ext/standard/url_scanner_ex.c"
#line 575 "ext/standard/url_scanner_ex.c"
yy5:
++YYCURSOR;
#line 519 "ext/standard/url_scanner_ex.re"
#line 525 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
#line 574 "ext/standard/url_scanner_ex.c"
#line 580 "ext/standard/url_scanner_ex.c"
}
#line 521 "ext/standard/url_scanner_ex.re"
#line 527 "ext/standard/url_scanner_ex.re"


state_tag:
start = YYCURSOR;

#line 582 "ext/standard/url_scanner_ex.c"
#line 588 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
Expand Down Expand Up @@ -621,21 +627,21 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
goto yy11;
}
++YYCURSOR;
#line 527 "ext/standard/url_scanner_ex.re"
#line 533 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; }
#line 627 "ext/standard/url_scanner_ex.c"
#line 633 "ext/standard/url_scanner_ex.c"
yy11:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
if (yybm[0+yych] & 128) {
goto yy11;
}
#line 526 "ext/standard/url_scanner_ex.re"
#line 532 "ext/standard/url_scanner_ex.re"
{ handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
#line 637 "ext/standard/url_scanner_ex.c"
#line 643 "ext/standard/url_scanner_ex.c"
}
#line 528 "ext/standard/url_scanner_ex.re"
#line 534 "ext/standard/url_scanner_ex.re"


state_next_arg_begin:
Expand All @@ -644,7 +650,7 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
state_next_arg:
start = YYCURSOR;

#line 648 "ext/standard/url_scanner_ex.c"
#line 654 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
Expand Down Expand Up @@ -700,40 +706,40 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
yy16:
++YYCURSOR;
yy17:
#line 539 "ext/standard/url_scanner_ex.re"
#line 545 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; }
#line 706 "ext/standard/url_scanner_ex.c"
#line 712 "ext/standard/url_scanner_ex.c"
yy18:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
if (yybm[0+yych] & 128) {
goto yy18;
}
#line 537 "ext/standard/url_scanner_ex.re"
#line 543 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg; }
#line 716 "ext/standard/url_scanner_ex.c"
#line 722 "ext/standard/url_scanner_ex.c"
yy21:
yych = *++YYCURSOR;
if (yych != '>') goto yy17;
yy22:
++YYCURSOR;
#line 536 "ext/standard/url_scanner_ex.re"
#line 542 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
#line 724 "ext/standard/url_scanner_ex.c"
#line 730 "ext/standard/url_scanner_ex.c"
yy24:
++YYCURSOR;
#line 538 "ext/standard/url_scanner_ex.re"
#line 544 "ext/standard/url_scanner_ex.re"
{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
#line 729 "ext/standard/url_scanner_ex.c"
#line 735 "ext/standard/url_scanner_ex.c"
}
#line 540 "ext/standard/url_scanner_ex.re"
#line 546 "ext/standard/url_scanner_ex.re"


state_arg:
start = YYCURSOR;

#line 737 "ext/standard/url_scanner_ex.c"
#line 743 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
Expand Down Expand Up @@ -778,27 +784,27 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
if (yych <= 'z') goto yy30;
yy28:
++YYCURSOR;
#line 546 "ext/standard/url_scanner_ex.re"
#line 552 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
#line 784 "ext/standard/url_scanner_ex.c"
#line 790 "ext/standard/url_scanner_ex.c"
yy30:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
if (yybm[0+yych] & 128) {
goto yy30;
}
#line 545 "ext/standard/url_scanner_ex.re"
#line 551 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
#line 794 "ext/standard/url_scanner_ex.c"
#line 800 "ext/standard/url_scanner_ex.c"
}
#line 547 "ext/standard/url_scanner_ex.re"
#line 553 "ext/standard/url_scanner_ex.re"


state_before_val:
start = YYCURSOR;

#line 802 "ext/standard/url_scanner_ex.c"
#line 808 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
Expand Down Expand Up @@ -841,9 +847,9 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
if (yych == '=') goto yy38;
++YYCURSOR;
yy36:
#line 553 "ext/standard/url_scanner_ex.re"
#line 559 "ext/standard/url_scanner_ex.re"
{ --YYCURSOR; goto state_next_arg_begin; }
#line 847 "ext/standard/url_scanner_ex.c"
#line 853 "ext/standard/url_scanner_ex.c"
yy37:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ' ') goto yy41;
Expand All @@ -855,9 +861,9 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
if (yybm[0+yych] & 128) {
goto yy38;
}
#line 552 "ext/standard/url_scanner_ex.re"
#line 558 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
#line 861 "ext/standard/url_scanner_ex.c"
#line 867 "ext/standard/url_scanner_ex.c"
yy41:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
Expand All @@ -867,14 +873,14 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
YYCURSOR = YYMARKER;
goto yy36;
}
#line 554 "ext/standard/url_scanner_ex.re"
#line 560 "ext/standard/url_scanner_ex.re"



state_val:
start = YYCURSOR;

#line 878 "ext/standard/url_scanner_ex.c"
#line 884 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
Expand Down Expand Up @@ -927,15 +933,15 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
if (yybm[0+yych] & 32) {
goto yy46;
}
#line 562 "ext/standard/url_scanner_ex.re"
#line 568 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
#line 933 "ext/standard/url_scanner_ex.c"
#line 939 "ext/standard/url_scanner_ex.c"
yy49:
++YYCURSOR;
yy50:
#line 563 "ext/standard/url_scanner_ex.re"
#line 569 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg_begin; }
#line 939 "ext/standard/url_scanner_ex.c"
#line 945 "ext/standard/url_scanner_ex.c"
yy51:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == '>') goto yy50;
Expand All @@ -958,9 +964,9 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
goto yy50;
yy56:
++YYCURSOR;
#line 560 "ext/standard/url_scanner_ex.re"
#line 566 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
#line 964 "ext/standard/url_scanner_ex.c"
#line 970 "ext/standard/url_scanner_ex.c"
yy58:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
Expand All @@ -971,11 +977,11 @@ static inline void xx_mainloop(url_adapt_state_ex_t *ctx, const char *newdata, s
}
if (yych >= '(') goto yy55;
++YYCURSOR;
#line 561 "ext/standard/url_scanner_ex.re"
#line 567 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
#line 977 "ext/standard/url_scanner_ex.c"
#line 983 "ext/standard/url_scanner_ex.c"
}
#line 564 "ext/standard/url_scanner_ex.re"
#line 570 "ext/standard/url_scanner_ex.re"


stop:
Expand Down
10 changes: 8 additions & 2 deletions ext/standard/url_scanner_ex.re
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,13 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
return;
}

/* Don't modify URLs of the format "#mark" */
if (url_parts->fragment && '#' == ZSTR_VAL(url->s)[0]) {
smart_str_append_smart_str(dest, url);
php_url_free(url_parts);
return;
}

/* Check protocol. Only http/https is allowed. */
if (url_parts->scheme
&& strcasecmp("http", url_parts->scheme)
Expand All @@ -220,13 +227,12 @@ static inline void append_modified_url(smart_str *url, smart_str *dest, smart_st
* When URL does not have path and query string add "/?".
* i.e. If URL is only "?foo=bar", should not add "/?".
*/
if (!url_parts->path && !url_parts->query) {
if (!url_parts->path && !url_parts->query && !url_parts->fragment) {
/* URL is http://php.net or like */
smart_str_append_smart_str(dest, url);
smart_str_appendc(dest, '/');
smart_str_appendc(dest, '?');
smart_str_append_smart_str(dest, url_app);
/* There should not be fragment. Just return */
php_url_free(url_parts);
return;
}
Expand Down

0 comments on commit 68296c4

Please sign in to comment.