API tools faq
paste
Advertisement
Guest User

Mozilla ruleset changes between 4.0dev2 and 4.0dev3

a guest
Dec 13th, 2012
191
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.10 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml
  2. index e3198cb..88be823 100644
  3. --- a/src/chrome/content/rules/Mozilla.xml
  4. +++ b/src/chrome/content/rules/Mozilla.xml
  5. @@ -2,154 +2,37 @@
  6.     Other Mozilla rulesets:
  7.  
  8.         - BrowserID.xml
  9. -       - GetPersonas.xml
  10.  
  11.  
  12. -   Nonfunctional domains:
  13. +   BOOOO: Firefox.com (which some download links pass through)
  14. +   is in HTTP only...
  15.  
  16. -       - identity.mozilla.com      (hosted on Tumblr)
  17. -       - static.mozilla.com        (CN: www.mozilla.com; 404)
  18. -       - nightly.mozilla.org       (in what way doesn't this work?)
  19. -       - releases.mozilla.org
  20. -       - sfx-images.mozilla.org    (CN: www.mozilla.com; banners)
  21. -       - www-archive.mozilla.org   (CN: www.mozilla.com; 404)
  22. -       - blog.webfwd.org       (hosted on Tumblr)
  23.  
  24. +   Nonfunctional:
  25.  
  26. -   Problematic domains:
  27. -
  28. -       - (www.)firefox.com     (CN: www.mozilla.com; 404)
  29. -       - blog.lizardwrangler.com   (self-signed)
  30. -       - affiliates-cdn.mozilla.org    (CN: affiliates.mozilla.org)
  31. -       - krakenbenchmark.mozilla.org   (CN: www.mozilla.org)
  32. -       - people.mozilla.org        (CN: people.mozilla.com)
  33. -       - talkback-public.mozilla.org   (CN: www.mozilla.org; 404)
  34. -       - videos.mozilla.org        (CN: static-cdn.addons.mozilla.net)
  35. -       - www.mozillalabs.com       (CN: tbpl.mozilla.org; 403)
  36. -
  37. -
  38. -   Fully covered domains:
  39. -
  40. -       - drumbeat.org
  41. -       - www.drumbeat.org
  42. -       - firefox.com
  43. -       - www.firefox.com
  44. -
  45. -       - mozilla.com subdomains:
  46. -
  47. -           - ^
  48. -           - blog
  49. -           - crash-stats
  50. -           - input
  51. -           - people
  52. -           - support
  53. -           - www
  54. -
  55. -       - mozilla.net subdomains:
  56. -
  57. -           - ^
  58. -           - static-cdn.addons
  59. -           - static-ssl-cdn.addons
  60. -           - addons.cdn
  61. -           - video-cdn
  62. -           - www
  63. -
  64. -       - mozilla.org subdomains:
  65. -
  66. -           - ^
  67. -           - forums.addons
  68. -           - services.addons
  69. -           - affiliates
  70. -           - affiliates-cdn
  71. -           - air
  72. -           - blog
  73. -           - bugzilla
  74. -           - bzr
  75. -           - communitystore
  76. -           - creative
  77. -           - developer
  78. -           - directory
  79. -           - donate
  80. -           - education
  81. -           - etherpad
  82. -           - firefoxlive
  83. -           - forums
  84. -           - ftp
  85. -           - hacks
  86. -           - hg
  87. -           - input
  88. -           - intlstore
  89. -           - l10n
  90. -           - lists
  91. -           - localize
  92. -           - labs
  93. -           - mail
  94. -           - mpl
  95. -           - mxr
  96. -           - nightly
  97. -           - outgoing
  98. -           - people
  99. -           - quality
  100. -           - studentreps
  101. -           - support
  102. -           - talkback-public
  103. -           - tbpl
  104. -           - videos
  105. -           - wiki
  106. -           - www
  107. -
  108. -       - mozillaignite.org
  109. -       - blog.mozillaignite.org
  110. -       - www.mozillaignite.org
  111. -
  112. -       - mozillalabs.com subdomains:
  113. -
  114. -           - ^
  115. -           - apps
  116. -           - bespin
  117. -           - bespinplugins
  118. -           - gaming
  119. -           - heatmap
  120. -           - jetpack
  121. -           - testpilot
  122. -           - webmaker
  123. -           - www
  124. -
  125. -       - planet.mozillamessaging.com
  126. -       - support.mozillamessaging.com
  127. -       - webfwd.org
  128. -       - www.webfwd.org
  129. -       - webmaker.org
  130. -       - www.webmaker.org
  131. +       - identity.mozilla.com      (hosted on Tumblr)
  132. +       - sfx-images.mozilla.org    (banners)
  133. +       - static.mozilla.org        (cert valid; shows www data)
  134. +       - blog.webfwd.org       (hosted on Tumblr)
  135.  
  136.  -->
  137.  <ruleset name="Mozilla">
  138.  
  139.     <target host="drumbeat.org" />
  140.     <target host="www.drumbeat.org" />
  141. -   <target host="firefox.com" />
  142. -   <target host="www.firefox.com" />
  143.     <target host="mozilla.com" />
  144.     <target host="*.mozilla.com" />
  145. -       <exclusion pattern="^http://(?:identity|static)\.mozilla\.com/" />
  146.     <target host="mozilla.net" />
  147.     <target host="*.addons.mozilla.net" />
  148. -   <target host="addons.cdn.mozilla.net" />
  149.     <target host="*.mozilla.net" />
  150.     <target host="mozilla.org" />
  151.     <target host="*.mozilla.org" />
  152. -       <exclusion pattern="^http://(?:krakenbenchmark|nightly|releases|sfx-images|www-archive)\.mozilla\.org/" />
  153. -   <target host="*.addons.mozilla.org" />
  154. -   <!--
  155. -       *s for cross-domain cookies.
  156. -                       -->
  157. +       <exclusion pattern="^http://nightly\.mozilla\.org/" />
  158. +   <target host="forums.addons.mozilla.org" />
  159. +   <!--    *s for cross-domain cookies.    -->
  160.     <target host="*.developer.mozilla.org" />
  161. -   <target host="*.donate.mozilla.org" />
  162. -   <target host="*.etherpad.mozilla.org" />
  163.     <target host="*.forums.mozilla.org" />
  164.     <target host="*.wiki.mozilla.org" />
  165. -   <target host="mozillaignite.com" />
  166. -   <target host="*.mozillaignite.com" />
  167.     <target host="mozillalabs.com" />
  168.     <target host="*.mozillalabs.com" />
  169.     <target host="*.mozillamessaging.com" />
  170. @@ -159,57 +42,59 @@
  171.     <target host="www.webmaker.org" />
  172.  
  173.  
  174. -   <securecookie host="^.*\.mozilla\.(?:com|org)$" name=".+" />
  175. -   <securecookie host="^mozilla(?:ignite|labs)\.com$" name=".+" />
  176. -   <securecookie host="^(?:www\.)?webmaker\.org$" name=".+" />
  177. +   <securecookie host="^.*\.mozilla\.(com|org)$" name=".*" />
  178. +   <securecookie host="^mozillalabs\.com$" name=".*" />
  179. +   <securecookie host="^(www\.)?webmaker\.org$" name=".*" />
  180.  
  181.  
  182.     <rule from="^http://(www\.)?(drumbeat|webfwd|webmaker)\.org/"
  183.         to="https://$1$2.org/" />
  184.  
  185. -   <!--    Redirects like so over http.
  186. -                       -->
  187. -   <rule from="^https?://(?:www\.)?firefox\.com/"
  188. -       to="https://www.mozilla.org/firefox/" />
  189. -
  190. -   <rule from="^http://([\w\-]+\.)?mozilla\.com/"
  191. +   <rule from="^http://((?:blog|crash-stats|input|people|support|www)\.)?mozilla\.com/"
  192.         to="https://$1mozilla.com/" />
  193.  
  194. -   <!--    Redirects as so over http.
  195. -                       -->
  196. +   <!--    Redirects as so over http.  -->
  197.     <rule from="^https?://(?:www\.)?mozilla\.net/"
  198.         to="https://www.mozilla.org/" />
  199.  
  200. -   <rule from="^http://([\w\-\.]+)\.mozilla\.net/"
  201. +   <!--    - Cert matches videos-ssl-cdn.mozilla.net
  202. +       - videos-ssl-cdn.mozilla.net doesn't exist
  203. +               -->
  204. +   <rule from="^http://(static(?:-ssl)?-cdn\.addons|video-cdn)\.mozilla\.net/"
  205.         to="https://$1.mozilla.net/" />
  206.  
  207. -   <rule from="^https?://affiliates-cdn\.mozilla\.org/"
  208. +   <rule from="^http://((?:addons|blog|bugzilla|bzr|communitystore|creative|developer|directory|donate|education|etherpad|firefoxlive|forums(?:\.addons)?|ftp|input|intlstore|l10n|lists|localize|hacks|hg|labs|mail|mpl|mxr|nightly|studentreps|support|tbpl|quality|wiki|www)\.)?mozilla\.org/"
  209. +       to="https://$1mozilla.org/" />
  210. +
  211. +   <!--    Cert doesn't match affiliates-cdn   -->
  212. +   <rule from="^https?://affiliates(?:-cdn)?\.mozilla\.org/"
  213.         to="https://affiliates.mozilla.org/" />
  214.  
  215. +   <!--    Cert only matches .com. -->
  216.     <rule from="^https?://people\.mozilla\.org/"
  217.         to="https://people.mozilla.com/" />
  218.  
  219. -   <!--    Redirects like so over http.
  220. -                       -->
  221. +   <!--    - Cert: www.mozilla.org
  222. +       - 404s over https
  223. +       - Redirects like so over http
  224. +           -->
  225.     <rule from="^https?://talkback-public\.mozilla\.org/"
  226.         to="https://crash-stats.mozilla.com/" />
  227.  
  228. +   <!--    Cert mismatch   -->
  229.     <rule from="^https?://videos\.mozilla\.org/"
  230.         to="https://videos-cdn.mozilla.net/" />
  231.  
  232. -   <rule from="^http://([\w\-\.]+\.)?mozilla\.org/"
  233. -       to="https://$1mozilla.org/" />
  234. -
  235. -   <rule from="^http://(\w+\.)?mozillaignite\.com/"
  236. -       to="https://$1mozillaignite.com/" />
  237. -
  238. +   <!--    - www cert: tbpl.mozilla.org
  239. +       - 403
  240. +                   -->
  241.     <rule from="^https?://(?:www\.)?mozillalabs\.com/"
  242.         to="https://mozillalabs.com/" />
  243.  
  244. -   <rule from="^http://(\w+)\.mozillalabs\.com/"
  245. +   <rule from="^http://(apps|bespin(?:plugins)?|gaming|heatmap|jetpack|testpilot|webmaker)\.mozillalabs\.com/"
  246.         to="https://$1.mozillalabs.com/"/>
  247.  
  248.     <rule from="^http://(planet|support)\.mozillamessaging\.com/"
  249.         to="https://$1.mozillamessaging.com/" />
  250.  
  251. -</ruleset>
  252. \ No newline at end of file
  253. +</ruleset>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!