Skip to content

Commit 04dcf8c

Browse files
author
MB
committed
[Microsoft.com] Fixes/updates related to i\d*\..+, add events.msdn
1 parent 3efb53e commit 04dcf8c

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

‎src/chrome/content/rules/Microsoft.xml‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,13 @@
119119
- mymfe (reset)
120120
- news (Redirects to http)
121121
- officeimages
122+
- onlinehelp (Refused)
123+
- i[1-3]?.onlinehelp *
124+
- outlook ***
122125
- privacy (times out)
123126
- academic.research ***
124127
- sharepoint (redirects to login.live.com, cert valid)
128+
- i1.gallery.technet (Mismatched)
125129
- vepexp (refused)
126130
- edir.windowsm (404)
127131
- visio **
@@ -148,15 +152,18 @@
148152
- i\d **
149153
- ie (mismatched, CN: *.azurewebsites.net)
150154
- i1.mobile **
155+
- i[1-4].code.msdn (Mismatched)
156+
- i[23]?.msdn **
151157
- scache **
152158
- search **
153159
- spcache (504, akamai)
154160
- img3.store (mismatched)
161+
- i[23]?.technet **
155162
- social.technet
156163
- update *
157164
- www.update (Untrusted root)
158165
- windows *
159-
- res[12].windows **
166+
- res[1-4].windows **
160167
161168
- compass.surface.com **
162169
@@ -218,6 +225,9 @@
218225
- msdn
219226
- apisandbox.msdn
220227
- code.msdn
228+
- i[1-4].code.msdn (→ i1.code.s-msft.com)
229+
- events.msdn
230+
- i[23]?.msdn (→ msdn.microsoft.com)
221231
- lab.msdn
222232
- social.msdn
223233
- visualstudiogallery.msdn
@@ -241,8 +251,12 @@
241251
- corp.sts
242252
- support
243253
- sxp
254+
244255
- technet
245256
- gallery.technet
257+
- i[1-4].gallery.technet (→ i1.gallery.technet.s-msft.com)
258+
- i[23]?.technet (→ technet.microsoft.com)
259+
246260
- res[12].windows (→ akamai)
247261
248262
@@ -524,6 +538,7 @@
524538
<test url="http://msdn.microsoft.com/" />
525539
<test url="http://apisandbox.msdn.microsoft.com/" />
526540
<test url="http://code.msdn.microsoft.com/" />
541+
<test url="http://events.msdn.microsoft.com/" />
527542
<test url="http://lab.msdn.microsoft.com/" />
528543
<test url="http://social.msdn.microsoft.com/" />
529544
<test url="http://visualstudiogallery.msdn.microsoft.com/" />
@@ -621,20 +636,15 @@
621636

622637
<!-- Akamai with no valid cert.
623638
-->
624-
<rule from="^http://i\d?\.(answers|(?:code\.)?msdn|onlinehelp|(?:services\.)?social|(?:gallery\.)?technet)\.microsoft\.com/"
639+
<rule from="^http://i\d?\.(answers|msdn|(?:services\.)?social|technet)\.microsoft\.com/"
625640
to="https://$1.microsoft.com/" />
626641

627642
<test url="http://i.answers.microsoft.com/static/css/core.css" />
628643
<test url="http://i2.answers.microsoft.com/static/css/pagecontrols.css" />
629644
<test url="http://i3.answers.microsoft.com/static/css/search.css" />
630645
<test url="http://i.msdn.microsoft.com/" />
631646
<test url="http://i.msdn.microsoft.com//" />
632-
<test url="http://i.code.msdn.microsoft.com/" />
633-
<test url="http://i.code.msdn.microsoft.com//" />
634-
<test url="http://i.onlinehelp.microsoft.com/" />
635-
<test url="http://i.onlinehelp.microsoft.com//" />
636647
<test url="http://i.services.social.microsoft.com/" />
637-
<test url="http://i.gallery.technet.microsoft.com/" />
638648

639649
<rule from="^http://i\d\.connect\.microsoft\.com/"
640650
to="https://services.connect.microsoft.com/" />
@@ -646,6 +656,14 @@
646656

647657
<test url="http://i1.mobile.microsoft.com/" />
648658

659+
<rule from="^http://i[1-4]\.(code\.msdn|gallery\.technet)\.microsoft\.com/"
660+
to="https://i1.$1.s-msft.com/" />
661+
662+
<test url="http://i1.code.msdn.microsoft.com/" />
663+
<test url="http://i1.code.msdn.microsoft.com//" />
664+
<test url="http://i1.code.msdn.microsoft.com/content/common/trans.gif" />
665+
<test url="http://i1.gallery.technet.microsoft.com/" />
666+
649667
<rule from="^http://img3\.store\.microsoft\.com/"
650668
to="https://msstore.vo.msecnd.net/" />
651669

@@ -658,7 +676,7 @@
658676
<test url="http://res2.windows.microsoft.com/" />
659677
<test url="http://res2.windows.microsoft.com/resources/4.2/wol/shared/images/merged/gl_social.svg" />
660678

661-
<rule from="^http://((?:account|accountservices|(?:feedback\.)?adcenter|advertising|ajax|(?:fb\.)?answers|wscont\.apps|assets|azure|blogs|c1?|careers|choice|commerce|compass-ssl|(?:innovation\.|services\.)?connect|sas\.css|curah|events|social\.expression|go?|i|ieonline|insider|js|learning|m|widgets\.membership|mobile|code\.msdn|msdn|(?:apisandbox|lab|social|visualstudiogallery)\.msdn|mspartner|(?:logobuilder|mspartnerlp)\.mspartner|mvastorage|oem|office(?:15client|365|2010|preview|redir)?|o15\.officeredir|training\.partner|pinpoint|profile|rad|readytogo|research|profileapi\.services|signature|snackbox|(?:services\.)?social|store|corp\.sts|support2?|sxp|tag|(?:gallery\.|social\.)?technet|origin-res\.windows|(?:v[45]\.)?windowsupdate|www)\.)?microsoft\.com/"
679+
<rule from="^http://((?:account|accountservices|(?:feedback\.)?adcenter|advertising|ajax|(?:fb\.)?answers|wscont\.apps|assets|azure|blogs|c1?|careers|choice|commerce|compass-ssl|(?:innovation\.|services\.)?connect|sas\.css|curah|events|social\.expression|go?|i|ieonline|insider|js|learning|m|widgets\.membership|mobile|code\.msdn|msdn|(?:apisandbox|events|lab|social|visualstudiogallery)\.msdn|mspartner|(?:logobuilder|mspartnerlp)\.mspartner|mvastorage|oem|office(?:15client|365|2010|preview|redir)?|o15\.officeredir|training\.partner|pinpoint|profile|rad|readytogo|research|profileapi\.services|signature|snackbox|(?:services\.)?social|store|corp\.sts|support2?|sxp|tag|(?:gallery\.|social\.)?technet|origin-res\.windows|(?:v[45]\.)?windowsupdate|www)\.)?microsoft\.com/"
662680
to="https://$1microsoft.com/" />
663681

664682
</ruleset>

‎utils/ruleset-coverage-whitelist.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7892,7 +7892,7 @@ a9e3c6f9538af4ee45696824136b5314c58a827e662c5dfba7b8032f6920356f Micro_Polia.xm
78927892
cefc11c6aac01aa1ad487dec28dec26bb41141673dae37fb2b04b1595d24c1ac Microsoft-mixedcontent.xml
78937893
7b29d096e9956a0a3f126f7bd002123aac08debc69a9cc8001cfa9a50ecb58ca Microsoft_Online_Services.xml
78947894
d502d69ccfa450c767b4181e14fb5e9061f2ee2f9ea64c88afba100acdda3dc6 Microsoft_Store.xml
7895-
ea12d8ac28c9f905cfddbefc25a256cd6ca55a55d3e09050807400d41bb0504e Microsoft.xml
7895+
121f2f04ffe30ade6d863f11d96c71bb311f46eef5b684fae48e5ed7682d9010 Microsoft.xml
78967896
7b100b62a23d14a4e21a5f4775ce4f523326901c2464aeb6299fde517c42e32e MicroSTER.pl.xml
78977897
0aadb7ad42232edef2619a06c400203716310aed77e66417c3a11e1d49d4d744 Microtech.xml
78987898
fb9361e5f9e26090b2ca7030c712c7ea214e7a531c650819ad8d7769a2538e0e Microtronix.xml

0 commit comments

Comments
 (0)