servo: Merge #14508 - Rewrite determine_request_referrer() to explicitly limit it to the checks it can do (from servo:determine_request_referrer); r=jdm,frewsxcv

marco-c · marco-c · commit da33a7a4561a · 2019-10-01T01:07:14.000Z
Checks for the Client value should reside in the script thread. I also noted some other issues in this code. Source-Repo: https://github.com/servo/servo Source-Revision: 882d5512bb9aa7263864fb18d702c1efb6401914 UltraBlame original commit: bb6d259f6f5dc49a5ef21de8d9d8177f7ce59413
diff --git a/servo/components/net/fetch/methods.rs b/servo/components/net/fetch/methods.rs
@@ -192,6 +192,12 @@ use
 std
 :
 :
+mem
+;
+use
+std
+:
+:
 rc
 :
 :
@@ -919,21 +925,51 @@ referrer_policy
 )
 )
 ;
-if
-*
+{
+let
+mut
+referrer
+=
 request
 .
 referrer
 .
-borrow
+borrow_mut
 (
 )
-!
+;
+let
+referrer_url
 =
+match
+mem
+:
+:
+replace
+(
+&
+mut
+*
+referrer
 Referrer
 :
 :
 NoReferrer
+)
+{
+Referrer
+:
+:
+NoReferrer
+=
+>
+None
+Referrer
+:
+:
+Client
+=
+>
 {
 request
 .
@@ -952,33 +988,49 @@ RefererHeader
 (
 )
 ;
-let
-referrer_url
-=
-determine_request_referrer
+None
+}
+Referrer
+:
+:
+ReferrerUrl
 (
-&
-mut
-*
+url
+)
+=
+>
+{
 request
 .
 headers
 .
 borrow_mut
 (
 )
-referrer_policy
-request
 .
-referrer
-.
-borrow_mut
+remove
+:
+:
+<
+RefererHeader
+>
 (
 )
+;
+determine_request_referrer
+(
+&
+mut
+*
+request
+.
+headers
 .
-take
+borrow_mut
 (
 )
+referrer_policy
+url
 request
 .
 current_url
@@ -989,25 +1041,31 @@ clone
 (
 )
 )
+}
+}
 ;
-*
-request
-.
-referrer
-.
-borrow_mut
+if
+let
+Some
 (
+referrer_url
 )
 =
+referrer_url
+{
+*
+referrer
+=
 Referrer
 :
 :
-from_url
+ReferrerUrl
 (
 referrer_url
 )
 ;
 }
+}
 let
 response
 =
diff --git a/servo/components/net/http_loader.rs b/servo/components/net/http_loader.rs
@@ -1789,13 +1789,10 @@ Headers
 referrer_policy
 :
 ReferrerPolicy
-referrer_url
+referrer_source
 :
-Option
-<
 ServoUrl
->
-url
+current_url
 :
 ServoUrl
 )
@@ -1822,32 +1819,22 @@ Referer
 )
 )
 ;
-if
-let
-Some
-(
-ref_url
-)
-=
-referrer_url
-{
 let
 cross_origin
 =
-ref_url
+referrer_source
 .
 origin
 (
 )
 !
 =
-url
+current_url
 .
 origin
 (
 )
 ;
-return
 match
 referrer_policy
 {
@@ -1866,7 +1853,7 @@ Origin
 >
 strip_url
 (
-ref_url
+referrer_source
 true
 )
 ReferrerPolicy
@@ -1884,7 +1871,7 @@ else
 {
 strip_url
 (
-ref_url
+referrer_source
 false
 )
 }
@@ -1896,7 +1883,7 @@ UnsafeUrl
 >
 strip_url
 (
-ref_url
+referrer_source
 false
 )
 ReferrerPolicy
@@ -1907,7 +1894,7 @@ OriginWhenCrossOrigin
 >
 strip_url
 (
-ref_url
+referrer_source
 cross_origin
 )
 ReferrerPolicy
@@ -1918,8 +1905,8 @@ StrictOrigin
 >
 strict_origin
 (
-ref_url
-url
+referrer_source
+current_url
 )
 ReferrerPolicy
 :
@@ -1929,8 +1916,8 @@ StrictOriginWhenCrossOrigin
 >
 strict_origin_when_cross_origin
 (
-ref_url
-url
+referrer_source
+current_url
 )
 ReferrerPolicy
 :
@@ -1940,15 +1927,10 @@ NoReferrerWhenDowngrade
 >
 no_referrer_when_downgrade_header
 (
-ref_url
-url
+referrer_source
+current_url
 )
 }
-;
-}
-return
-None
-;
 }
 pub
 fn
diff --git a/servo/components/net_traits/request.rs b/servo/components/net_traits/request.rs

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,12 @@ use`
`192`	`192`	`std`
`193`	`193`	`:`
`194`	`194`	`:`
	`195`	`+mem`
	`196`	`+;`
	`197`	`+use`
	`198`	`+std`
	`199`	`+:`
	`200`	`+:`
`195`	`201`	`rc`
`196`	`202`	`:`
`197`	`203`	`:`
`@@ -919,21 +925,51 @@ referrer_policy`
`919`	`925`	`)`
`920`	`926`	`)`
`921`	`927`	`;`
`922`		`-if`
`923`		`-*`
	`928`	`+{`
	`929`	`+let`
	`930`	`+mut`
	`931`	`+referrer`
	`932`	`+=`
`924`	`933`	`request`
`925`	`934`	`.`
`926`	`935`	`referrer`
`927`	`936`	`.`
`928`		`-borrow`
	`937`	`+borrow_mut`
`929`	`938`	`(`
`930`	`939`	`)`
`931`		`-!`
	`940`	`+;`
	`941`	`+let`
	`942`	`+referrer_url`
`932`	`943`	`=`
	`944`	`+match`
	`945`	`+mem`
	`946`	`+:`
	`947`	`+:`
	`948`	`+replace`
	`949`	`+(`
	`950`	`+&`
	`951`	`+mut`
	`952`	`+*`
	`953`	`+referrer`
`933`	`954`	`Referrer`
`934`	`955`	`:`
`935`	`956`	`:`
`936`	`957`	`NoReferrer`
	`958`	`+)`
	`959`	`+{`
	`960`	`+Referrer`
	`961`	`+:`
	`962`	`+:`
	`963`	`+NoReferrer`
	`964`	`+=`
	`965`	`+>`
	`966`	`+None`
	`967`	`+Referrer`
	`968`	`+:`
	`969`	`+:`
	`970`	`+Client`
	`971`	`+=`
	`972`	`+>`
`937`	`973`	`{`
`938`	`974`	`request`
`939`	`975`	`.`
`@@ -952,33 +988,49 @@ RefererHeader`
`952`	`988`	`(`
`953`	`989`	`)`
`954`	`990`	`;`
`955`		`-let`
`956`		`-referrer_url`
`957`		`-=`
`958`		`-determine_request_referrer`
	`991`	`+None`
	`992`	`+}`
	`993`	`+Referrer`
	`994`	`+:`
	`995`	`+:`
	`996`	`+ReferrerUrl`
`959`	`997`	`(`
`960`		`-&`
`961`		`-mut`
`962`		`-*`
	`998`	`+url`
	`999`	`+)`
	`1000`	`+=`
	`1001`	`+>`
	`1002`	`+{`
`963`	`1003`	`request`
`964`	`1004`	`.`
`965`	`1005`	`headers`
`966`	`1006`	`.`
`967`	`1007`	`borrow_mut`
`968`	`1008`	`(`
`969`	`1009`	`)`
`970`		`-referrer_policy`
`971`		`-request`
`972`	`1010`	`.`
`973`		`-referrer`
`974`		`-.`
`975`		`-borrow_mut`
	`1011`	`+remove`
	`1012`	`+:`
	`1013`	`+:`
	`1014`	`+<`
	`1015`	`+RefererHeader`
	`1016`	`+>`
`976`	`1017`	`(`
`977`	`1018`	`)`
	`1019`	`+;`
	`1020`	`+determine_request_referrer`
	`1021`	`+(`
	`1022`	`+&`
	`1023`	`+mut`
	`1024`	`+*`
	`1025`	`+request`
	`1026`	`+.`
	`1027`	`+headers`
`978`	`1028`	`.`
`979`		`-take`
	`1029`	`+borrow_mut`
`980`	`1030`	`(`
`981`	`1031`	`)`
	`1032`	`+referrer_policy`
	`1033`	`+url`
`982`	`1034`	`request`
`983`	`1035`	`.`
`984`	`1036`	`current_url`
`@@ -989,25 +1041,31 @@ clone`
`989`	`1041`	`(`
`990`	`1042`	`)`
`991`	`1043`	`)`
	`1044`	`+}`
	`1045`	`+}`
`992`	`1046`	`;`
`993`		`-*`
`994`		`-request`
`995`		`-.`
`996`		`-referrer`
`997`		`-.`
`998`		`-borrow_mut`
	`1047`	`+if`
	`1048`	`+let`
	`1049`	`+Some`
`999`	`1050`	`(`
	`1051`	`+referrer_url`
`1000`	`1052`	`)`
`1001`	`1053`	`=`
	`1054`	`+referrer_url`
	`1055`	`+{`
	`1056`	`+*`
	`1057`	`+referrer`
	`1058`	`+=`
`1002`	`1059`	`Referrer`
`1003`	`1060`	`:`
`1004`	`1061`	`:`
`1005`		`-from_url`
	`1062`	`+ReferrerUrl`
`1006`	`1063`	`(`
`1007`	`1064`	`referrer_url`
`1008`	`1065`	`)`
`1009`	`1066`	`;`
`1010`	`1067`	`}`
	`1068`	`+}`
`1011`	`1069`	`let`
`1012`	`1070`	`response`
`1013`	`1071`	`=`
Original file line number	Diff line number	Diff line change
`@@ -1789,13 +1789,10 @@ Headers`
`1789`	`1789`	`referrer_policy`
`1790`	`1790`	`:`
`1791`	`1791`	`ReferrerPolicy`
`1792`		`-referrer_url`
	`1792`	`+referrer_source`
`1793`	`1793`	`:`
`1794`		`-Option`
`1795`		`-<`
`1796`	`1794`	`ServoUrl`
`1797`		`->`
`1798`		`-url`
	`1795`	`+current_url`
`1799`	`1796`	`:`
`1800`	`1797`	`ServoUrl`
`1801`	`1798`	`)`
`@@ -1822,32 +1819,22 @@ Referer`
`1822`	`1819`	`)`
`1823`	`1820`	`)`
`1824`	`1821`	`;`
`1825`		`-if`
`1826`		`-let`
`1827`		`-Some`
`1828`		`-(`
`1829`		`-ref_url`
`1830`		`-)`
`1831`		`-=`
`1832`		`-referrer_url`
`1833`		`-{`
`1834`	`1822`	`let`
`1835`	`1823`	`cross_origin`
`1836`	`1824`	`=`
`1837`		`-ref_url`
	`1825`	`+referrer_source`
`1838`	`1826`	`.`
`1839`	`1827`	`origin`
`1840`	`1828`	`(`
`1841`	`1829`	`)`
`1842`	`1830`	`!`
`1843`	`1831`	`=`
`1844`		`-url`
	`1832`	`+current_url`
`1845`	`1833`	`.`
`1846`	`1834`	`origin`
`1847`	`1835`	`(`
`1848`	`1836`	`)`
`1849`	`1837`	`;`
`1850`		`-return`
`1851`	`1838`	`match`
`1852`	`1839`	`referrer_policy`
`1853`	`1840`	`{`
`@@ -1866,7 +1853,7 @@ Origin`
`1866`	`1853`	`>`
`1867`	`1854`	`strip_url`
`1868`	`1855`	`(`
`1869`		`-ref_url`
	`1856`	`+referrer_source`
`1870`	`1857`	`true`
`1871`	`1858`	`)`
`1872`	`1859`	`ReferrerPolicy`
`@@ -1884,7 +1871,7 @@ else`
`1884`	`1871`	`{`
`1885`	`1872`	`strip_url`
`1886`	`1873`	`(`
`1887`		`-ref_url`
	`1874`	`+referrer_source`
`1888`	`1875`	`false`
`1889`	`1876`	`)`
`1890`	`1877`	`}`
`@@ -1896,7 +1883,7 @@ UnsafeUrl`
`1896`	`1883`	`>`
`1897`	`1884`	`strip_url`
`1898`	`1885`	`(`
`1899`		`-ref_url`
	`1886`	`+referrer_source`
`1900`	`1887`	`false`
`1901`	`1888`	`)`
`1902`	`1889`	`ReferrerPolicy`
`@@ -1907,7 +1894,7 @@ OriginWhenCrossOrigin`
`1907`	`1894`	`>`
`1908`	`1895`	`strip_url`
`1909`	`1896`	`(`
`1910`		`-ref_url`
	`1897`	`+referrer_source`
`1911`	`1898`	`cross_origin`
`1912`	`1899`	`)`
`1913`	`1900`	`ReferrerPolicy`
`@@ -1918,8 +1905,8 @@ StrictOrigin`
`1918`	`1905`	`>`
`1919`	`1906`	`strict_origin`
`1920`	`1907`	`(`
`1921`		`-ref_url`
`1922`		`-url`
	`1908`	`+referrer_source`
	`1909`	`+current_url`
`1923`	`1910`	`)`
`1924`	`1911`	`ReferrerPolicy`
`1925`	`1912`	`:`
`@@ -1929,8 +1916,8 @@ StrictOriginWhenCrossOrigin`
`1929`	`1916`	`>`
`1930`	`1917`	`strict_origin_when_cross_origin`
`1931`	`1918`	`(`
`1932`		`-ref_url`
`1933`		`-url`
	`1919`	`+referrer_source`
	`1920`	`+current_url`
`1934`	`1921`	`)`
`1935`	`1922`	`ReferrerPolicy`
`1936`	`1923`	`:`
`@@ -1940,15 +1927,10 @@ NoReferrerWhenDowngrade`
`1940`	`1927`	`>`
`1941`	`1928`	`no_referrer_when_downgrade_header`
`1942`	`1929`	`(`
`1943`		`-ref_url`
`1944`		`-url`
	`1930`	`+referrer_source`
	`1931`	`+current_url`
`1945`	`1932`	`)`
`1946`	`1933`	`}`
`1947`		`-;`
`1948`		`-}`
`1949`		`-return`
`1950`		`-None`
`1951`		`-;`
`1952`	`1934`	`}`
`1953`	`1935`	`pub`
`1954`	`1936`	`fn`