Bump form-data from 4.0.5 to 4.0.6

Bumps [form-data](https://github.com/form-data/form-data) from 4.0.5 to 4.0.6.
- [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v4.0.5...v4.0.6)

---
updated-dependencies:
- dependency-name: form-data
  dependency-version: 4.0.6
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

package-lock.json

@@ -7296,6 +7296,72 @@
                 "node": ">=14.0.0"
             }
         },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+            "version": "1.10.0",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/wasi-threads": "1.2.1",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+            "version": "1.10.0",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+            "version": "1.2.1",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+            "version": "1.1.4",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@tybys/wasm-util": "^0.10.1"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/Brooooooklyn"
+            },
+            "peerDependencies": {
+                "@emnapi/core": "^1.7.1",
+                "@emnapi/runtime": "^1.7.1"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+            "version": "0.10.1",
+            "dev": true,
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+            "version": "2.8.1",
+            "dev": true,
+            "inBundle": true,
+            "license": "0BSD",
+            "optional": true
+        },
         "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.0.tgz",
@@ -12191,16 +12257,16 @@
             }
         },
         "node_modules/form-data": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
-            "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz",
+            "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==",
             "license": "MIT",
             "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.8",
                 "es-set-tostringtag": "^2.1.0",
-                "hasown": "^2.0.2",
-                "mime-types": "^2.1.12"
+                "hasown": "^2.0.4",
+                "mime-types": "^2.1.35"
             },
             "engines": {
                 "node": ">= 6"
@@ -12629,9 +12695,9 @@
             }
         },
         "node_modules/hasown": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.3.tgz",
-            "integrity": "sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==",
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
+            "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==",
             "license": "MIT",
             "dependencies": {
                 "function-bind": "^1.1.2"

server/routers/resource/createResourceRule.ts

@@ -154,8 +154,12 @@ export async function createResourceRule(
         }
 
         // Create the new resource rule
-        if (resource.resourcePolicyId !== null) {
-            const policyId = resource.resourcePolicyId;
+        const isInlinePolicy =
+            resource.resourcePolicyId === null &&
+            resource.defaultResourcePolicyId !== null;
+
+        if (isInlinePolicy) {
+            const policyId = resource.defaultResourcePolicyId!;
             const [newRule] = await db
                 .insert(resourcePolicyRules)
                 .values({

server/routers/resource/deleteResourceRule.ts

@@ -2,7 +2,7 @@ import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
 import { resourceRules, resourcePolicyRules, resources } from "@server/db";
-import { and, eq } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -73,18 +73,14 @@ export async function deleteResourceRule(
             );
         }
 
-        if (resource.resourcePolicyId !== null) {
+        const isInlinePolicy =
+            resource.resourcePolicyId === null &&
+            resource.defaultResourcePolicyId !== null;
+
+        if (isInlinePolicy) {
             const [deletedRule] = await db
                 .delete(resourcePolicyRules)
-                .where(
-                    and(
-                        eq(resourcePolicyRules.ruleId, ruleId),
-                        eq(
-                            resourcePolicyRules.resourcePolicyId,
-                            resource.resourcePolicyId
-                        )
-                    )
-                )
+                .where(eq(resourcePolicyRules.ruleId, ruleId))
                 .returning();
 
             if (!deletedRule) {

server/routers/resource/getResource.ts

@@ -141,10 +141,16 @@ export async function getResource(
             );
         }
 
+        const isInlinePolicy =
+            resource.resourcePolicyId === null &&
+            resource.defaultResourcePolicyId !== null;
+
         let returnData = resource;
-        if (resource.resourcePolicyId !== null) {
+        if (isInlinePolicy) {
             // get the policy
-            const policy = await queryInlinePolicy(resource.resourcePolicyId);
+            const policy = await queryInlinePolicy(
+                resource.defaultResourcePolicyId!
+            );
             returnData = {
                 ...returnData,
                 sso: policy?.sso || null,

server/routers/resource/listResourceRules.ts

@@ -140,11 +140,15 @@ export async function listResourceRules(
             );
         }
 
+        const isInlinePolicy =
+            resource.resourcePolicyId === null &&
+            resource.defaultResourcePolicyId !== null;
+
         let rulesList: Awaited<ReturnType<typeof queryResourceRules>>;
         let totalCount: number;
 
-        if (resource.resourcePolicyId !== null) {
-            const policyId = resource.resourcePolicyId;
+        if (isInlinePolicy) {
+            const policyId = resource.defaultResourcePolicyId!;
             const policyRules = await queryPolicyRules(policyId)
                 .limit(limit)
                 .offset(offset);

server/routers/resource/updateResourceRule.ts

@@ -1,8 +1,8 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import { db } from "@server/db";
-import { resourcePolicyRules, resourceRules, resources } from "@server/db";
-import { and, eq } from "drizzle-orm";
+import { resourceRules, resources } from "@server/db";
+import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
@@ -37,29 +37,6 @@ const updateResourceRuleSchema = z
         error: "At least one field must be provided for update"
     });
 
-function getRuleValueValidationError(
-    match: "CIDR" | "IP" | "PATH" | "COUNTRY" | "ASN" | "REGION",
-    value: string
-): string | null {
-    if (match === "CIDR" && !isValidCIDR(value)) {
-        return "Invalid CIDR provided";
-    }
-
-    if (match === "IP" && !isValidIP(value)) {
-        return "Invalid IP provided";
-    }
-
-    if (match === "PATH" && !isValidUrlGlobPattern(value)) {
-        return "Invalid URL glob pattern provided";
-    }
-
-    if (match === "REGION" && !isValidRegionId(value)) {
-        return "Invalid region ID provided";
-    }
-
-    return null;
-}
-
 registry.registerPath({
     method: "post",
     path: "/resource/{resourceId}/rule/{ruleId}",
@@ -151,68 +128,6 @@ export async function updateResourceRule(
             );
         }
 
-        if (resource.resourcePolicyId !== null) {
-            const [existingRule] = await db
-                .select()
-                .from(resourcePolicyRules)
-                .where(
-                    and(
-                        eq(resourcePolicyRules.ruleId, ruleId),
-                        eq(
-                            resourcePolicyRules.resourcePolicyId,
-                            resource.resourcePolicyId
-                        )
-                    )
-                )
-                .limit(1);
-
-            if (!existingRule) {
-                return next(
-                    createHttpError(
-                        HttpCode.NOT_FOUND,
-                        `Resource rule with ID ${ruleId} not found`
-                    )
-                );
-            }
-
-            const match = updateData.match || existingRule.match;
-            const { value } = updateData;
-
-            if (value !== undefined) {
-                const validationError = getRuleValueValidationError(
-                    match,
-                    value
-                );
-                if (validationError) {
-                    return next(
-                        createHttpError(HttpCode.BAD_REQUEST, validationError)
-                    );
-                }
-            }
-
-            const [updatedRule] = await db
-                .update(resourcePolicyRules)
-                .set(updateData)
-                .where(
-                    and(
-                        eq(resourcePolicyRules.ruleId, ruleId),
-                        eq(
-                            resourcePolicyRules.resourcePolicyId,
-                            resource.resourcePolicyId
-                        )
-                    )
-                )
-                .returning();
-
-            return response(res, {
-                data: updatedRule,
-                success: true,
-                error: false,
-                message: "Resource rule updated successfully",
-                status: HttpCode.OK
-            });
-        }
-
         // Verify that the rule exists and belongs to the specified resource
         const [existingRule] = await db
             .select()
@@ -242,11 +157,42 @@ export async function updateResourceRule(
         const { value } = updateData;
 
         if (value !== undefined) {
-            const validationError = getRuleValueValidationError(match, value);
-            if (validationError) {
-                return next(
-                    createHttpError(HttpCode.BAD_REQUEST, validationError)
-                );
+            if (match === "CIDR") {
+                if (!isValidCIDR(value)) {
+                    return next(
+                        createHttpError(
+                            HttpCode.BAD_REQUEST,
+                            "Invalid CIDR provided"
+                        )
+                    );
+                }
+            } else if (match === "IP") {
+                if (!isValidIP(value)) {
+                    return next(
+                        createHttpError(
+                            HttpCode.BAD_REQUEST,
+                            "Invalid IP provided"
+                        )
+                    );
+                }
+            } else if (match === "PATH") {
+                if (!isValidUrlGlobPattern(value)) {
+                    return next(
+                        createHttpError(
+                            HttpCode.BAD_REQUEST,
+                            "Invalid URL glob pattern provided"
+                        )
+                    );
+                }
+            } else if (match === "REGION") {
+                if (!isValidRegionId(value)) {
+                    return next(
+                        createHttpError(
+                            HttpCode.BAD_REQUEST,
+                            "Invalid region ID provided"
+                        )
+                    );
+                }
             }
         }