Skip to content

Commit 805b81a

Browse files
[subresource-integrity] remove spurious HTML integration 他
Integrity-Policy: remove spurious HTML integration w3c/webappsec-subresource-integrity@2e039a4 Add exception for local URLs (blob, data, allow) w3c/webappsec-subresource-integrity@7d06193 Make JSON valid w3c/webappsec-subresource-integrity@539e4d2
1 parent 2b61052 commit 805b81a

File tree

1 file changed

+44
-73
lines changed

1 file changed

+44
-73
lines changed

webappsec-subresource-integrity-ja.html

Lines changed: 44 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116

117117
●●options
118118

119-
spec_date:2025-05-27
120-
trans_update:2025-05-28
119+
spec_date:2025-06-05
120+
trans_update:2025-06-06
121121
source_checked:210222
122122
page_state_key:WEBAPPSEC
123123
original_url:https://w3c.github.io/webappsec-subresource-integrity/
@@ -452,8 +452,6 @@
452452
~source:#source
453453
行先:#destination
454454
完全性~施策:#integrity-policy
455-
報告のみの完全性~施策:#report-only-integrity-policy
456-
完全性~施策~構造体:#integrity-policy-struct
457455
iPs.~source群:#sources
458456
iPs.阻止される行先~群:#blocked-destinations
459457
iPs.報告先~群:#endpoints
@@ -501,6 +499,7 @@
501499
rq.完全性~metadata:~FETCH#concept-request-integrity-metadata
502500
~main~fetch:~FETCH#concept-main-fetch
503501
~main~fetch:~FETCH#main-fetch
502+
局所的な~URL:~FETCH#is-local
504503

505504
有構造~header:~STRUCTURED-FIELDS#structured-header
506505
~sf辞書:~STRUCTURED-FIELDS#sf-dictionary
@@ -510,15 +509,17 @@
510509
~field値:~HTTPinfra#field-value
511510

512511
施策~容器:~ORIGIN#policy-container
512+
pC.完全性~施策:~ORIGIN#policy-container-integrity-policy
513+
pC.報告のみの完全性~施策:~ORIGIN#policy-container-report-only-integrity-policy
513514
~fetch応答から施策~容器を作成する:~ORIGIN#creating-a-policy-container-from-a-fetch-response
514515
結付けられた文書:~WINDOW#concept-document-window
515516
enV.~secureな文脈:~WAPI#secure-context
516517
enV.大域~obj:~WAPI#concept-settings-object-global
517518
wG.~URL:~WORKERS#concept-workerglobalscope-url
518519
doc.~URL:~DOM4#concept-document-url
519520
doc.~URL:~DOM4#dom-document-url
520-
報告~内の利用-用に~URLを剥ぐ:~CSP3#strip-url-for-use-in-reports
521-
報告~内の利用-用に~URLを剥ぐ:~TR/CSP3/#strip-url-for-use-in-reports
521+
522+
報告~内の利用-用に~URLを剥ぐ:~REPORTING#strip-url-for-use-in-reports
522523
報告を生成して~queueする:~REPORTING#generate-and-queue-a-report
523524
~REPORTING#generate-and-queue-a-report-context
524525
~REPORTING#generate-and-queue-a-report-type
@@ -1767,11 +1768,11 @@ <h3 title="Integrity-Policy">3.8. 完全性~施策~header</h3>
17671768
</p>
17681769

17691770
<p>
1770-
`完全性~施策~構造体@
1771+
`完全性~施策@
17711772
は、
17721773
次に挙げる~itemからなる`構造体$である:
17731774
1774-
An integrity policy struct, is a struct that contains the following:
1775+
An integrity policy, is a struct that contains the following:
17751776
</p>
17761777
<ul>
17771778
<li>
@@ -1812,9 +1813,9 @@ <h3 title="Integrity-Policy">3.8. 完全性~施策~header</h3>
18121813
</p>
18131814
<ol>
18141815
<li>
1815-
%完全性~施策 ~LET 新たな`完全性~施策~構造体$
1816+
%完全性~施策 ~LET 新たな`完全性~施策$
18161817
1817-
Let integrityPolicy be a new integrity policy struct.
1818+
Let integrityPolicy be a new integrity policy.
18181819
</li>
18191820
<li>
18201821
%辞書 ~LET %~header群 から`有構造~field値を取得する$( %~header名, `辞書^i )
@@ -1919,7 +1920,7 @@ <h4 title="Parse Integrity-Policy headers">3.8.1. 完全性~施策~headerを構
19191920
%施策 ~NEQ ~NULL
19201921
19211922
1922-
%容器 の`完全性~施策$ ~SET %施策
1923+
%容器 の`完全性~施策$pC ~SET %施策
19231924
19241925
If headers contains integrity-policy, set container’s integrity policy be the result of running processing an integrity policy with the corresponding header value.
19251926
</li>
@@ -1932,7 +1933,7 @@ <h4 title="Parse Integrity-Policy headers">3.8.1. 完全性~施策~headerを構
19321933
%報告のみ施策 ~NEQ ~NULL
19331934
19341935
1935-
%容器 の`報告のみの完全性~施策$ ~SET %報告のみ施策
1936+
%容器 の`報告のみの完全性~施策$pC ~SET %報告のみ施策
19361937
19371938
↑↑ If headers contains integrity-policy-report-only, set container’s report only integrity policy be the result of running processing an integrity policy with the corresponding header value.
19381939
</li>
@@ -1963,23 +1964,6 @@ <h4 title="Should request be blocked by Integrity Policy">3.8.2. 要請は完全
19631964
%構文解析-済み~metadata ~LET `完全性~metadataを構文解析する$( %要請 の`完全性~metadata$rq )
19641965
19651966
Let parsedMetadata be the result of calling parse metadata with request’s integrity metadata.
1966-
</li>
1967-
<li>
1968-
~IF[
1969-
%構文解析-済み~metadata は`空$でない
1970-
]~AND[
1971-
%要請 の`~mode$rq ~IN { `cors^l, `same-origin^l }
1972-
1973-
1974-
~RET `許容される^i
1975-
1976-
If parsedMetadata is not the empty set and request’s mode is either "cors" or "same-origin", return "Allowed".
1977-
1978-
↓ Let policy be policyContainer’s integrity policy.
1979-
1980-
↓ Let reportPolicy be policyContainer’s report only integrity policy.
1981-
1982-
↓ (不要)If both policy and reportPolicy are empty integrity policy structs, return "Allowed".
19831967
</li>
19841968
<li>
19851969
<p>
@@ -1989,6 +1973,16 @@ <h4 title="Should request be blocked by Integrity Policy">3.8.2. 要請は完全
19891973
</p>
19901974
<ul>
19911975
<li>
1976+
1977+
%構文解析-済み~metadata は`空$でない
1978+
]~AND[
1979+
%要請 の`~mode$rq ~IN { `cors^l, `same-origin^l }
1980+
1981+
</li>
1982+
<li>
1983+
%要請 の`~URL$rqは`局所的な~URL$である
1984+
</li>
1985+
<li>
19921986
%要請 の`~client$rq ~EQ ~NULL
19931987
【この条件は、この訳による補完。】
19941988
</li>
@@ -2004,21 +1998,33 @@ <h4 title="Should request be blocked by Integrity Policy">3.8.2. 要請は完全
20041998
~RET `許容される^i
20051999
</p>
20062000
2001+
If parsedMetadata is not the empty set and request’s mode is either "cors" or "same-origin", return "Allowed".
2002+
2003+
If request’s url is local, return "Allowed".
2004+
2005+
↓ Let policy be policyContainer’s integrity policy.
2006+
2007+
↓ Let reportPolicy be policyContainer’s report only integrity policy.
2008+
2009+
↓ (不要)If both policy and reportPolicy are empty integrity policys, return "Allowed".
2010+
20072011
Let global be request’s client’s global object.
20082012
20092013
If global is not a Window nor a WorkerGlobalScope, return "Allowed".
20102014
</li>
20112015
<li>
20122016
%結果 ~LET `許容される^i
20132017
2014-
</li>
2018+
Let block be a boolean, initially false.
2019+
</li>
20152020
<li>
20162021
%報告のみか ~LET ~F
20172022
2018-
</li>
2023+
Let reportBlock be a boolean, initially false.
2024+
</li>
20192025
<li>
20202026
<p>
2021-
« %施策~容器 の`完全性~施策$, %施策~容器 の`報告のみの完全性~施策$ »
2027+
« %施策~容器 の`完全性~施策$pC, %施策~容器 の`報告のみの完全性~施策$pC »
20222028
を成す
20232029
~EACH( %施策 )
20242030
に対し:
@@ -2050,10 +2056,6 @@ <h4 title="Should request be blocked by Integrity Policy">3.8.2. 要請は完全
20502056
</li>
20512057
</ol>
20522058
2053-
Let block be a boolean, initially false.
2054-
2055-
Let reportBlock be a boolean, initially false.
2056-
20572059
If policy’s sources contains "inline" and policy’s blocked destinations contains request’s destination, set block to true.
20582060
20592061
If reportPolicy’s sources contains "inline" and reportPolicy’s blocked destinations contains request’s destination, set reportBlock to true.
@@ -2088,17 +2090,17 @@ <h4 title="Report violations">3.8.3. 違反を報告する</h4>
20882090
`違反を報告する@
20892091
~algoは、
20902092
所与の
2091-
( `要請$ %要請, `完全性~施策~構造体$ %施策, 真偽値 %報告のみか )
2093+
( `要請$ %要請, `完全性~施策$ %施策, 真偽値 %報告のみか )
20922094
に対し:
20932095
2094-
To report violation given a Request request, a boolean block, a boolean reportBlock, an integrity policy struct policy, and an integrity policy struct reportPolicy, do the following:
2096+
To report violation given a Request request, a boolean block, a boolean reportBlock, an integrity policy policy, and an integrity policy reportPolicy, do the following:
20952097
</p>
20962098

20972099
<p class="trans-note">
20982100
この~algoは、
20992101
原文では, %報告のみか が[
21002102
~T の場合, ~F の場合
2101-
を一括して遂行しているが
2103+
を(各~場合~用に別個な完全性~施策を与える下で)一括して遂行しているが
21022104
この訳では,別々に遂行する(この~algoを利用する箇所で,それら各場合を遂行する)よう改める。
21032105
</p>
21042106

@@ -2231,37 +2233,6 @@ <h4 title="Report violations">3.8.3. 違反を報告する</h4>
22312233
<section id="integration">
22322234
<h4 title="Integration">3.8.4. 【他の仕様への】統合</h4>
22332235

2234-
<p>
2235-
各`施策~容器$は、
2236-
次に挙げる~itemも有する:
2237-
2238-
A policy container has extra items:
2239-
</p>
2240-
<ul>
2241-
<li>
2242-
`完全性~施策@
2243-
2244-
ある`完全性~施策~構造体$
2245-
2246-
integrity policy, an integrity policy struct.
2247-
</li>
2248-
<li>
2249-
`報告のみの完全性~施策@
2250-
2251-
ある`完全性~施策~構造体$
2252-
2253-
report only integrity policy, an integrity policy struct.
2254-
</li>
2255-
</ul>
2256-
2257-
<p>
2258-
`~fetch応答から施策~容器を作成する$ ~algo `HTML$r を成す “%結果 を返す段” 【最後の段】の前に,次を走らす段を追加する
2259-
2260-
`完全性~施策~headerを構文解析する$( %応答, %結果 )
2261-
2262-
Add an extra step to create a policy container from a fetch response before it returns, that runs parse Integrity-Policy headers with response and result.
2263-
</p>
2264-
22652236
<p>
22662237
`~main~fetch$ `FETCH$r を成す段 7 を成す条件~群に次の条件を追加する
22672238
(満たされる場合、`~network~error$を返すことになる)
@@ -2409,7 +2380,7 @@ <h3 title="Cross-origin data leakage">5.3. 非同一-生成元~data漏洩e</h3>
24092380
</p>
24102381

24112382
<pre class="lang-json">
2412-
{'status': 'authenticated', 'username': 'admin'}
2383+
{"status": "authenticated", "username": "admin"}
24132384
</pre>
24142385

24152386
<p>
@@ -2444,13 +2415,13 @@ <h2 title="Acknowledgements">謝辞</h2>
24442415

24452416
<p>
24462417
この仕様の初期~versionに貴重な貢献された `Mike West^en 氏に特別な謝意を。
2447-
貴重な~feedbackを寄せられた次の方々にも
2418+
貴重な~feedbackを寄せられた次に挙げる方々にも
24482419
24492420
A special thanks to Mike West for his invaluable contributions to the initial version of this spec.\
24502421
</p>
24512422

24522423
<div lang="en">
2453-
Thanks to Brad Hill, Anne van Kesteren, Jonathan Kingston, Mark Nottingham, Sergey Shekyan , Dan Veditz, Eduardo Vela, Tanvi Vyas, and Michal Zalewski for providing invaluable feedback.
2424+
Thanks to Brad Hill, Anne van Kesteren, Jonathan Kingston, Fatih Kilic, Mark Nottingham, Sergey Shekyan, Dan Veditz, Eduardo Vela, Tanvi Vyas, Yoav Weiss, and Michal Zalewski for providing invaluable feedback.
24542425
</div>
24552426

24562427
</section>

0 commit comments

Comments
 (0)