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
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
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
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
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
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
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
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
f50b813989
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-03 15:22:28 -07:00
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
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
a9afd68cef
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-01 22:17:33 -07:00
141e0ff4a2
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-01 22:17:19 -07:00
4e9f80ed2e
Backed out 14 changesets (bug 1165515) for b2g mochitest-6 permafail CLOSED TREE
...
Backed out changeset 9b97e2aa2ed9 (bug 1165515)
Backed out changeset 150606c022a2 (bug 1165515)
Backed out changeset 4e875a488349 (bug 1165515)
Backed out changeset 467e7feeb546 (bug 1165515)
Backed out changeset d6b6cc373197 (bug 1165515)
Backed out changeset 0615265b593c (bug 1165515)
Backed out changeset fafd1dce9f08 (bug 1165515)
Backed out changeset d1df869245f9 (bug 1165515)
Backed out changeset 6876a7c63611 (bug 1165515)
Backed out changeset b7841c94a9a3 (bug 1165515)
Backed out changeset e5e3617f7c73 (bug 1165515)
Backed out changeset 39be3db95978 (bug 1165515)
Backed out changeset 0ec74176f8de (bug 1165515)
Backed out changeset 5b928dd10d71 (bug 1165515)
2015-06-01 17:57:58 -07:00
f82c0e7caf
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-01 14:31:01 -07:00
dc090e3fe5
Bug 1165515 - Part 3: Convert PR_LOG_TEST to MOZ_LOG_TEST. r=froydnj
2015-06-01 14:31:00 -07:00
180b572edb
Bug 968520 - Add mozilla::fallible to FallibleTArray::AppendElement calls. r=froydnj
2015-05-28 11:07:44 -07:00
f679dfded5
Bug 1129999 - Implement CSP devtool using GCLI; CSP to JSON (r=sstamm,bholley)
2015-05-21 11:16:04 -07:00
3925a960aa
Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj
2015-05-21 13:22:04 -07:00
4879ae86f4
Bug 1165518 - Part 2: Replace prlog.h with Logging.h. rs=froydnj
2015-05-19 11:15:34 -07:00
1f2eec82b8
Bug 1163196 - Part 2: Wrap expensive calls in PR_LOG_TEST. r=froydnj
...
Check that logging is enabled before performing potentially expensive
operations.
2015-05-11 14:22:04 -07:00
f9e1913937
Bug 1163196 - Part 1: Remove instances of #ifdef PR_LOGGING in dom/security. r=froydnj
...
PR_LOGGING is now always defined, we can remove #ifdefs checking for it.
2015-05-11 14:22:03 -07:00
9e8f4b219e
Bug 1152551, part 2 - Fix mode lines in dom/. r=jst
2015-05-03 15:32:37 -04:00
9cbb1e7539
Bug 1157451. Make nsCORSListenerProxy::Init take an enum, not a boolean, to indicate what to do with data: URIs. And make it required, not defaulted to disallowing. r=smaug
2015-04-22 20:30:10 -04:00
cb54385682
Bug 1156632 - Remove unused forward class declarations - patch 4 - netwerk image and dom, r=ehsan
2015-04-22 08:29:20 +02:00
1e6cdad33c
Bug 1153988 - create nsNullPrincipals directly, rather than going through do_CreateInstance; r=smaug
...
There's a better way to create null principals than
do_CreateInstance("@mozilla.org/nullprincipal;1"). Let's do that and
save ourselves some XPCOM overhead.
2015-04-13 14:47:41 -04:00
ac8b060203
Bug 1148732 - When checking a document's scheme, check the innermost uri. r=dveditz, smaug
2015-04-15 10:18:27 -07:00
af34e14f2b
Backed out changeset 050848a5273c (bug 1153988) for Windows build bustage CLOSED TREE
2015-04-14 14:42:59 -07:00
4e3c075424
Bug 1153988 - create nsNullPrincipals directly, rather than going through do_CreateInstance; r=smaug
...
There's a better way to create null principals than
do_CreateInstance("@mozilla.org/nullprincipal;1"). Let's do that and
save ourselves some XPCOM overhead.
2015-04-13 14:47:41 -04:00
b2c8937b41
Bug 1004703 - ignore 'unsafe-inline' if nonce- or hash-source specified (r=sstamm)
...
--HG--
extra : rebase_source : 119d3903ba156300f49f097efe2d18bbf8c8a6b5
2015-04-07 09:06:05 -07:00
7c03443ac9
Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions (r=fabrice,pauljt)
2015-03-25 15:54:13 -07:00
0b74f99a37
Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions (r=sstamm)
2015-02-06 14:54:11 -08:00
972a6213f9
Bug 1147996 - Enable interception of CSP reports through service workers; r=nsm
...
Currently when sending a CSP report, HttpBaseChannel::ShouldIntercept tries to
get access to the nsINetworkInterceptController interface through the channel's
notification callbacks, but in this case the notification callback is the
CSPReportRedirectSink object (thanks to nsCORSListenerProxy::Init).
This patch extends CSPReportRedirectSink to make it aware of
nsINetworkInterceptController, and have it route the request for
nsINetworkInterceptController correctly to the docshell without the need to
mess with the notification callbacks.
This will be tested in bug 1147699.
2015-03-28 16:28:40 -04:00
e2ac45480d
Bug 1147695 - Enable interception of beacons through service workers; r=nsm
...
Currently when sending a beacon, HttpBaseChannel::ShouldIntercept tries
to get access to the nsINetworkInterceptController interface through the
channel's notification callbacks, but in this case the notification
callback is the nsCORSListenerProxy object (thanks to
nsCORSListenerProxy::Init).
nsCORSListenerProxy already knows how to forward calls to
nsIInterfaceRequestor::GetInterface to mOuterNotificationCallbacks, and
ShouldIntercept calls GetInterfce. But mOuterNotificationCallbacks is
set by default to the callbacks of the channel at the time
nsCORSListenerProxy is called, and the callbacks on this channel is
intentionally null, so ShouldIntercept bails out and the beacon never
gets intercepted.
This patch extends nsCORSListenerProxy to make it aware of
nsINetworkInterceptController, and have it route the request for
nsINetworkInterceptController correctly to the docshell without the need
to mess with the notification callbacks.
This will be tested in bug 1147699.
2015-03-28 16:28:37 -04:00
e6f385fb3d
Bug 1148527 - Indentation fix after bug 1145631, r=ehsan
2015-03-27 18:52:19 +00:00
9543f7d3ac
Bug 1147026 - CSP should ignore query string when checking a resource load (r=dveditz)
2015-03-25 22:09:10 -07:00
9bd1ff3802
Bug 1082947 - Make sure the security state is set properly in nsMixedContentBlocker. r=smaug
2015-03-25 11:23:42 -07:00
d10e6067e4
Bug 1082837 - Use nsresult for static ShouldLoad and use NS_IMETHODIMP for nsIContentPolicy::ShouldLoad(). CLOSED TREE
2015-03-24 10:51:15 -07:00
3faad06490
Bug 1082837 - Call content policies on cached image redirects in imgLoader::ValidateSecurityInfo. Content policies check the last hop (final uri) of the cached image. For Mixed Content Blocker, we do an additional check to see if any of the intermediary hops went through an insecure redirect. r=smaug, feedback=seth
2015-03-24 09:18:48 -07:00
7a7e74fe7c
Bug 1134324 - Set CORS mode and credentials on Fetch event Request. r=michal
...
renames fetch to fetchXHR() since fetch() is now a superpower.
--HG--
extra : transplant_source : %DA%00%E38%A6%0Fw%DA%26%D3%A9q%AE%A6%FE%BA%81%AA%EEB
2015-03-17 08:47:02 -07:00
5a963d1339
Backed out changesets 772945b1130d, cb83b6efa9ea, and 5f23080673ee (bug 1086999) for Gaia context_menu_test.js failures.
...
CLOSED TREE
2015-03-23 14:22:23 -04:00
0396d44b7d
Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions (r=sstamm)
2015-02-06 14:54:11 -08:00
883849ee32
Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
...
This patch was automatically generated using the following script:
function convert() {
echo "Converting $1 to $2..."
find . \
! -wholename "*/.git*" \
! -wholename "obj-ff-dbg*" \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.c" \
-o -iname "*.cc" \
-o -iname "*.idl" \
-o -iname "*.ipdl" \
-o -iname "*.ipdlh" \
-o -iname "*.mm" \) | \
xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}
convert MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
a3a98f2531
Bug 1138895 - Use proper origin for CSP fast path cache. r=geekboy
2015-03-08 09:21:00 -04:00
8761a49c15
Bug 1084504 - fix Mixed Content Blocking for redirects in e10s. r=mrbkap
2015-02-19 17:01:04 -08:00
7413eecfda
Bug 881830 - Make CORS redirect handling ignore redirects due to an STS upgrade. r=bz
2015-02-10 08:00:00 -05:00
b83ba6b825
Backed out 4 changesets (bug 671389) for frequent B2G debug test_tcpsocket_client_and_server_basics.html crashes.
...
Backed out changeset b782435e5640 (bug 671389)
Backed out changeset 0f8d62109bfe (bug 671389)
Backed out changeset 8d6021f66c49 (bug 671389)
Backed out changeset cd3e227df9dc (bug 671389)
2015-02-05 16:48:18 -05:00
53375db2ef
Bug 671389 - Part 1: Implement CSP sandbox directive r=ckerschb,smaug
2015-02-03 23:40:00 +01:00
2febb6d0f8
Bug 1121824 - Improve CORS console messages when request is blocked (r=sicking)
2015-01-22 17:20:58 -08:00
e8bc4eda67
Backed out changeset 0287d2e29d56 (bug 1121824) for m-1 test failures on a CLOSED TREE
2015-01-22 08:29:13 +01:00
Ehsan Akhgari
Christoph Kerschbaumer
Eric Rahm
Marcos Caceres
Carsten "Tomcat" Book
Wes Kocher
Birunthan Mohanathas
Andrew McCreight
Boris Zbarsky
Andrea Marchesini
Nathan Froyd
Tanvi Vyas
Tanvi Vyas
Nikhil Marathe
Ryan VanderMeulen
Alexandre Lissy
Honza Bambas
Deian Stefan