AMP runtime must respect whitelist of actions specified via meta tag

.babelrc

@@ -1,22 +1,15 @@
 {
-  "optional": ["utility.inlineEnvironmentVariables"],
-  "externalHelpers": true,
-  "whitelist": [
-    "es3.memberExpressionLiterals",
-    "es3.propertyLiterals",
-    "es5.properties.mutators",
-    "es6.arrowFunctions",
-    "es6.blockScoping",
-    "es6.classes",
-    "es6.constants",
-    "es6.destructuring",
-    "es6.tailCall",
-    "es6.modules",
-    "es6.parameters",
-    "es6.properties.computed",
-    "es6.properties.shorthand",
-    "es6.templateLiterals",
-    "es6.spread",
-    "utility.inlineEnvironmentVariables"
-  ]
+  "presets": [
+    ["env", {
+      "loose": true,
+      "targets": {
+        "browsers": ["Last 2 versions"]
+      },
+      "modules": "commonjs",
+      "sourceType": "module"
+    }]
+  ],
+  "sourceType": "module",
+  "ignore": ["sha384-generated.js", "access-expr-impl.js"],
+  "plugins": ["transform-remove-strict-mode"]
 }

.eslintrc

@@ -1,19 +1,14 @@
 {
   "parser": "babel-eslint",
-  "rulePaths": ["build-system/eslint-rules/"],
   "plugins": ["eslint-plugin-google-camelcase"],
-  "ecmaFeatures": {
-    "modules": true,
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "forOf": false,
-    "destructuring": true,
-    "spread": true
-  },
   "env": {
     "es6": true,
     "browser": true
   },
+ "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
   "globals": {
     "it": false,
     "chai": false,
@@ -38,17 +33,19 @@
     "comma-dangle": [2, "always-multiline"],
     "computed-property-spacing": [2, "never"],
     "curly": 2,
+    "dict-string-keys": 2,
+    "closure-type-primitives": 2,
     "dot-location": [2, "property"],
     "enforce-private-props": 2,
     "todo-format": 0,
     "eol-last": 2,
     "google-camelcase/google-camelcase": 2,
-    "indent": [2, 2, { "SwitchCase": 1 }],
+    "indent": [2, 2, { "SwitchCase": 1, "VariableDeclarator": 2, "MemberExpression": 2, "ObjectExpression": 1, "CallExpression": { "arguments": 2 } }],
     "key-spacing": 2,
     "max-len": [2, 80, 4, {
       "ignoreComments": true,
       "ignoreUrls": true,
-      "ignorePattern": ""
+      "ignorePattern": "^import.*';$"
     }],
     "no-alert": 2,
     "no-array-destructuring": 2,
@@ -90,19 +87,17 @@
       "objectsInObjects": false,
       "arraysInObjects": false
     }],
-    "object-shorthand": [2, "properties"],
+    "object-shorthand": [2, "properties", { "avoidQuotes": true }],
     "prefer-const": 2,
     "quotes": [2, "single", "avoid-escape"],
     "radix": 2,
     "semi": 2,
-    "space-after-keywords": 2,
+    "keyword-spacing": ["error", { "before": true, "after": true }],
     "space-before-blocks": 2,
     "space-before-function-paren": [2, "never"],
-    "space-before-keywords": 2,
     "space-in-parens": 2,
     "space-infix-ops": 2,
     "space-unary-ops": [1, { "words": true, "nonwords": false }],
-    "space-return-throw-case": 2,
     "wrap-iife": [2, "any"]
   }
 }

.gitignore

@@ -17,3 +17,7 @@ typings
 typings.json
 build-system/runner/TESTS-TestSuites.xml
 /test/manual/amp-ad.adtech.html
+test/coverage
+package-lock.json
+*.swp
+*.swo

.travis.yml

@@ -1,49 +1,66 @@
 language: node_js
+sudo: required  # See http://docs.travis-ci.com/user/trusty-ci-environment/
 dist: trusty
-sudo: false  # See http://docs.travis-ci.com/user/trusty-ci-environment/
 node_js:
-  - "4"
+  - "6"
 python:
   - "2.7"
 notifications:
   webhooks:
     - http://savage.nonblocking.io:8080/savage/travis
-addons:
-  sauce_connect: true
-  hosts:
-    - ads.localhost
-    - iframe.localhost
-    # Requested by some tests because they need a valid font host,
-    # but should not resolve in tests.
-    - fonts.googleapis.com
-  apt:
-    packages:
-    - protobuf-compiler
-    - python-protobuf
 before_install:
+  - export CHROME_BIN=google-chrome
   - export DISPLAY=:99.0
+  - unset _JAVA_OPTIONS  # JVM heap sizes break closure compiler. #11203.
   - sh -e /etc/init.d/xvfb start
   - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-  - mkdir "${TRAVIS_BUILD_DIR}/chrome"
-  - dpkg -x google-chrome-stable_current_amd64.deb "${TRAVIS_BUILD_DIR}/chrome"
-  - export CHROME_BIN="${TRAVIS_BUILD_DIR}/chrome/opt/google/chrome/google-chrome"
+  - sudo dpkg -i google-chrome*.deb
+  # Required due to https://github.com/greenkeeperio/greenkeeper-lockfile/issues/98#issuecomment-352087908
+  - export PATH="`yarn global bin`:$PATH"
+  - yarn global add greenkeeper-lockfile@1
 before_script:
   - pip install --user protobuf
-  - gem install percy-cli
+  - gem install percy-capybara phantomjs poltergeist
+  # Poltergeist requires an absolute path to find phantomjs. See #10305.
+  - export PATH="`pwd`/node_modules/.bin:$PATH"
+  - greenkeeper-lockfile-update
 script: node build-system/pr-check.js
+after_script: greenkeeper-lockfile-upload
 branches:
   only:
     - master
     - release
     - canary
     - /^amp-release-.*$/
+    - /^greenkeeper/.*$/
 env:
   global:
+    - SAUCE_USERNAME="amphtml"
     - NPM_CONFIG_PROGRESS="false"
-  matrix:
-    - BUILD_SHARD="pre_build_checks_and_unit_tests"
-    - BUILD_SHARD="integration_tests"
+addons:
+  sauce_connect:
+    username: "amphtml"
+  jwt:
+    # SAUCE_ACCESS_KEY for sauce_connect
+    - secure: "Wze0F0vGL0UcxryOx1n/vcuD5LIMGyR+69Nc6IWLoRvZBbbIpFwVFhDE6rE9ranIXiA2Hc684N4sV8ASfNDF8RRSB+jyLov159qwgji2rBxIfQ/4kuDV2vYoAJvYMz8m42kwx5FV2VV9awqMMt8mwU3wYIrKIaVCxB34uV86KIlDlbrHxt17Bm5EIiUmwi9r1AAnW/63vVRUN264D77oB4j9UQ759PfD6BDwEt54O87KurNIaLseNCr1IvzfL8veEsZ3uTbLC1GtgHfR4IGgkS2YyN2QIk06VZWeRDEOalS3RcY0nDkbCmBywxIGObnrpEMzOpjBiOb2fxLoLvvpjlla5W84zJGfWE6q4T9IvkyHuDJE+sft5B+arjMIeA6PIeUhKdV27+6qqDEf7fILZ/U/Ekn9ds4zSV8hekAZPUyyPncOeyWppCIJ8sOeCrsebkRjH1BoX/d+FE+nP0bN/XkBpIi/nManx5FyS/kqjQWGKmvsFQfEWlSUaZi7XtEQEjvBizRkzvpJanSDaoiTDS2Keulmwii3XRId51FuGtnfDZFeggLaMTKGfBX9DlPkccwYAZe6vPNfYk1pNgEj6AtnifEhYVEO+aAuWhEnJ86od+1wDOL/h+a2XY6h8/gFBywsD95p7sXPfdVDCKgwagiBo+Hw5MNjztVF7lszg1A="
+  hosts:
+    - ads.localhost
+    - iframe.localhost
+    # Requested by some tests because they need a valid font host,
+    # but should not resolve in tests.
+    - fonts.googleapis.com
+  apt:
+    packages:
+    - protobuf-compiler
+    - python-protobuf
+matrix:
+  include:
+    - env: BUILD_SHARD="unit_tests"
+    - env: BUILD_SHARD="integration_tests"
 cache:
   yarn: true
   directories:
-  - node_modules
+    - node_modules
+    - .gem
+  pip: true
+  bundler: true

3p/3p.js

@@ -36,16 +36,27 @@ let ThirdPartyFunctionDef;
  * @const {!Object<ThirdPartyFunctionDef>}
  * @visibleForTesting
  */
-export const registrations = map();
+let registrations;
 
 /** @type {number} */
 let syncScriptLoads = 0;
 
+/**
+ * Returns the registration map
+ */
+export function getRegistrations() {
+  if (!registrations) {
+    registrations = map();
+  }
+  return registrations;
+}
+
 /**
  * @param {string} id The specific 3p integration.
  * @param {ThirdPartyFunctionDef} draw Function that draws the 3p integration.
  */
 export function register(id, draw) {
+  const registrations = getRegistrations();
   dev().assert(!registrations[id], 'Double registration %s', id);
   registrations[id] = draw;
 }
@@ -138,7 +149,7 @@ export function validateSrcPrefix(prefix, src) {
     prefix = [prefix];
   }
   if (src !== undefined) {
-    for (let p = 0; p <= prefix.length; p++) {
+    for (let p = 0; p < prefix.length; p++) {
       const protocolIndex = src.indexOf(prefix[p]);
       if (protocolIndex == 0) {
         return;
@@ -185,14 +196,14 @@ export function computeInMasterFrame(global, taskId, work, cb) {
   }
   cbs.push(cb);
   if (!global.context.isMaster) {
-    return;  // Only do work in master.
+    return; // Only do work in master.
   }
   work(result => {
     for (let i = 0; i < cbs.length; i++) {
       cbs[i].call(null, result);
     }
     tasks[taskId] = {
-      push: function(cb) {
+      push(cb) {
         cb(result);
       },
     };
@@ -271,6 +282,8 @@ function validateAllowedFields(data, allowedFields) {
     mode: true,
     consentNotificationId: true,
     ampSlotIndex: true,
+    adHolderText: true,
+    loadingStrategy: true,
   };
 
   for (const field in data) {

3p/ampcontext-integration.js

@@ -16,6 +16,8 @@
 import {AbstractAmpContext} from './ampcontext';
 import {computeInMasterFrame} from './3p';
 import {dev, user} from '../src/log';
+import {dict} from '../src/utils/object';
+import {adConfig} from '../ads/_config';
 
 
 /**
@@ -28,8 +30,11 @@ import {dev, user} from '../src/log';
  * @return {!Window}
  */
 export function masterSelection(win, type) {
+  type = type.toLowerCase();
   // The master has a special name.
-  const masterName = 'frame_' + type + '_master';
+  const masterName = 'frame_' +
+      (adConfig[type] && adConfig[type]['masterFrameAccessibleType'] || type) +
+      '_master';
   let master;
   try {
     // Try to get the master from the parent. If it does not
@@ -64,7 +69,8 @@ export class IntegrationAmpContext extends AbstractAmpContext {
     // available.
     return (this.embedType_ === 'facebook'
         || this.embedType_ === 'twitter'
-        || this.embedType_ == 'github');
+        || this.embedType_ === 'github'
+        || this.embedType_ === 'mathml');
   }
 
   /** @return {!Window} */
@@ -101,7 +107,7 @@ export class IntegrationAmpContext extends AbstractAmpContext {
   }
 
   /**
-   * @param {{width, height}=} opt_data
+   * @param {!JsonObject=} opt_data Fields: width, height
    */
   renderStart(opt_data) {
     this.client_.sendMessage('render-start', opt_data);
@@ -119,9 +125,9 @@ export class IntegrationAmpContext extends AbstractAmpContext {
    * @param {string} entityId See comment above for content.
    */
   reportRenderedEntityIdentifier(entityId) {
-    this.client_.sendMessage('entity-id', {
-      id: user().assertString(entityId),
-    });
+    this.client_.sendMessage('entity-id', dict({
+      'id': user().assertString(entityId),
+    }));
   }
 
   /**