firebase-tools 11.3.0 → 11.4.2

package/lib/rulesDeploy.js

@@ -3,15 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RulesDeploy = exports.RulesetServiceType = void 0;
 const _ = require("lodash");
 const clc = require("cli-color");
-const fs = require("fs");
+const fs = require("fs-extra");
 const gcp = require("./gcp");
 const logger_1 = require("./logger");
 const error_1 = require("./error");
 const utils = require("./utils");
 const prompt_1 = require("./prompt");
+const getProjectNumber_1 = require("./getProjectNumber");
+const resourceManager_1 = require("./gcp/resourceManager");
+const previews_1 = require("./previews");
 const QUOTA_EXCEEDED_STATUS_CODE = 429;
 const RULESET_COUNT_LIMIT = 1000;
 const RULESETS_TO_GC = 10;
+const CROSS_SERVICE_FUNCTIONS = /firestore\.(get|exists)/;
+const CROSS_SERVICE_RULES_ROLE = "roles/firebaserules.firestoreServiceAgent";
 var RulesetServiceType;
 (function (RulesetServiceType) {
     RulesetServiceType["CLOUD_FIRESTORE"] = "cloud.firestore";
@@ -54,17 +59,49 @@ class RulesDeploy {
         }
         return { latestName, latestContent };
     }
+    async checkStorageRulesIamPermissions(rulesContent) {
+        if ((rulesContent === null || rulesContent === void 0 ? void 0 : rulesContent.match(CROSS_SERVICE_FUNCTIONS)) === null) {
+            return;
+        }
+        if (this.options.nonInteractive) {
+            return;
+        }
+        const projectNumber = await (0, getProjectNumber_1.getProjectNumber)(this.options);
+        const saEmail = `service-${projectNumber}@gcp-sa-firebasestorage.iam.gserviceaccount.com`;
+        try {
+            if (await (0, resourceManager_1.serviceAccountHasRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true)) {
+                return;
+            }
+            const addRole = await (0, prompt_1.promptOnce)({
+                type: "confirm",
+                name: "rulesRole",
+                message: `Cloud Storage for Firebase needs an IAM Role to use cross-service rules. Grant the new role?`,
+                default: true,
+            }, this.options);
+            if (addRole) {
+                await (0, resourceManager_1.addServiceAccountToRoles)(projectNumber, saEmail, [CROSS_SERVICE_RULES_ROLE], true);
+                utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} updated service account for cross-service rules...`);
+            }
+        }
+        catch (e) {
+            logger_1.logger.warn("[rules] Error checking or updating Cloud Storage for Firebase service account permissions.");
+            logger_1.logger.warn("[rules] Cross-service Storage rules may not function properly", e.message);
+        }
+    }
     async createRulesets(service) {
+        var _a;
         const createdRulesetNames = [];
         const { latestName: latestRulesetName, latestContent: latestRulesetContent } = await this.getCurrentRules(service);
         const newRulesetsByFilename = new Map();
-        for (const filename of Object.keys(this.rulesFiles)) {
-            const files = this.rulesFiles[filename];
+        for (const [filename, files] of Object.entries(this.rulesFiles)) {
             if (latestRulesetName && _.isEqual(files, latestRulesetContent)) {
                 utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} latest version of ${clc.bold(filename)} already up to date, skipping upload...`);
                 this.rulesetNames[filename] = latestRulesetName;
                 continue;
             }
+            if (previews_1.previews.crossservicerules && service === RulesetServiceType.FIREBASE_STORAGE) {
+                await this.checkStorageRulesIamPermissions((_a = files[0]) === null || _a === void 0 ? void 0 : _a.content);
+            }
             utils.logBullet(`${clc.bold.cyan(RulesetType[this.type] + ":")} uploading rules ${clc.bold(filename)}...`);
             newRulesetsByFilename.set(filename, gcp.rules.createRuleset(this.options.project, files));
         }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.3.0",
+  "version": "11.4.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.3.0",
+      "version": "11.4.2",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",
@@ -16,7 +16,7 @@
         "body-parser": "^1.19.0",
         "chokidar": "^3.0.2",
         "cjson": "^0.3.1",
-        "cli-color": "^2.0.2",
+        "cli-color": "2.0.1",
         "cli-table": "0.3.11",
         "commander": "^4.0.1",
         "configstore": "^5.0.1",
@@ -24,6 +24,7 @@
         "cross-env": "^5.1.3",
         "cross-spawn": "^7.0.1",
         "csv-parse": "^5.0.4",
+        "es5-ext": "0.10.53",
         "exegesis": "^4.1.0",
         "exegesis-express": "^4.0.0",
         "express": "^4.16.4",
@@ -130,7 +131,7 @@
         "eslint-plugin-prettier": "^4.0.0",
         "firebase": "^7.24.0",
         "firebase-admin": "^9.4.2",
-        "firebase-functions": "^3.15.0",
+        "firebase-functions": "^3.22.0",
         "google-discovery-to-swagger": "^2.1.0",
         "mocha": "^9.1.3",
         "nock": "^13.0.5",
@@ -4205,12 +4206,12 @@
       }
     },
     "node_modules/cli-color": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.2.tgz",
-      "integrity": "sha512-g4JYjrTW9MGtCziFNjkqp3IMpGhnJyeB0lOtRPjQkYhXzKYr6tYnXKyEVnMzITxhpbahsEW9KsxOYIDKwcsIBw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.1.tgz",
+      "integrity": "sha512-eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg==",
       "dependencies": {
         "d": "^1.0.1",
-        "es5-ext": "^0.10.59",
+        "es5-ext": "^0.10.53",
         "es6-iterator": "^2.0.3",
         "memoizee": "^0.4.15",
         "timers-ext": "^0.1.7"
@@ -5176,19 +5177,20 @@
       }
     },
     "node_modules/es5-ext": {
-      "version": "0.10.61",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz",
-      "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==",
-      "hasInstallScript": true,
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
       "dependencies": {
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.3",
-        "next-tick": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
       }
     },
+    "node_modules/es5-ext/node_modules/next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha512-mc/caHeUcdjnC/boPWJefDr4KUIWQNv+tlnFnJd38QMou86QtxQzBJfxgGRzvx8jazYRqrVlaHarfO72uNxPOg=="
+    },
     "node_modules/es6-error": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
@@ -6426,16 +6428,17 @@
       "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
     },
     "node_modules/firebase-functions": {
-      "version": "3.18.1",
-      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.18.1.tgz",
-      "integrity": "sha512-sPYZc9U/o0MjrpL3yz0pmoviJ1SkDoMV54X1rT/O2g0JTbV9eoQZsZuRoIUeaY3gmWFcMnN5TbJsPQUVh+omtw==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.22.0.tgz",
+      "integrity": "sha512-d1BxBpT95MhvVqXkpLWDvWbyuX7e2l69cFAiqG3U1XQDaMV88bM9S+Zg7H8i9pitEGFr+76ErjKgrY0n+g3ZDA==",
       "dev": true,
       "dependencies": {
         "@types/cors": "^2.8.5",
         "@types/express": "4.17.3",
         "cors": "^2.8.5",
         "express": "^4.17.1",
-        "lodash": "^4.17.14"
+        "lodash": "^4.17.14",
+        "node-fetch": "^2.6.7"
       },
       "bin": {
         "firebase-functions": "lib/bin/firebase-functions.js"
@@ -6444,7 +6447,7 @@
         "node": "^8.13.0 || >=10.10.0"
       },
       "peerDependencies": {
-        "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0"
+        "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0"
       }
     },
     "node_modules/firebase-functions/node_modules/@types/express": {
@@ -17474,12 +17477,12 @@
       "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="
     },
     "cli-color": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.2.tgz",
-      "integrity": "sha512-g4JYjrTW9MGtCziFNjkqp3IMpGhnJyeB0lOtRPjQkYhXzKYr6tYnXKyEVnMzITxhpbahsEW9KsxOYIDKwcsIBw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.1.tgz",
+      "integrity": "sha512-eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg==",
       "requires": {
         "d": "^1.0.1",
-        "es5-ext": "^0.10.59",
+        "es5-ext": "^0.10.53",
         "es6-iterator": "^2.0.3",
         "memoizee": "^0.4.15",
         "timers-ext": "^0.1.7"
@@ -18264,13 +18267,20 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.61",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz",
-      "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==",
+      "version": "0.10.53",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
+      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
       "requires": {
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.3",
-        "next-tick": "^1.1.0"
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.3",
+        "next-tick": "~1.0.0"
+      },
+      "dependencies": {
+        "next-tick": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+          "integrity": "sha512-mc/caHeUcdjnC/boPWJefDr4KUIWQNv+tlnFnJd38QMou86QtxQzBJfxgGRzvx8jazYRqrVlaHarfO72uNxPOg=="
+        }
       }
     },
     "es6-error": {
@@ -19223,16 +19233,17 @@
       }
     },
     "firebase-functions": {
-      "version": "3.18.1",
-      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.18.1.tgz",
-      "integrity": "sha512-sPYZc9U/o0MjrpL3yz0pmoviJ1SkDoMV54X1rT/O2g0JTbV9eoQZsZuRoIUeaY3gmWFcMnN5TbJsPQUVh+omtw==",
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.22.0.tgz",
+      "integrity": "sha512-d1BxBpT95MhvVqXkpLWDvWbyuX7e2l69cFAiqG3U1XQDaMV88bM9S+Zg7H8i9pitEGFr+76ErjKgrY0n+g3ZDA==",
       "dev": true,
       "requires": {
         "@types/cors": "^2.8.5",
         "@types/express": "4.17.3",
         "cors": "^2.8.5",
         "express": "^4.17.1",
-        "lodash": "^4.17.14"
+        "lodash": "^4.17.14",
+        "node-fetch": "^2.6.7"
       },
       "dependencies": {
         "@types/express": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "11.3.0",
+  "version": "11.4.2",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -26,10 +26,12 @@
     "test:client-integration": "bash ./scripts/client-integration-tests/run.sh",
     "test:compile": "tsc --project tsconfig.compile.json",
     "test:emulator": "bash ./scripts/emulator-tests/run.sh",
-    "test:import-export": "bash ./scripts/emulator-import-export-tests/run.sh",
     "test:extensions-deploy": "bash ./scripts/extensions-deploy-tests/run.sh",
     "test:extensions-emulator": "bash ./scripts/extensions-emulator-tests/run.sh",
+    "test:functions-deploy": "bash ./scripts/functions-deploy-tests/run.sh",
     "test:hosting": "bash ./scripts/hosting-tests/run.sh",
+    "test:hosting-rewrites": "bash ./scripts/hosting-tests/rewrites-tests/run.sh",
+    "test:import-export": "bash ./scripts/emulator-import-export-tests/run.sh",
     "test:triggers-end-to-end": "bash ./scripts/triggers-end-to-end-tests/run.sh",
     "test:storage-deploy": "bash ./scripts/storage-deploy-tests/run.sh",
     "test:storage-emulator-integration": "bash ./scripts/storage-emulator-integration/run.sh"
@@ -93,7 +95,7 @@
     "body-parser": "^1.19.0",
     "chokidar": "^3.0.2",
     "cjson": "^0.3.1",
-    "cli-color": "^2.0.2",
+    "cli-color": "2.0.1",
     "cli-table": "0.3.11",
     "commander": "^4.0.1",
     "configstore": "^5.0.1",
@@ -101,6 +103,7 @@
     "cross-env": "^5.1.3",
     "cross-spawn": "^7.0.1",
     "csv-parse": "^5.0.4",
+    "es5-ext": "0.10.53",
     "exegesis": "^4.1.0",
     "exegesis-express": "^4.0.0",
     "express": "^4.16.4",
@@ -204,7 +207,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "firebase": "^7.24.0",
     "firebase-admin": "^9.4.2",
-    "firebase-functions": "^3.15.0",
+    "firebase-functions": "^3.22.0",
     "google-discovery-to-swagger": "^2.1.0",
     "mocha": "^9.1.3",
     "nock": "^13.0.5",