Permalink
Browse files

s/blacklist/blocklist/g (#329)

Closes #327
  • Loading branch information...
1 parent ab6a68b commit 1d5cfa4ee8790df0cbbd68cda2dd148ba4efe10f @beaufortfrancois beaufortfrancois committed with scheib Nov 3, 2016
Showing with 31 additions and 31 deletions.
  1. +2 −2 implementation-status.md
  2. +27 −27 index.bs
  3. +2 −2 rationale.md
@@ -48,8 +48,8 @@ Service Changed Event | | | | | |
BluetoothUUID | ✓ | ✓ | ✓ | ✓ | ✓ |
TypeError for bad UUIDs | 55 | 55 | 55 | 55 | 55 |
Invalidate GATT attributes upon disconnect | 👷 | 👷 | 👷 | 👷 | 👷 |
-GATT Blacklist | ✓ | ✓ | ✓ | ✓ | ✓ |
-Low-latency Blacklist Updates | ✓ | ✓ | ✓ | ✓ | ✓ |
+GATT Blocklist | ✓ | ✓ | ✓ | ✓ | ✓ |
+Low-latency Blocklist Updates | ✓ | ✓ | ✓ | ✓ | ✓ |
## [Scanning API](https://webbluetoothcg.github.io/web-bluetooth/scanning.html)
View
@@ -419,7 +419,7 @@ spec: html
the trusted operating system of a remote device.
Human Interface Devices are a prominent example,
where allowing a website to communicate would allow that site to log keystrokes.
- This specification includes a <a>GATT blacklist</a> of
+ This specification includes a <a>GATT blocklist</a> of
such vulnerable services, characteristics, and descriptors
to prevent websites from taking advantage of them.
</p>
@@ -1317,7 +1317,7 @@ spec: html
throw that exception and abort these steps.
</li>
<li>
- Remove from <var>optionalServiceUUIDs</var> any UUIDs that are <a>blacklisted</a>.
+ Remove from <var>optionalServiceUUIDs</var> any UUIDs that are <a>blocklisted</a>.
</li>
</ol>
</li>
@@ -1444,7 +1444,7 @@ spec: html
throw that exception and abort these steps.
</li>
<li>
- If any service in <var>services</var> is <a>blacklisted</a>,
+ If any service in <var>services</var> is <a>blocklisted</a>,
throw a {{SecurityError}}
and abort these steps.
</li>
@@ -1560,7 +1560,7 @@ spec: html
throw that exception and abort these steps.
</li>
<li>
- If |service| is <a>blacklisted</a>,
+ If |service| is <a>blocklisted</a>,
throw a {{SecurityError}}
and abort these steps.
</li>
@@ -3075,7 +3075,7 @@ spec: html
return <a>a promise rejected with</a> that exception and abort these steps.
</li>
<li>
- If <var>uuid</var> is present and is <a>blacklisted</a>,
+ If <var>uuid</var> is present and is <a>blocklisted</a>,
return <a>a promise rejected with</a> a {{SecurityError}}
and abort these steps.
</li>
@@ -3111,7 +3111,7 @@ spec: html
<ul>
<li>are within <a>Represented</a>(|attribute|),</li>
<li>have a type described by <var>child type</var>,</li>
- <li>have a UUID that is not <a>blacklisted</a>,</li>
+ <li>have a UUID that is not <a>blocklisted</a>,</li>
<li>if <var>uuid</var> is present, have a UUID of <var>uuid</var>,</li>
<li>
if <var>allowedUuids</var> is present and not `"all"`,
@@ -3826,7 +3826,7 @@ spec: html
</p>
<ol>
<li>
- If <code>this.uuid</code> is <a>blacklisted for reads</a>,
+ If <code>this.uuid</code> is <a>blocklisted for reads</a>,
return <a>a promise rejected with</a> a {{SecurityError}}
and abort these steps.
</li>
@@ -3908,7 +3908,7 @@ spec: html
</p>
<ol>
<li>
- If <code>this.uuid</code> is <a>blacklisted for writes</a>,
+ If <code>this.uuid</code> is <a>blocklisted for writes</a>,
return <a>a promise rejected with</a> a {{SecurityError}}
and abort these steps.
</li>
@@ -4013,7 +4013,7 @@ spec: html
</p>
<ol>
<li>
- If <code>this.uuid</code> is <a>blacklisted for reads</a>,
+ If <code>this.uuid</code> is <a>blocklisted for reads</a>,
<a>reject</a> <var>promise</var> with a {{SecurityError}} and abort these steps.
</li>
<li>
@@ -4308,7 +4308,7 @@ spec: html
</p>
<ol>
<li>
- If <code>this.uuid</code> is <a>blacklisted for reads</a>,
+ If <code>this.uuid</code> is <a>blocklisted for reads</a>,
return <a>a promise rejected with</a> a {{SecurityError}}
and abort these steps.
</li>
@@ -4381,7 +4381,7 @@ spec: html
</p>
<ol>
<li>
- If <code>this.uuid</code> is <a>blacklisted for writes</a>,
+ If <code>this.uuid</code> is <a>blocklisted for writes</a>,
return <a>a promise rejected with</a> a {{SecurityError}}
and abort these steps.
</li>
@@ -5264,18 +5264,18 @@ spec: html
</section>
<section>
- <h2 id="the-gatt-blacklist">The GATT Blacklist</h2>
+ <h2 id="the-gatt-blocklist">The GATT Blocklist</h2>
<p>
- This specification relies on a blacklist file in the
+ This specification relies on a blocklist file in the
<a href="https://github.com/WebBluetoothCG/registries"
>https://github.com/WebBluetoothCG/registries</a> repository
to restrict the set of GATT attributes a website can access.
</p>
<div algorithm>
<p>
- The result of <dfn>parsing the blacklist</dfn> at a URL <var>url</var>
+ The result of <dfn>parsing the blocklist</dfn> at a URL <var>url</var>
is a map from <a>valid UUID</a>s to tokens, or an error,
produced by the following algorithm:
</p>
@@ -5320,28 +5320,28 @@ spec: html
</div>
<p>
- The <dfn>GATT blacklist</dfn> is the result of <a>parsing the blacklist</a> at
- <a href="https://github.com/WebBluetoothCG/registries/blob/master/gatt_blacklist.txt"
- >https://github.com/WebBluetoothCG/registries/blob/master/gatt_blacklist.txt</a>.
- The UA should re-fetch the blacklist periodically, but it's unspecified how often.
+ The <dfn>GATT blocklist</dfn> is the result of <a>parsing the blocklist</a> at
+ <a href="https://github.com/WebBluetoothCG/registries/blob/master/gatt_blocklist.txt"
+ >https://github.com/WebBluetoothCG/registries/blob/master/gatt_blocklist.txt</a>.
+ The UA should re-fetch the blocklist periodically, but it's unspecified how often.
</p>
<p>
- A <a>UUID</a> is <dfn>blacklisted</dfn> if either
- the <a>GATT blacklist</a>'s value is an error,
- or the UUID maps to "<code>exclude</code>" in the <a>GATT blacklist</a>.
+ A <a>UUID</a> is <dfn>blocklisted</dfn> if either
+ the <a>GATT blocklist</a>'s value is an error,
+ or the UUID maps to "<code>exclude</code>" in the <a>GATT blocklist</a>.
</p>
<p>
- A <a>UUID</a> is <dfn>blacklisted for reads</dfn> if either
- the <a>GATT blacklist</a>'s value is an error,
+ A <a>UUID</a> is <dfn>blocklisted for reads</dfn> if either
+ the <a>GATT blocklist</a>'s value is an error,
or the UUID maps to either "<code>exclude</code>" or "<code>exclude-reads</code>"
- in the <a>GATT blacklist</a>.
+ in the <a>GATT blocklist</a>.
</p>
<p>
- A <a>UUID</a> is <dfn>blacklisted for writes</dfn> if either
- the <a>GATT blacklist</a>'s value is an error,
+ A <a>UUID</a> is <dfn>blocklisted for writes</dfn> if either
+ the <a>GATT blocklist</a>'s value is an error,
or the UUID maps to either "<code>exclude</code>" or "<code>exclude-writes</code>"
- in the <a>GATT blacklist</a>.
+ in the <a>GATT blocklist</a>.
</p>
</section>
View
@@ -132,9 +132,9 @@ We're also not signaling any error conditions from the disconnection:
if other operations were in flight, they'll return a NetworkError,
which still allows the possibility that they took effect.
-## Why is the blacklist at https://github.com/WebBluetoothCG/registries a custom file format?
+## Why is the blocklist at https://github.com/WebBluetoothCG/registries a custom file format?
-The initial blacklist design desired the simplest solution that supported:
+The initial blocklist design desired the simplest solution that supported:
- Comments
- Pairs of validated UUIDs, possibly labeled with an exclusion tokens

0 comments on commit 1d5cfa4

Please sign in to comment.