Christoph Kerschbaumer
4b7d4aaed5
Bug 1187165 - Use channel->ascynOpen2 in dom/base/ImportManager (r=sicking)
2015-08-10 10:25:20 -07:00
Christoph Kerschbaumer
b7e53859ad
Bug 1182544 - Use channel->ascynOpen2 in dom/xml/XMLDocument.cpp (r=sicking)
2015-08-10 10:19:08 -07:00
Blake Kaplan
9b31f6bcfe
Bug 661604 - Re-enable this test because it works now. rs=wchen and try
2015-08-06 10:35:49 -07:00
Christoph Kerschbaumer
5dfe6ac07d
Bug 1188637 - Use channel->ascynOpen2 in dom/base/EventSource.cpp (r=sicking)
2015-08-04 20:06:19 -07:00
Christoph Kerschbaumer
221df08158
Bug 1182543 - Use channel->ascynOpen2 in dom/plugins/base/nsPluginHost.cpp (r=sicking)
2015-08-04 20:05:37 -07:00
Carsten "Tomcat" Book
57a966656a
merge mozilla-inbound to mozilla-central a=merge
2015-08-04 13:01:07 +02:00
Tanvi Vyas
87164ced3c
Bug 1181683 - Mark ping and beacon as blockable mixed content instead of optionally blockable. r=smaug
2015-08-03 15:25:21 -07:00
Christoph Kerschbaumer
f7e2152921
Bug 1096724 - Fix intermittent test_base-uri.html failures. r=ryanvm
2015-07-29 14:16:37 -07:00
Christoph Kerschbaumer
5d6e8c751f
Bug 1152574 - Do not report aborted XHR requests in web console (r=sicking)
2015-07-20 13:59:19 -07:00
Christoph Kerschbaumer
f75b477899
Bug 1182539 - Use channel->ascynOpen2 in dom/base/nsDocument.cpp (r=sicking)
2015-07-31 08:58:14 -07:00
Christoph Kerschbaumer
90fee9adce
Bug 1182537 - Use channel->ascynOpen2 in dom/security/nsCORSListenerProxy (r=sicking)
2015-07-30 08:59:20 -07:00
Christoph Kerschbaumer
8f5542d747
Bug 1182537 - Use channel->ascynOpen2 in dom/base/Navigator.cpp (r=sicking,bz)
2015-07-27 20:39:17 -07:00
Marcos Caceres
2465cf3a99
Bug 1171200 - Add means of checking if a document links to a manifest. r=billm
...
--HG--
rename : dom/manifest/ImageObjectProcessor.js => dom/manifest/ImageObjectProcessor.jsm
rename : dom/manifest/ManifestProcessor.js => dom/manifest/ManifestProcessor.jsm
rename : dom/manifest/ValueExtractor.js => dom/manifest/ValueExtractor.jsm
2015-07-30 11:56:12 -04:00
Carsten "Tomcat" Book
401a15426c
Backed out changeset 4b328a6f7448 (bug 1171200) for frequent asan m1 test failures on a CLOSED TREE
...
--HG--
rename : dom/manifest/ImageObjectProcessor.jsm => dom/manifest/ImageObjectProcessor.js
rename : dom/manifest/ManifestProcessor.jsm => dom/manifest/ManifestProcessor.js
rename : dom/manifest/ValueExtractor.jsm => dom/manifest/ValueExtractor.js
extra : amend_source : 0a9fc98e1c76d4ede43714bac63bba8b43efe5d7
2015-07-30 15:11:48 +02:00
Marcos Caceres
79d86a6353
Bug 1171200 - Add means of checking if a document links to a manifest. r=billm
...
--HG--
rename : dom/manifest/ImageObjectProcessor.js => dom/manifest/ImageObjectProcessor.jsm
rename : dom/manifest/ManifestProcessor.js => dom/manifest/ManifestProcessor.jsm
rename : dom/manifest/ValueExtractor.js => dom/manifest/ValueExtractor.jsm
2015-07-29 16:58:00 +02:00
Francois Marier
7080a1190a
Bug 1187711 - Restrict -Wshadow to gcc and clang. r=KWierso CLOSED TREE
2015-07-27 17:12:58 -07:00
Francois Marier
5556697f0b
Bug 1187711 - Enable -Wshadow in DOM::Security. r=ckerschb
2015-07-27 16:14:56 -07:00
Christoph Kerschbaumer
9d66aa4b3b
Bug 1182540 - Use channel->ascynOpen2 in dom/html/HTMLTrackElement.cpp (r=sicking)
2015-07-25 10:29:22 -07:00
Josh Matthews
4130ff6d80
Bug 1186589
- Ensure CORS preflight requests are never intercepted. r=sicking
2015-07-23 10:25:12 -04:00
Christoph Kerschbaumer
25bee46b21
Bug 1173708 - Fix intermittent test_inlinescript error. r=dveditz
...
--HG--
rename : dom/security/test/csp/file_inlinescript_main_allowed.html => dom/security/test/csp/file_inlinescript.html
2015-07-20 11:25:24 -07:00
Carsten "Tomcat" Book
f821af7776
Backed out changeset cc377dd50503 (bug 1152574) for causing memory leaks on a CLOSED TREE
...
--HG--
extra : rebase_source : 819a2a12c3fd9adb5a756292a287288efbdc01a3
2015-07-21 11:50:45 +02:00
Christoph Kerschbaumer
6b484e43cd
Bug 1152574 - Do not report aborted XHR requests in web console. r=sicking
2015-07-20 13:59:19 -07:00
Christoph Kerschbaumer
bab1940d4a
Bug 1143922 - Add AsyncOpen2 to nsIChannel and perform security checks when opening a channel - securitymanager (r=sicking,tanvi)
2015-07-19 19:12:11 -07:00
mcaceres@mozilla.com
fa8ccba8c3
Backed out changeset 01d03b6be047 (bug 1171200)
...
--HG--
rename : dom/manifest/ImageObjectProcessor.jsm => dom/manifest/ImageObjectProcessor.js
rename : dom/manifest/ManifestProcessor.jsm => dom/manifest/ManifestProcessor.js
rename : dom/manifest/ValueExtractor.jsm => dom/manifest/ValueExtractor.js
2015-07-17 11:45:59 +10:00
Birunthan Mohanathas
a8939590de
Bug 1182996 - Fix and add missing namespace comments. rs=ehsan
...
The bulk of this commit was generated by running:
run-clang-tidy.py \
-checks='-*,llvm-namespace-comment' \
-header-filter=^/.../mozilla-central/.* \
-fix
2015-07-13 08:25:42 -07:00
Christoph Kerschbaumer
69eba2fa6a
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - cors tests (r=smaug)
...
--HG--
extra : rebase_source : 59ab74d90890d6756de82b64808ff35a947f0c2c
2015-07-10 09:17:17 -07:00
Christoph Kerschbaumer
bf74850156
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - tests referrer (r=sstamm)
...
--HG--
extra : rebase_source : be32f99f26715ba0816e9ea35b0e08bb73035a82
2015-07-10 09:17:02 -07:00
Christoph Kerschbaumer
ab68e4a840
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - reports (r=sstamm)
...
--HG--
extra : rebase_source : 55ff799deb95a3d66cfb7d37bf6892891913d5b3
2015-07-10 09:16:46 -07:00
Christoph Kerschbaumer
1e39bd8852
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - simple upgrade tests (r=tanvi,sstamm)
...
--HG--
extra : rebase_source : 4473c88aa0ab3e5b9bb31ed6b2e45dfeb68b3a2a
2015-07-10 09:16:32 -07:00
Christoph Kerschbaumer
41b6908773
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - parser tests (r=sstamm)
...
--HG--
extra : rebase_source : 2c24dfe4a44e8485b1f207f065668a4fbdf2b31c
2015-07-10 09:16:15 -07:00
Christoph Kerschbaumer
a900bc2910
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - devtool changes (r=sstamm,bholley)
...
--HG--
extra : rebase_source : db910acac278e591c6cfbbf897238a5b5159fd42
2015-07-10 09:16:01 -07:00
Christoph Kerschbaumer
d261954005
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - cors changes (r=smaug)
...
--HG--
extra : rebase_source : f7faab7a9cceb962b4eaf4598f1a45fb0f73a756
2015-07-10 09:15:03 -07:00
Christoph Kerschbaumer
9ea890b6d7
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - mcb changes (r=tanvi)
...
--HG--
extra : rebase_source : 055dda3713d13e0fa8f4e4d97a5371900df0ff4e
2015-07-10 09:14:42 -07:00
Christoph Kerschbaumer
d338b7f9d9
Bug 1139297 - Implement CSP upgrade-insecure-requests directive - csp changes (r=sstamm)
...
--HG--
extra : rebase_source : 34377eb11cf33beef768bd11883c048c37351a8d
2015-07-10 09:13:54 -07:00
Geoff Brown
52d4e225a0
Bug 1026290 - Update mochitest-chrome manifests for android; r=jgriffin
2015-07-10 14:41:59 -06:00
Marcos Caceres
9424ebb117
Bug 1171200 - Add means of checking if a document links to a manifest. r=billm.
...
---
dom/ipc/manifestMessages.js | 166 +++++++++-----------
...ObjectProcessor.js => ImageObjectProcessor.jsm} | 0
dom/manifest/ManifestFinder.jsm | 58 +++++++
dom/manifest/ManifestObtainer.js | 92 -----------
dom/manifest/ManifestObtainer.jsm | 170 +++++++++++++++++++++
...{ManifestProcessor.js => ManifestProcessor.jsm} | 18 +--
.../{ValueExtractor.js => ValueExtractor.jsm} | 4 +-
dom/manifest/WebManifest.jsm | 19 ---
dom/manifest/moz.build | 10 +-
dom/manifest/test/browser.ini | 3 +-
.../test/browser_ManifestObtainer_obtain.js | 2 +-
dom/manifest/test/browser_hasManifestLink.js | 109 +++++++++++++
dom/manifest/test/common.js | 4 +-
dom/security/test/csp/browser_test_web_manifest.js | 12 +-
.../csp/browser_test_web_manifest_mixed_content.js | 10 +-
toolkit/modules/PromiseMessage.jsm | 36 +++++
toolkit/modules/moz.build | 1 +
17 files changed, 467 insertions(+), 247 deletions(-)
rename dom/manifest/{ImageObjectProcessor.js => ImageObjectProcessor.jsm} (100%)
create mode 100644 dom/manifest/ManifestFinder.jsm
delete mode 100644 dom/manifest/ManifestObtainer.js
create mode 100644 dom/manifest/ManifestObtainer.jsm
rename dom/manifest/{ManifestProcessor.js => ManifestProcessor.jsm} (95%)
rename dom/manifest/{ValueExtractor.js => ValueExtractor.jsm} (96%)
delete mode 100644 dom/manifest/WebManifest.jsm
create mode 100644 dom/manifest/test/browser_hasManifestLink.js
create mode 100644 toolkit/modules/PromiseMessage.jsm
--HG--
rename : dom/manifest/ImageObjectProcessor.js => dom/manifest/ImageObjectProcessor.jsm
rename : dom/manifest/ManifestProcessor.js => dom/manifest/ManifestProcessor.jsm
rename : dom/manifest/ValueExtractor.js => dom/manifest/ValueExtractor.jsm
2015-07-08 13:26:32 +10:00
Birunthan Mohanathas
89f3f916ee
Bug 968520 - Use move assignment instead of fallible copy assignment in nsCSPUtils.cpp. r=froydnj
2015-07-07 11:27:03 -07:00
Dragana Damjanovic
7987d2203e
Bug 905127 - Part 2 - remove unnecessary nsNetUtil.h includes r=jduell
2015-07-06 07:55:00 +02:00
Emanuel Hoogeveen
7d1e52f2ff
Bug 905127 - Part 1 - Make some functions from nsNetUtil not inline. r=jduell
2015-07-07 04:17:00 +02:00
Ehsan Akhgari
3b2798f9f5
Bug 1175299 - Translate the content policy type obtained in nsMixedContentBlocker::AsyncOnChannelRedirect to an external one before invoking the content policy implementation; r=smaug
2015-06-16 21:17:01 -04:00
Ehsan Akhgari
554db0e419
Bug 1175114 - Translate the content policy type obtained in CSPService::AsyncOnChannelRedirect to an external one before invoking the content policy implementation; r=smaug
2015-06-16 14:49:56 -04:00
Ehsan Akhgari
72aef1875b
Bug 1175122 - Add more assertions to the in-tree content policy implementations to ensure that they receive external content policy types; r=baku
2015-06-16 11:38:53 -04:00
Ehsan Akhgari
8f750a75b2
Bug 1174307 - Add some internal content policy types for the purpose of reflecting them on RequestContext; r=sicking
...
These new content policy types will be internal ones that we will map
to external nsContentPolicyTypes before passing them to content policy
implementations.
2015-06-15 15:40:26 -04:00
Christoph Kerschbaumer
66b8827044
Bug 1117650 - Part 3: Move all CSP tests into dom/security/test. r=sstamm
...
--HG--
rename : dom/base/test/TestCSPParser.cpp => dom/security/test/TestCSPParser.cpp
rename : dom/base/test/csp/browser.ini => dom/security/test/csp/browser.ini
rename : dom/base/test/csp/browser_test_web_manifest.js => dom/security/test/csp/browser_test_web_manifest.js
rename : dom/base/test/csp/browser_test_web_manifest_mixed_content.js => dom/security/test/csp/browser_test_web_manifest_mixed_content.js
rename : dom/base/test/csp/chrome.ini => dom/security/test/csp/chrome.ini
rename : dom/base/test/csp/file_CSP.css => dom/security/test/csp/file_CSP.css
rename : dom/base/test/csp/file_CSP.sjs => dom/security/test/csp/file_CSP.sjs
rename : dom/base/test/csp/file_csp_allow_https_schemes.html => dom/security/test/csp/file_allow_https_schemes.html
rename : dom/base/test/csp/file_base-uri.html => dom/security/test/csp/file_base-uri.html
rename : dom/base/test/csp/file_blob_data_schemes.html => dom/security/test/csp/file_blob_data_schemes.html
rename : dom/base/test/csp/file_CSP_bug663567.xsl => dom/security/test/csp/file_bug663567.xsl
rename : dom/base/test/csp/file_CSP_bug663567_allows.xml => dom/security/test/csp/file_bug663567_allows.xml
rename : dom/base/test/csp/file_CSP_bug663567_allows.xml^headers^ => dom/security/test/csp/file_bug663567_allows.xml^headers^
rename : dom/base/test/csp/file_CSP_bug663567_blocks.xml => dom/security/test/csp/file_bug663567_blocks.xml
rename : dom/base/test/csp/file_CSP_bug663567_blocks.xml^headers^ => dom/security/test/csp/file_bug663567_blocks.xml^headers^
rename : dom/base/test/csp/file_csp_bug768029.html => dom/security/test/csp/file_bug768029.html
rename : dom/base/test/csp/file_csp_bug768029.sjs => dom/security/test/csp/file_bug768029.sjs
rename : dom/base/test/csp/file_csp_bug773891.html => dom/security/test/csp/file_bug773891.html
rename : dom/base/test/csp/file_csp_bug773891.sjs => dom/security/test/csp/file_bug773891.sjs
rename : dom/base/test/csp/file_CSP_bug802872.html => dom/security/test/csp/file_bug802872.html
rename : dom/base/test/csp/file_CSP_bug802872.html^headers^ => dom/security/test/csp/file_bug802872.html^headers^
rename : dom/base/test/csp/file_CSP_bug802872.js => dom/security/test/csp/file_bug802872.js
rename : dom/base/test/csp/file_CSP_bug802872.sjs => dom/security/test/csp/file_bug802872.sjs
rename : dom/base/test/csp/file_bug836922_npolicies.html => dom/security/test/csp/file_bug836922_npolicies.html
rename : dom/base/test/csp/file_bug836922_npolicies.html^headers^ => dom/security/test/csp/file_bug836922_npolicies.html^headers^
rename : dom/base/test/csp/file_bug836922_npolicies_ro_violation.sjs => dom/security/test/csp/file_bug836922_npolicies_ro_violation.sjs
rename : dom/base/test/csp/file_bug836922_npolicies_violation.sjs => dom/security/test/csp/file_bug836922_npolicies_violation.sjs
rename : dom/base/test/csp/file_CSP_bug885433_allows.html => dom/security/test/csp/file_bug885433_allows.html
rename : dom/base/test/csp/file_CSP_bug885433_allows.html^headers^ => dom/security/test/csp/file_bug885433_allows.html^headers^
rename : dom/base/test/csp/file_CSP_bug885433_blocks.html => dom/security/test/csp/file_bug885433_blocks.html
rename : dom/base/test/csp/file_CSP_bug885433_blocks.html^headers^ => dom/security/test/csp/file_bug885433_blocks.html^headers^
rename : dom/base/test/csp/file_bug886164.html => dom/security/test/csp/file_bug886164.html
rename : dom/base/test/csp/file_bug886164.html^headers^ => dom/security/test/csp/file_bug886164.html^headers^
rename : dom/base/test/csp/file_bug886164_2.html => dom/security/test/csp/file_bug886164_2.html
rename : dom/base/test/csp/file_bug886164_2.html^headers^ => dom/security/test/csp/file_bug886164_2.html^headers^
rename : dom/base/test/csp/file_bug886164_3.html => dom/security/test/csp/file_bug886164_3.html
rename : dom/base/test/csp/file_bug886164_3.html^headers^ => dom/security/test/csp/file_bug886164_3.html^headers^
rename : dom/base/test/csp/file_bug886164_4.html => dom/security/test/csp/file_bug886164_4.html
rename : dom/base/test/csp/file_bug886164_4.html^headers^ => dom/security/test/csp/file_bug886164_4.html^headers^
rename : dom/base/test/csp/file_bug886164_5.html => dom/security/test/csp/file_bug886164_5.html
rename : dom/base/test/csp/file_bug886164_5.html^headers^ => dom/security/test/csp/file_bug886164_5.html^headers^
rename : dom/base/test/csp/file_bug886164_6.html => dom/security/test/csp/file_bug886164_6.html
rename : dom/base/test/csp/file_bug886164_6.html^headers^ => dom/security/test/csp/file_bug886164_6.html^headers^
rename : dom/base/test/csp/file_CSP_bug888172.html => dom/security/test/csp/file_bug888172.html
rename : dom/base/test/csp/file_CSP_bug888172.sjs => dom/security/test/csp/file_bug888172.sjs
rename : dom/base/test/csp/file_CSP_bug909029_none.html => dom/security/test/csp/file_bug909029_none.html
rename : dom/base/test/csp/file_CSP_bug909029_none.html^headers^ => dom/security/test/csp/file_bug909029_none.html^headers^
rename : dom/base/test/csp/file_CSP_bug909029_star.html => dom/security/test/csp/file_bug909029_star.html
rename : dom/base/test/csp/file_CSP_bug909029_star.html^headers^ => dom/security/test/csp/file_bug909029_star.html^headers^
rename : dom/base/test/csp/file_CSP_bug910139.sjs => dom/security/test/csp/file_bug910139.sjs
rename : dom/base/test/csp/file_CSP_bug910139.xml => dom/security/test/csp/file_bug910139.xml
rename : dom/base/test/csp/file_CSP_bug910139.xsl => dom/security/test/csp/file_bug910139.xsl
rename : dom/base/test/csp/file_CSP_bug941404.html => dom/security/test/csp/file_bug941404.html
rename : dom/base/test/csp/file_CSP_bug941404_xhr.html => dom/security/test/csp/file_bug941404_xhr.html
rename : dom/base/test/csp/file_CSP_bug941404_xhr.html^headers^ => dom/security/test/csp/file_bug941404_xhr.html^headers^
rename : dom/base/test/csp/file_connect-src-fetch.html => dom/security/test/csp/file_connect-src-fetch.html
rename : dom/base/test/csp/file_connect-src.html => dom/security/test/csp/file_connect-src.html
rename : dom/base/test/csp/file_dual_header_testserver.sjs => dom/security/test/csp/file_dual_header_testserver.sjs
rename : dom/base/test/csp/file_CSP_evalscript_main.html => dom/security/test/csp/file_evalscript_main.html
rename : dom/base/test/csp/file_CSP_evalscript_main.html^headers^ => dom/security/test/csp/file_evalscript_main.html^headers^
rename : dom/base/test/csp/file_CSP_evalscript_main.js => dom/security/test/csp/file_evalscript_main.js
rename : dom/base/test/csp/file_CSP_evalscript_main_allowed.html => dom/security/test/csp/file_evalscript_main_allowed.html
rename : dom/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^ => dom/security/test/csp/file_evalscript_main_allowed.html^headers^
rename : dom/base/test/csp/file_CSP_evalscript_main_allowed.js => dom/security/test/csp/file_evalscript_main_allowed.js
rename : dom/base/test/csp/file_form-action.html => dom/security/test/csp/file_form-action.html
rename : dom/base/test/csp/file_CSP_frameancestors.sjs => dom/security/test/csp/file_frameancestors.sjs
rename : dom/base/test/csp/file_CSP_frameancestors_main.html => dom/security/test/csp/file_frameancestors_main.html
rename : dom/base/test/csp/file_CSP_frameancestors_main.js => dom/security/test/csp/file_frameancestors_main.js
rename : dom/base/test/csp/file_hash_source.html => dom/security/test/csp/file_hash_source.html
rename : dom/base/test/csp/file_hash_source.html^headers^ => dom/security/test/csp/file_hash_source.html^headers^
rename : dom/base/test/csp/file_ignore_unsafe_inline.html => dom/security/test/csp/file_ignore_unsafe_inline.html
rename : dom/base/test/csp/file_CSP_inlinescript_main.html => dom/security/test/csp/file_inlinescript_main.html
rename : dom/base/test/csp/file_CSP_inlinescript_main.html^headers^ => dom/security/test/csp/file_inlinescript_main.html^headers^
rename : dom/base/test/csp/file_CSP_inlinescript_main_allowed.html => dom/security/test/csp/file_inlinescript_main_allowed.html
rename : dom/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^ => dom/security/test/csp/file_inlinescript_main_allowed.html^headers^
rename : dom/base/test/csp/file_CSP_inlinestyle_main.html => dom/security/test/csp/file_inlinestyle_main.html
rename : dom/base/test/csp/file_CSP_inlinestyle_main.html^headers^ => dom/security/test/csp/file_inlinestyle_main.html^headers^
rename : dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html => dom/security/test/csp/file_inlinestyle_main_allowed.html
rename : dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^ => dom/security/test/csp/file_inlinestyle_main_allowed.html^headers^
rename : dom/base/test/csp/file_csp_invalid_source_expression.html => dom/security/test/csp/file_invalid_source_expression.html
rename : dom/base/test/csp/file_leading_wildcard.html => dom/security/test/csp/file_leading_wildcard.html
rename : dom/base/test/csp/file_CSP_main.html => dom/security/test/csp/file_main.html
rename : dom/base/test/csp/file_CSP_main.html^headers^ => dom/security/test/csp/file_main.html^headers^
rename : dom/base/test/csp/file_CSP_main.js => dom/security/test/csp/file_main.js
rename : dom/base/test/csp/file_multi_policy_injection_bypass.html => dom/security/test/csp/file_multi_policy_injection_bypass.html
rename : dom/base/test/csp/file_multi_policy_injection_bypass.html^headers^ => dom/security/test/csp/file_multi_policy_injection_bypass.html^headers^
rename : dom/base/test/csp/file_multi_policy_injection_bypass_2.html => dom/security/test/csp/file_multi_policy_injection_bypass_2.html
rename : dom/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^ => dom/security/test/csp/file_multi_policy_injection_bypass_2.html^headers^
rename : dom/base/test/csp/file_nonce_source.html => dom/security/test/csp/file_nonce_source.html
rename : dom/base/test/csp/file_nonce_source.html^headers^ => dom/security/test/csp/file_nonce_source.html^headers^
rename : dom/base/test/csp/file_null_baseuri.html => dom/security/test/csp/file_null_baseuri.html
rename : dom/base/test/csp/file_csp_path_matching.html => dom/security/test/csp/file_path_matching.html
rename : dom/base/test/csp/file_csp_path_matching.js => dom/security/test/csp/file_path_matching.js
rename : dom/base/test/csp/file_csp_path_matching_incl_query.html => dom/security/test/csp/file_path_matching_incl_query.html
rename : dom/base/test/csp/file_csp_path_matching_redirect.html => dom/security/test/csp/file_path_matching_redirect.html
rename : dom/base/test/csp/file_csp_path_matching_redirect_server.sjs => dom/security/test/csp/file_path_matching_redirect_server.sjs
rename : dom/base/test/csp/file_policyuri_regression_from_multipolicy.html => dom/security/test/csp/file_policyuri_regression_from_multipolicy.html
rename : dom/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^ => dom/security/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
rename : dom/base/test/csp/file_policyuri_regression_from_multipolicy_policy => dom/security/test/csp/file_policyuri_regression_from_multipolicy_policy
rename : dom/base/test/csp/file_redirect_content.sjs => dom/security/test/csp/file_redirect_content.sjs
rename : dom/base/test/csp/file_redirect_report.sjs => dom/security/test/csp/file_redirect_report.sjs
rename : dom/base/test/csp/file_csp_redirects_main.html => dom/security/test/csp/file_redirects_main.html
rename : dom/base/test/csp/file_csp_redirects_page.sjs => dom/security/test/csp/file_redirects_page.sjs
rename : dom/base/test/csp/file_csp_redirects_resource.sjs => dom/security/test/csp/file_redirects_resource.sjs
rename : dom/base/test/csp/file_csp_referrerdirective.html => dom/security/test/csp/file_referrerdirective.html
rename : dom/base/test/csp/file_csp_report.html => dom/security/test/csp/file_report.html
rename : dom/base/test/csp/file_report_uri_missing_in_report_only_header.html => dom/security/test/csp/file_report_uri_missing_in_report_only_header.html
rename : dom/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^ => dom/security/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
rename : dom/base/test/csp/file_scheme_relative_sources.js => dom/security/test/csp/file_scheme_relative_sources.js
rename : dom/base/test/csp/file_scheme_relative_sources.sjs => dom/security/test/csp/file_scheme_relative_sources.sjs
rename : dom/base/test/csp/file_self_none_as_hostname_confusion.html => dom/security/test/csp/file_self_none_as_hostname_confusion.html
rename : dom/base/test/csp/file_self_none_as_hostname_confusion.html^headers^ => dom/security/test/csp/file_self_none_as_hostname_confusion.html^headers^
rename : dom/base/test/csp/file_subframe_run_js_if_allowed.html => dom/security/test/csp/file_subframe_run_js_if_allowed.html
rename : dom/base/test/csp/file_subframe_run_js_if_allowed.html^headers^ => dom/security/test/csp/file_subframe_run_js_if_allowed.html^headers^
rename : dom/base/test/csp/file_csp_testserver.sjs => dom/security/test/csp/file_testserver.sjs
rename : dom/base/test/csp/file_CSP_web_manifest.html => dom/security/test/csp/file_web_manifest.html
rename : dom/base/test/csp/file_CSP_web_manifest.json => dom/security/test/csp/file_web_manifest.json
rename : dom/base/test/csp/file_CSP_web_manifest.json^headers^ => dom/security/test/csp/file_web_manifest.json^headers^
rename : dom/base/test/csp/file_CSP_web_manifest_https.html => dom/security/test/csp/file_web_manifest_https.html
rename : dom/base/test/csp/file_CSP_web_manifest_https.json => dom/security/test/csp/file_web_manifest_https.json
rename : dom/base/test/csp/file_CSP_web_manifest_mixed_content.html => dom/security/test/csp/file_web_manifest_mixed_content.html
rename : dom/base/test/csp/file_CSP_web_manifest_remote.html => dom/security/test/csp/file_web_manifest_remote.html
rename : dom/base/test/csp/file_worker_redirect.html => dom/security/test/csp/file_worker_redirect.html
rename : dom/base/test/csp/file_worker_redirect.sjs => dom/security/test/csp/file_worker_redirect.sjs
rename : dom/base/test/csp/referrerdirective.sjs => dom/security/test/csp/referrerdirective.sjs
rename : dom/base/test/csp/test_301_redirect.html => dom/security/test/csp/test_301_redirect.html
rename : dom/base/test/csp/test_302_redirect.html => dom/security/test/csp/test_302_redirect.html
rename : dom/base/test/csp/test_303_redirect.html => dom/security/test/csp/test_303_redirect.html
rename : dom/base/test/csp/test_307_redirect.html => dom/security/test/csp/test_307_redirect.html
rename : dom/base/test/csp/test_CSP.html => dom/security/test/csp/test_CSP.html
rename : dom/base/test/csp/test_csp_allow_https_schemes.html => dom/security/test/csp/test_allow_https_schemes.html
rename : dom/base/test/csp/test_base-uri.html => dom/security/test/csp/test_base-uri.html
rename : dom/base/test/csp/test_blob_data_schemes.html => dom/security/test/csp/test_blob_data_schemes.html
rename : dom/base/test/csp/test_CSP_bug663567.html => dom/security/test/csp/test_bug663567.html
rename : dom/base/test/csp/test_csp_bug768029.html => dom/security/test/csp/test_bug768029.html
rename : dom/base/test/csp/test_csp_bug773891.html => dom/security/test/csp/test_bug773891.html
rename : dom/base/test/csp/test_CSP_bug802872.html => dom/security/test/csp/test_bug802872.html
rename : dom/base/test/csp/test_bug836922_npolicies.html => dom/security/test/csp/test_bug836922_npolicies.html
rename : dom/base/test/csp/test_CSP_bug885433.html => dom/security/test/csp/test_bug885433.html
rename : dom/base/test/csp/test_bug886164.html => dom/security/test/csp/test_bug886164.html
rename : dom/base/test/csp/test_CSP_bug888172.html => dom/security/test/csp/test_bug888172.html
rename : dom/base/test/csp/test_CSP_bug909029.html => dom/security/test/csp/test_bug909029.html
rename : dom/base/test/csp/test_CSP_bug910139.html => dom/security/test/csp/test_bug910139.html
rename : dom/base/test/csp/test_CSP_bug941404.html => dom/security/test/csp/test_bug941404.html
rename : dom/base/test/csp/test_bug949549.html => dom/security/test/csp/test_bug949549.html
rename : dom/base/test/csp/test_connect-src.html => dom/security/test/csp/test_connect-src.html
rename : dom/base/test/csp/test_dual_header.html => dom/security/test/csp/test_dual_header.html
rename : dom/base/test/csp/test_CSP_evalscript.html => dom/security/test/csp/test_evalscript.html
rename : dom/base/test/csp/test_form-action.html => dom/security/test/csp/test_form-action.html
rename : dom/base/test/csp/test_CSP_frameancestors.html => dom/security/test/csp/test_frameancestors.html
rename : dom/base/test/csp/test_hash_source.html => dom/security/test/csp/test_hash_source.html
rename : dom/base/test/csp/test_ignore_unsafe_inline.html => dom/security/test/csp/test_ignore_unsafe_inline.html
rename : dom/base/test/csp/test_CSP_inlinescript.html => dom/security/test/csp/test_inlinescript.html
rename : dom/base/test/csp/test_CSP_inlinestyle.html => dom/security/test/csp/test_inlinestyle.html
rename : dom/base/test/csp/test_csp_invalid_source_expression.html => dom/security/test/csp/test_invalid_source_expression.html
rename : dom/base/test/csp/test_leading_wildcard.html => dom/security/test/csp/test_leading_wildcard.html
rename : dom/base/test/csp/test_multi_policy_injection_bypass.html => dom/security/test/csp/test_multi_policy_injection_bypass.html
rename : dom/base/test/csp/test_nonce_source.html => dom/security/test/csp/test_nonce_source.html
rename : dom/base/test/csp/test_null_baseuri.html => dom/security/test/csp/test_null_baseuri.html
rename : dom/base/test/csp/test_csp_path_matching.html => dom/security/test/csp/test_path_matching.html
rename : dom/base/test/csp/test_csp_path_matching_redirect.html => dom/security/test/csp/test_path_matching_redirect.html
rename : dom/base/test/csp/test_policyuri_regression_from_multipolicy.html => dom/security/test/csp/test_policyuri_regression_from_multipolicy.html
rename : dom/base/test/csp/test_csp_redirects.html => dom/security/test/csp/test_redirects.html
rename : dom/base/test/csp/test_CSP_referrerdirective.html => dom/security/test/csp/test_referrerdirective.html
rename : dom/base/test/csp/test_csp_report.html => dom/security/test/csp/test_report.html
rename : dom/base/test/csp/test_report_uri_missing_in_report_only_header.html => dom/security/test/csp/test_report_uri_missing_in_report_only_header.html
rename : dom/base/test/csp/test_scheme_relative_sources.html => dom/security/test/csp/test_scheme_relative_sources.html
rename : dom/base/test/csp/test_self_none_as_hostname_confusion.html => dom/security/test/csp/test_self_none_as_hostname_confusion.html
rename : dom/base/test/csp/test_subframe_run_js_if_allowed.html => dom/security/test/csp/test_subframe_run_js_if_allowed.html
rename : dom/base/test/csp/test_worker_redirect.html => dom/security/test/csp/test_worker_redirect.html
rename : dom/base/test/unit/test_cspreports.js => dom/security/test/unit/test_csp_reports.js
extra : rebase_source : 009d78b5e741c3a6ed10744986f7b0841720f6c8
2015-06-08 16:21:50 -07:00
Christoph Kerschbaumer
6eaa39a0e4
Bug 1117650 - Part 2: Move all MixedContent tests into dom/security/test. r=tanvi
...
--HG--
rename : dom/base/test/mixedcontentblocker/bug803225_test_mailto.html => dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html => dom/security/test/mixedcontentblocker/file_frameNavigation.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html => dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html => dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html => dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html => dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html => dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_main.html => dom/security/test/mixedcontentblocker/file_main.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html => dom/security/test/mixedcontentblocker/file_main_bug803225.html
rename : dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py => dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py
rename : dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs => dom/security/test/mixedcontentblocker/file_server.sjs
rename : dom/base/test/mixedcontentblocker/mochitest.ini => dom/security/test/mixedcontentblocker/mochitest.ini
rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html => dom/security/test/mixedcontentblocker/test_bug803225.html
rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html => dom/security/test/mixedcontentblocker/test_frameNavigation.html
rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html => dom/security/test/mixedcontentblocker/test_main.html
extra : rebase_source : ea9c355fb48d4c42d31135733f9904e510713edc
2015-06-08 16:21:43 -07:00
Christoph Kerschbaumer
90902a1a7f
Bug 1117650 - Part 1: Move all CORS tests into dom/security/test. r=sicking
...
--HG--
rename : dom/base/test/file_CrossSiteXHR_cache_server.sjs => dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs
rename : dom/base/test/file_CrossSiteXHR_inner.html => dom/security/test/cors/file_CrossSiteXHR_inner.html
rename : dom/base/test/file_CrossSiteXHR_inner.jar => dom/security/test/cors/file_CrossSiteXHR_inner.jar
rename : dom/base/test/file_CrossSiteXHR_inner_data.sjs => dom/security/test/cors/file_CrossSiteXHR_inner_data.sjs
rename : dom/base/test/file_CrossSiteXHR_server.sjs => dom/security/test/cors/file_CrossSiteXHR_server.sjs
rename : dom/base/test/test_CrossSiteXHR.html => dom/security/test/cors/test_CrossSiteXHR.html
rename : dom/base/test/test_CrossSiteXHR_cache.html => dom/security/test/cors/test_CrossSiteXHR_cache.html
rename : dom/base/test/test_CrossSiteXHR_origin.html => dom/security/test/cors/test_CrossSiteXHR_origin.html
extra : rebase_source : c57a90e41f381ac5322298c32857c26764acf2de
2015-06-08 16:21:31 -07:00
Eric Rahm
75c4bebb79
Bug 1165515 - Part 13-2: Replace usage of PRLogModuleLevel and PR_LOG_*. rs=froydnj
...
This is straightforward mapping of PR_LOG levels to their LogLevel
counterparts:
PR_LOG_ERROR -> LogLevel::Error
PR_LOG_WARNING -> LogLevel::Warning
PR_LOG_WARN -> LogLevel::Warning
PR_LOG_INFO -> LogLevel::Info
PR_LOG_DEBUG -> LogLevel::Debug
PR_LOG_NOTICE -> LogLevel::Debug
PR_LOG_VERBOSE -> LogLevel::Verbose
Instances of PRLogModuleLevel were mapped to a fully qualified
mozilla::LogLevel, instances of PR_LOG levels in #defines were mapped to a
fully qualified mozilla::LogLevel::* level, and all other instances were
mapped to us a shorter format of LogLevel::*.
Bustage for usage of the non-fully qualified LogLevel were fixed by adding
|using mozilla::LogLevel;| where appropriate.
2015-06-03 15:25:57 -07:00
Eric Rahm
f50b813989
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-03 15:22:28 -07:00
Marcos Caceres
8fc79cb285
Bug 1089255 - Implement and test manifest-src CSP directive. r=bholley, r=dveditz, r=ckerschb
...
---
dom/base/nsContentPolicyUtils.h | 1 +
dom/base/nsDataDocumentContentPolicy.cpp | 3 +-
dom/base/nsIContentPolicy.idl | 2 +-
dom/base/nsIContentPolicyBase.idl | 7 +-
dom/base/nsISimpleContentPolicy.idl | 2 +-
dom/base/test/csp/browser.ini | 4 +
dom/base/test/csp/browser_test_web_manifest.js | 265 +++++++++++++++++++++
.../csp/browser_test_web_manifest_mixed_content.js | 55 +++++
dom/base/test/csp/file_CSP_web_manifest.html | 6 +
dom/base/test/csp/file_CSP_web_manifest.json | 1 +
.../test/csp/file_CSP_web_manifest.json^headers^ | 1 +
dom/base/test/csp/file_CSP_web_manifest_https.html | 4 +
dom/base/test/csp/file_CSP_web_manifest_https.json | 1 +
.../csp/file_CSP_web_manifest_mixed_content.html | 9 +
.../test/csp/file_CSP_web_manifest_remote.html | 8 +
dom/base/test/csp/file_csp_testserver.sjs | 14 +-
dom/base/test/csp/mochitest.ini | 7 +
dom/base/test/moz.build | 5 +-
dom/fetch/InternalRequest.cpp | 3 +
dom/fetch/InternalRequest.h | 2 +-
.../security/nsIContentSecurityPolicy.idl | 3 +-
dom/ipc/manifestMessages.js | 25 +-
dom/security/nsCSPUtils.cpp | 7 +
dom/security/nsCSPUtils.h | 10 +-
dom/security/nsMixedContentBlocker.cpp | 1 +
dom/webidl/CSPDictionaries.webidl | 1 +
extensions/permissions/nsContentBlocker.cpp | 6 +-
netwerk/mime/nsMimeTypes.h | 1 +
28 files changed, 439 insertions(+), 15 deletions(-)
create mode 100644 dom/base/test/csp/browser.ini
create mode 100644 dom/base/test/csp/browser_test_web_manifest.js
create mode 100644 dom/base/test/csp/browser_test_web_manifest_mixed_content.js
create mode 100644 dom/base/test/csp/file_CSP_web_manifest.html
create mode 100644 dom/base/test/csp/file_CSP_web_manifest.json
create mode 100644 dom/base/test/csp/file_CSP_web_manifest.json^headers^
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_https.html
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_https.json
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_mixed_content.html
create mode 100644 dom/base/test/csp/file_CSP_web_manifest_remote.html
2015-06-02 15:42:19 -04:00
Carsten "Tomcat" Book
5471309381
Backed out 14 changesets (bug 1165515) for linux x64 e10s m2 test failures
...
Backed out changeset d68dcf2ef372 (bug 1165515)
Backed out changeset 7c3b45a47811 (bug 1165515)
Backed out changeset b668b617bef2 (bug 1165515)
Backed out changeset d0916e1283a2 (bug 1165515)
Backed out changeset ac4dc7489942 (bug 1165515)
Backed out changeset e9632ce8bc65 (bug 1165515)
Backed out changeset c16d215cc7e4 (bug 1165515)
Backed out changeset e4d474f3c51a (bug 1165515)
Backed out changeset d87680bf9f7c (bug 1165515)
Backed out changeset b3c0a45ba99e (bug 1165515)
Backed out changeset 9370fa197674 (bug 1165515)
Backed out changeset 50970d668ca1 (bug 1165515)
Backed out changeset ffa4eb6d24b9 (bug 1165515)
Backed out changeset 5fcf1203cc1d (bug 1165515)
--HG--
extra : rebase_source : 6fb850d063cbabe738f97f0380302153e3eae97a
2015-06-02 13:05:56 +02:00