Check if an existing upserted bucket belongs to the user's project.

src/gcp/storage.ts

@@ -1,6 +1,7 @@
 import { Readable } from "stream";
 import * as path from "path";
 import * as clc from "colorette";
+import { getProject } from "../management/projects";
 
 import { firebaseStorageOrigin, storageOrigin } from "../api";
 import { Client } from "../apiv2";
@@ -116,7 +117,7 @@
     ];
   };
   labels: {
     (key: any): string;
   };
   storageClass: string;
   billing: {
@@ -189,7 +190,7 @@
   downloadTokens?: string;
 }
 
 export async function getDefaultBucket(projectId: string): Promise<string> {
   await ensure(projectId, firebaseStorageOrigin(), "storage", false);
   try {
     const localAPIClient = new Client({
@@ -205,9 +206,9 @@
         "Your project is being set up. Please wait a minute before deploying again.",
       );
     }
     return response.body.bucket.name.split("/").pop()!;
   } catch (err: any) {
     if (err?.status === 404) {
       throw new FirebaseError(
         `Firebase Storage has not been set up on project '${clc.bold(
           projectId,
@@ -219,8 +220,8 @@
   }
 }
 
 export async function upload(
   source: any,
   uploadUrl: string,
   extraHeaders?: Record<string, string>,
   ignoreQuotaProject?: boolean,
@@ -237,7 +238,7 @@
       "content-type": "application/zip",
       ...extraHeaders,
     },
     body: source.stream,
     skipLog: { resBody: true },
     ignoreQuotaProject,
   });
@@ -298,7 +299,7 @@
  * Deletes an object via Firebase Storage.
  * @param {string} location A Firebase Storage location, of the form "/v0/b/<bucket>/o/<object>"
  */
 export function deleteObject(location: string): Promise<any> {
   const localAPIClient = new Client({ urlPrefix: storageOrigin() });
   return localAPIClient.delete(location);
 }
@@ -369,7 +370,18 @@
   req: CreateBucketRequest;
 }): Promise<void> {
   try {
-    await (exports as { getBucket: typeof getBucket }).getBucket(opts.req.name);
+    const bucketResponse = await (exports as { getBucket: typeof getBucket }).getBucket(
+      opts.req.name,
+    );
+    const projectMetadata = await getProject(opts.projectId);
+    if (
+      !bucketResponse.projectNumber ||
+      bucketResponse.projectNumber !== projectMetadata.projectNumber
+    ) {
+      throw new FirebaseError(
+        "There is already an existing bucket that belongs to another project.",
+      );
+    }
     return;
   } catch (err) {
     const errStatus = getErrStatus((err as FirebaseError).original);