♻️ Conformance check allowlist (ampproject#28778)

* Disallow older terms for allowlist

Author: kristoferbaxter

ads/inabox/inabox-messaging-host.js

@@ -143,7 +143,7 @@ export class InaboxMessagingHost {
       ? allowedTypes.split(/\s*,\s*/)
       : READ_ONLY_MESSAGES;
     if (allowedTypesList.indexOf(request['type']) === -1) {
-      dev().info(TAG, 'Impermissible message type ignored:', message);
+      dev().info(TAG, 'Message type ignored:', message);
       return false;
     }
 

build-system/tasks/presubmit-checks.js

@@ -48,6 +48,9 @@ const realiasGetMode =
 // Terms that must not appear in our source files.
 const forbiddenTerms = {
   'DO NOT SUBMIT': '',
+  'whitelist': {
+    message: 'Please use the term allowlist',
+  },
   'blacklist': {
     message: 'Please use the term denylist instead',
   },

contributing/TESTING.md

@@ -413,7 +413,7 @@ Additionally, you can create multiple projects and switch between them in the CL
 
 #### Testing Ads
 
-Testing ads in deployed demos requires whitelisting of 3p urls. You can do this by adding your intended deployment hostname as an environemnt variable `AMP_TESTING_HOST` and using the `fortesting` flag. For example:
+Testing ads in deployed demos requires allowlisting of 3p urls. You can do this by adding your intended deployment hostname as an environemnt variable `AMP_TESTING_HOST` and using the `fortesting` flag. For example:
 
 ```sh
 export AMP_TESTING_HOST="my-project.firebaseapp.com"

extensions/amp-ad-custom/amp-ad-custom.md

@@ -51,7 +51,7 @@ To make sure the template is valid AMPHTML, ad network must make an HTTP request
 
 To update a template, an ad network just needs to update the page on their domain, then make another cache warm-up request.
 
-Note: at this stage, domains need to be opted in manually in AMP Cache to experiment with the feature.
+Note: at this stage, domains need to be allowlisted manually in AMP Cache to experiment with the feature.
 
 ## Ad server
 

extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js

@@ -931,7 +931,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   /** @override */
   getCustomRealTimeConfigMacros_() {
     /**
-     * This lists permissible attributes on the amp-ad element to be used as
+     * This lists allowed attributes on the amp-ad element to be used as
      * macros for constructing the RTC URL. Add attributes here, in lowercase,
      * to make them available.
      */

extensions/amp-analytics/0.1/analytics-group.js

@@ -80,11 +80,11 @@ export class AnalyticsGroup {
   addTrigger(config, handler) {
     const eventType = dev().assertString(config['on']);
     const trackerKey = getTrackerKeyName(eventType);
-    const trackerAllowList = getTrackerTypesForParentType(this.root_.getType());
+    const trackerAllowlist = getTrackerTypesForParentType(this.root_.getType());
 
-    const tracker = this.root_.getTrackerForAllowList(
+    const tracker = this.root_.getTrackerForAllowlist(
       trackerKey,
-      trackerAllowList
+      trackerAllowlist
     );
     userAssert(
       !!tracker,

extensions/amp-analytics/0.1/analytics-root.js

@@ -193,11 +193,11 @@ export class AnalyticsRoot {
    * Returns the tracker for the specified name and list of allowed types.
    *
    * @param {string} name
-   * @param {!Object<string, typeof ./events.EventTracker>} allowList
+   * @param {!Object<string, typeof ./events.EventTracker>} allowlist
    * @return {?./events.EventTracker}
    */
-  getTrackerForAllowList(name, allowList) {
-    const trackerProfile = allowList[name];
+  getTrackerForAllowlist(name, allowlist) {
+    const trackerProfile = allowlist[name];
     if (trackerProfile) {
       return this.getTracker(name, trackerProfile);
     }

extensions/amp-analytics/0.1/events.js

@@ -1143,7 +1143,7 @@ export class TimerEventTracker extends EventTracker {
     const eventType = user().assertString(config['on']);
     const trackerKey = getTrackerKeyName(eventType);
 
-    return this.root.getTrackerForAllowList(
+    return this.root.getTrackerForAllowlist(
       trackerKey,
       getTrackerTypesForParentType('timer')
     );
@@ -1668,16 +1668,16 @@ export class VisibilityTracker extends EventTracker {
       return null;
     }
 
-    const trackerAllowList = getTrackerTypesForParentType('visible');
+    const trackerAllowlist = getTrackerTypesForParentType('visible');
     userAssert(
-      waitForSpec == 'none' || trackerAllowList[waitForSpec] !== undefined,
+      waitForSpec == 'none' || trackerAllowlist[waitForSpec] !== undefined,
       'waitFor value %s not supported',
       waitForSpec
     );
 
     const waitForTracker =
       this.waitForTrackers_[waitForSpec] ||
-      this.root.getTrackerForAllowList(waitForSpec, trackerAllowList);
+      this.root.getTrackerForAllowlist(waitForSpec, trackerAllowlist);
     if (waitForTracker) {
       this.waitForTrackers_[waitForSpec] = waitForTracker;
     } else {

extensions/amp-analytics/0.1/requests.js

@@ -87,7 +87,7 @@ export class RequestHandler {
     this.transport_ = transport;
 
     /** @const @private {!Object|undefined} */
-    this.allowList_ = isSandbox ? SANDBOX_AVAILABLE_VARS : undefined;
+    this.allowlist_ = isSandbox ? SANDBOX_AVAILABLE_VARS : undefined;
 
     /** @private {?number} */
     this.batchIntervalTimeoutId_ = null;
@@ -142,14 +142,14 @@ export class RequestHandler {
         expansionOption,
         this.element_,
         bindings,
-        this.allowList_
+        this.allowlist_
       );
 
       this.baseUrlPromise_ = this.baseUrlTemplatePromise_.then((baseUrl) => {
         return this.urlReplacementService_.expandUrlAsync(
           baseUrl,
           bindings,
-          this.allowList_
+          this.allowlist_
         );
       });
     }
@@ -170,14 +170,14 @@ export class RequestHandler {
           requestOriginExpansionOpt,
           this.element_,
           bindings,
-          this.allowList_
+          this.allowlist_
         )
         // substitute in URL values e.g. DOCUMENT_REFERRER -> https://example.com
         .then((expandedRequestOrigin) => {
           return this.urlReplacementService_.expandUrlAsync(
             expandedRequestOrigin,
             bindings,
-            this.allowList_,
+            this.allowlist_,
             true // opt_noEncode
           );
         });
@@ -192,7 +192,7 @@ export class RequestHandler {
       expansionOption,
       bindings,
       this.element_,
-      this.allowList_
+      this.allowlist_
     ).then((params) => {
       return dict({
         'trigger': trigger['on'],
@@ -455,7 +455,7 @@ export function expandPostMessage(
  * @param {!./variables.ExpansionOptions} expansionOption
  * @param {!Object} bindings
  * @param {!Element} element
- * @param {!Object=} opt_allowList
+ * @param {!Object=} opt_allowlist
  * @return {!Promise<!Object>}
  * @private
  */
@@ -466,7 +466,7 @@ function expandExtraUrlParams(
   expansionOption,
   bindings,
   element,
-  opt_allowList
+  opt_allowlist
 ) {
   const requestPromises = [];
   // Don't encode param values here,
@@ -484,7 +484,7 @@ function expandExtraUrlParams(
       const request = variableService
         .expandTemplate(value, option, element)
         .then((value) =>
-          urlReplacements.expandStringAsync(value, bindings, opt_allowList)
+          urlReplacements.expandStringAsync(value, bindings, opt_allowlist)
         )
         .then((value) => (params[key] = value));
       requestPromises.push(request);

extensions/amp-analytics/0.1/test/test-analytics-root.js

@@ -637,18 +637,18 @@ describes.realWin(
       const allowlist = {
         'custom': CustomEventTracker,
       };
-      const customTracker = root.getTrackerForAllowList(
+      const customTracker = root.getTrackerForAllowlist(
         AnalyticsEventType.CUSTOM,
         allowlist
       );
       expect(customTracker).to.be.instanceOf(CustomEventTracker);
       expect(customTracker.root).to.equal(root);
 
-      const noneTracker = root.getTrackerForAllowList('none', allowlist);
+      const noneTracker = root.getTrackerForAllowlist('none', allowlist);
       expect(noneTracker).to.be.null;
 
       expect(
-        root.getTrackerForAllowList(AnalyticsEventType.CUSTOM, allowlist)
+        root.getTrackerForAllowlist(AnalyticsEventType.CUSTOM, allowlist)
       ).to.equal(customTracker);
       expect(
         root.getTracker(AnalyticsEventType.CUSTOM, CustomEventTracker)