directus 9.22.4 → 9.23.1

package/dist/database/helpers/schema/types.d.ts

@@ -1,19 +1,22 @@
-import { DatabaseHelper } from '../types';
 import { KNEX_TYPES } from '@directus/shared/constants';
+import { Field, Relation, Type } from '@directus/shared/types';
 import { Knex } from 'knex';
-type Clients = 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
+import { DatabaseClient } from '../../../types';
+import { DatabaseHelper } from '../types';
 export type Options = {
     nullable?: boolean;
     default?: any;
     length?: number;
 };
 export declare abstract class SchemaHelper extends DatabaseHelper {
-    isOneOfClients(clients: Clients[]): boolean;
+    isOneOfClients(clients: DatabaseClient[]): boolean;
     changeNullable(table: string, column: string, nullable: boolean): Promise<void>;
-    changeToType(table: string, column: string, type: typeof KNEX_TYPES[number], options?: Options): Promise<void>;
-    protected changeToTypeByCopy(table: string, column: string, type: typeof KNEX_TYPES[number], options: Options): Promise<void>;
+    changeToType(table: string, column: string, type: (typeof KNEX_TYPES)[number], options?: Options): Promise<void>;
+    protected changeToTypeByCopy(table: string, column: string, type: (typeof KNEX_TYPES)[number], options: Options): Promise<void>;
     preColumnChange(): Promise<boolean>;
     postColumnChange(): Promise<void>;
+    preRelationChange(_relation: Partial<Relation>): void;
+    processFieldType(field: Field): Type;
     constraintName(existingName: string): string;
     applyLimit(rootQuery: Knex.QueryBuilder, limit: number): void;
     applyOffset(rootQuery: Knex.QueryBuilder, offset: number): void;
@@ -21,4 +24,3 @@ export declare abstract class SchemaHelper extends DatabaseHelper {
     applyMultiRelationalSort(knex: Knex, dbQuery: Knex.QueryBuilder, table: string, primaryKey: string, orderByString: string, orderByFields: Knex.Raw[]): Knex.QueryBuilder;
     formatUUID(uuid: string): string;
 }
-export {};

package/dist/database/helpers/schema/types.js

@@ -62,6 +62,12 @@ class SchemaHelper extends types_1.DatabaseHelper {
     async postColumnChange() {
         return;
     }
+    preRelationChange(_relation) {
+        return;
+    }
+    processFieldType(field) {
+        return field.type;
+    }
     constraintName(existingName) {
         // most vendors allow for dropping/creating constraints with the same name
         // reference issue #14873
@@ -83,7 +89,7 @@ class SchemaHelper extends types_1.DatabaseHelper {
         return dbQuery;
     }
     formatUUID(uuid) {
-        return uuid; // no-op by defaut
+        return uuid; // no-op by default
     }
 }
 exports.SchemaHelper = SchemaHelper;

package/dist/database/index.d.ts

@@ -1,5 +1,6 @@
 import SchemaInspector from '@directus/schema';
 import { Knex } from 'knex';
+import { DatabaseClient } from '../types';
 export default function getDatabase(): Knex;
 export declare function getSchemaInspector(): ReturnType<typeof SchemaInspector>;
 /**
@@ -10,7 +11,7 @@ export declare function getSchemaInspector(): ReturnType<typeof SchemaInspector>
 export declare function getDatabaseVersion(): string | null;
 export declare function hasDatabaseConnection(database?: Knex): Promise<boolean>;
 export declare function validateDatabaseConnection(database?: Knex): Promise<void>;
-export declare function getDatabaseClient(database?: Knex): 'mysql' | 'postgres' | 'cockroachdb' | 'sqlite' | 'oracle' | 'mssql' | 'redshift';
+export declare function getDatabaseClient(database?: Knex): DatabaseClient;
 export declare function isInstalled(): Promise<boolean>;
 export declare function validateMigrations(): Promise<boolean>;
 /**

package/dist/database/run-ast.js

@@ -217,6 +217,8 @@ async function getDBQuery(schema, knex, table, fieldNodes, query) {
         dbQuery.select(fieldNodes.map(preProcess));
     }
     if (sortRecords) {
+        // Clears the order if any, eg: from MSSQL offset
+        dbQuery.clear('order');
         if (needsInnerQuery) {
             let orderByString = '';
             const orderByFields = [];
@@ -245,8 +247,6 @@ async function getDBQuery(schema, knex, table, fieldNodes, query) {
             }
         }
         else {
-            // Clears the order if any, eg: from MSSQL offset
-            dbQuery.clear('order');
             sortRecords.map((sortRecord) => {
                 if (sortRecord.column.includes('.')) {
                     const [alias, field] = sortRecord.column.split('.');

package/dist/env.js

@@ -28,6 +28,7 @@ const allowedEnvironmentVars = [
     'SERVE_APP',
     'GRAPHQL_INTROSPECTION',
     'LOGGER_.+',
+    'ROBOTS_TXT',
     // server
     'SERVER_.+',
     // database
@@ -105,6 +106,7 @@ const allowedEnvironmentVars = [
     'ASSETS_TRANSFORM_MAX_CONCURRENT',
     'ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION',
     'ASSETS_TRANSFORM_MAX_OPERATIONS',
+    'ASSETS_TRANSFORM_TIMEOUT',
     'ASSETS_CONTENT_SECURITY_POLICY',
     'ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL',
     // auth
@@ -143,8 +145,10 @@ const allowedEnvironmentVars = [
     'AUTH_.+_IDP.+',
     'AUTH_.+_SP.+',
     // extensions
+    'PACKAGE_FILE_LOCATION',
     'EXTENSIONS_PATH',
     'EXTENSIONS_AUTO_RELOAD',
+    'EXTENSIONS_CACHE_TTL',
     // messenger
     'MESSENGER_STORE',
     'MESSENGER_NAMESPACE',
@@ -193,6 +197,7 @@ const defaults = {
     PUBLIC_URL: '/',
     MAX_PAYLOAD_SIZE: '1mb',
     MAX_RELATIONAL_DEPTH: 10,
+    ROBOTS_TXT: 'User-agent: *\nDisallow: /',
     DB_EXCLUDE_TABLES: 'spatial_ref_sys,sysdiagrams',
     STORAGE_LOCATIONS: 'local',
     STORAGE_LOCAL_DRIVER: 'local',
@@ -226,9 +231,10 @@ const defaults = {
     CACHE_VALUE_MAX_SIZE: false,
     AUTH_PROVIDERS: '',
     AUTH_DISABLE_DEFAULT: false,
+    PACKAGE_FILE_LOCATION: '.',
     EXTENSIONS_PATH: './extensions',
     EXTENSIONS_AUTO_RELOAD: false,
-    EMAIL_FROM: 'no-reply@directus.io',
+    EMAIL_FROM: 'no-reply@example.com',
     EMAIL_VERIFY_SETUP: true,
     EMAIL_TRANSPORT: 'sendmail',
     EMAIL_SENDMAIL_NEW_LINE: 'unix',
@@ -238,10 +244,11 @@ const defaults = {
     ASSETS_TRANSFORM_MAX_CONCURRENT: 1,
     ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION: 6000,
     ASSETS_TRANSFORM_MAX_OPERATIONS: 5,
+    ASSETS_TRANSFORM_TIMEOUT: '7500ms',
     ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL: 'warning',
     IP_TRUST_PROXY: true,
     IP_CUSTOM_HEADER: false,
-    IMPORT_IP_DENY_LIST: '0.0.0.0',
+    IMPORT_IP_DENY_LIST: ['0.0.0.0', '169.254.169.254'],
     SERVE_APP: true,
     RELATIONAL_BATCH_SIZE: 25000,
     EXPORT_BATCH_SIZE: 5000,

package/dist/extensions.js

@@ -246,7 +246,7 @@ class ExtensionManager {
         }
     }
     async getExtensions() {
-        const packageExtensions = await (0, node_1.getPackageExtensions)('.');
+        const packageExtensions = await (0, node_1.getPackageExtensions)(env_1.default.PACKAGE_FILE_LOCATION);
         const localPackageExtensions = await (0, node_1.resolvePackageExtensions)(env_1.default.EXTENSIONS_PATH);
         const localExtensions = await (0, node_1.getLocalExtensions)(env_1.default.EXTENSIONS_PATH);
         return [...packageExtensions, ...localPackageExtensions, ...localExtensions].filter((extension) => env_1.default.SERVE_APP || constants_1.APP_EXTENSION_TYPES.includes(extension.type) === false);

package/dist/flows.js

@@ -47,6 +47,7 @@ const revisions_1 = require("./services/revisions");
 const construct_flow_tree_1 = require("./utils/construct-flow-tree");
 const get_schema_1 = require("./utils/get-schema");
 const job_queue_1 = require("./utils/job-queue");
+const map_values_deep_1 = require("./utils/map-values-deep");
 let flowManager;
 const redactLogs = (0, fast_redact_1.default)({
     censor: '--redacted--',
@@ -130,23 +131,26 @@ class FlowManager {
         const flowTrees = flows.map((flow) => (0, construct_flow_tree_1.constructFlowTree)(flow));
         for (const flow of flowTrees) {
             if (flow.trigger === 'event') {
-                const events = ((_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope)
-                    ? (0, utils_1.toArray)(flow.options.scope)
+                let events = [];
+                if ((_a = flow.options) === null || _a === void 0 ? void 0 : _a.scope) {
+                    events = (0, utils_1.toArray)(flow.options.scope)
                         .map((scope) => {
-                        var _a, _b, _c;
+                        var _a;
                         if (['items.create', 'items.update', 'items.delete'].includes(scope)) {
-                            return ((_c = (_b = (_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections) === null || _b === void 0 ? void 0 : _b.map((collection) => {
+                            if (!((_a = flow.options) === null || _a === void 0 ? void 0 : _a.collections))
+                                return [];
+                            return (0, utils_1.toArray)(flow.options.collections).map((collection) => {
                                 if (collection.startsWith('directus_')) {
                                     const action = scope.split('.')[1];
                                     return collection.substring(9) + '.' + action;
                                 }
                                 return `${collection}.${scope}`;
-                            })) !== null && _c !== void 0 ? _c : []);
+                            });
                         }
                         return scope;
                     })
-                        .flat()
-                    : [];
+                        .flat();
+                }
                 if (flow.options.type === 'filter') {
                     const handler = (payload, meta, context) => this.executeFlow(flow, { payload, ...meta }, {
                         accountability: context.accountability,
@@ -329,7 +333,7 @@ class FlowManager {
         const handler = this.operations[operation.type];
         const options = (0, utils_1.applyOptionsData)(operation.options, keyedData);
         try {
-            const result = await handler(options, {
+            let result = await handler(options, {
                 services,
                 exceptions: { ...exceptions, ...sharedExceptions },
                 env: env_1.default,
@@ -340,6 +344,11 @@ class FlowManager {
                 accountability: null,
                 ...context,
             });
+            // JSON structures don't allow for undefined values, so we need to replace them with null
+            // Otherwise the applyOptionsData function will not work correctly on the next operation
+            if (typeof result === 'object' && result !== null) {
+                result = (0, map_values_deep_1.mapValuesDeep)(result, (_, value) => (value === undefined ? null : value));
+            }
             return { successor: operation.resolve, status: 'resolve', data: result !== null && result !== void 0 ? result : null, options };
         }
         catch (error) {

package/dist/middleware/cache.js

@@ -45,8 +45,8 @@ const checkCacheMiddleware = (0, async_handler_1.default)(async (req, res, next)
                 res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'MISS');
             return next();
         }
-        const cacheTTL = cacheExpiryDate ? cacheExpiryDate - Date.now() : null;
-        res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, cacheTTL));
+        const cacheTTL = cacheExpiryDate ? cacheExpiryDate - Date.now() : undefined;
+        res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, cacheTTL, true, true));
         res.setHeader('Vary', 'Origin, Cache-Control');
         if (env_1.default.CACHE_STATUS_HEADER)
             res.setHeader(`${env_1.default.CACHE_STATUS_HEADER}`, 'HIT');

package/dist/middleware/respond.js

@@ -4,19 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.respond = void 0;
-const ms_1 = __importDefault(require("ms"));
+const bytes_1 = require("bytes");
 const cache_1 = require("../cache");
 const env_1 = __importDefault(require("../env"));
-const async_handler_1 = __importDefault(require("../utils/async-handler"));
-const get_cache_key_1 = require("../utils/get-cache-key");
-const get_cache_headers_1 = require("../utils/get-cache-headers");
 const logger_1 = __importDefault(require("../logger"));
 const services_1 = require("../services");
+const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const get_cache_headers_1 = require("../utils/get-cache-headers");
+const get_cache_key_1 = require("../utils/get-cache-key");
 const get_date_formatted_1 = require("../utils/get-date-formatted");
+const get_milliseconds_1 = require("../utils/get-milliseconds");
 const get_string_byte_size_1 = require("../utils/get-string-byte-size");
-const bytes_1 = require("bytes");
 exports.respond = (0, async_handler_1.default)(async (req, res) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const { cache } = (0, cache_1.getCache)();
     let exceedsMaxSize = false;
     if (env_1.default.CACHE_VALUE_MAX_SIZE !== false) {
@@ -32,13 +32,13 @@ exports.respond = (0, async_handler_1.default)(async (req, res) => {
         exceedsMaxSize === false) {
         const key = (0, get_cache_key_1.getCacheKey)(req);
         try {
-            await (0, cache_1.setCacheValue)(cache, key, res.locals.payload, (0, ms_1.default)(env_1.default.CACHE_TTL));
-            await (0, cache_1.setCacheValue)(cache, `${key}__expires_at`, { exp: Date.now() + (0, ms_1.default)(env_1.default.CACHE_TTL) });
+            await (0, cache_1.setCacheValue)(cache, key, res.locals.payload, (0, get_milliseconds_1.getMilliseconds)(env_1.default.CACHE_TTL));
+            await (0, cache_1.setCacheValue)(cache, `${key}__expires_at`, { exp: Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default.CACHE_TTL, 0) });
         }
         catch (err) {
             logger_1.default.warn(err, `[cache] Couldn't set key ${key}. ${err}`);
         }
-        res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, ms_1.default)(env_1.default.CACHE_TTL)));
+        res.setHeader('Cache-Control', (0, get_cache_headers_1.getCacheControlHeader)(req, (0, get_milliseconds_1.getMilliseconds)(env_1.default.CACHE_TTL), true, true));
         res.setHeader('Vary', 'Origin, Cache-Control');
     }
     else {
@@ -71,6 +71,11 @@ exports.respond = (0, async_handler_1.default)(async (req, res) => {
             res.set('Content-Type', 'text/csv');
             return res.status(200).send(exportService.transform((_d = res.locals.payload) === null || _d === void 0 ? void 0 : _d.data, 'csv'));
         }
+        if (req.sanitizedQuery.export === 'yaml') {
+            res.attachment(`${filename}.yaml`);
+            res.set('Content-Type', 'text/yaml');
+            return res.status(200).send(exportService.transform((_e = res.locals.payload) === null || _e === void 0 ? void 0 : _e.data, 'yaml'));
+        }
     }
     if (Buffer.isBuffer(res.locals.payload)) {
         return res.end(res.locals.payload);

package/dist/operations/request/index.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@directus/shared/utils");
 const encodeurl_1 = __importDefault(require("encodeurl"));
+const index_1 = require("../../request/index");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'request',
     handler: async ({ url, method, body, headers }) => {
         var _a;
-        const axios = (await import('axios')).default;
         const customHeaders = (_a = headers === null || headers === void 0 ? void 0 : headers.reduce((acc, { header, value }) => {
             acc[header] = value;
             return acc;
@@ -17,6 +17,7 @@ exports.default = (0, utils_1.defineOperationApi)({
         if (!customHeaders['Content-Type'] && isValidJSON(body)) {
             customHeaders['Content-Type'] = 'application/json';
         }
+        const axios = await (0, index_1.getAxios)();
         const result = await axios({
             url: (0, encodeurl_1.default)(url),
             method,

package/dist/operations/trigger/index.d.ts

@@ -1,6 +1,8 @@
 type Options = {
     flow: string;
     payload?: Record<string, any> | Record<string, any>[] | string | null;
+    iterationMode?: 'serial' | 'batch' | 'parallel';
+    batchSize?: number;
 };
 declare const _default: import("@directus/shared/types").OperationApiConfig<Options>;
 export default _default;

package/dist/operations/trigger/index.js

@@ -5,19 +5,36 @@ const lodash_1 = require("lodash");
 const flows_1 = require("../../flows");
 exports.default = (0, utils_1.defineOperationApi)({
     id: 'trigger',
-    handler: async ({ flow, payload }, context) => {
+    handler: async ({ flow, payload, iterationMode, batchSize }, context) => {
         var _a;
         const flowManager = (0, flows_1.getFlowManager)();
         const payloadObject = (_a = (0, utils_1.optionToObject)(payload)) !== null && _a !== void 0 ? _a : null;
-        let result;
         if (Array.isArray(payloadObject)) {
-            result = await Promise.all(payloadObject.map((payload) => {
-                return flowManager.runOperationFlow(flow, payload, (0, lodash_1.omit)(context, 'data'));
-            }));
+            if (iterationMode === 'serial') {
+                const result = [];
+                for (const payload of payloadObject) {
+                    result.push(await flowManager.runOperationFlow(flow, payload, (0, lodash_1.omit)(context, 'data')));
+                }
+                return result;
+            }
+            if (iterationMode === 'batch') {
+                const size = batchSize !== null && batchSize !== void 0 ? batchSize : 10;
+                const result = [];
+                for (let i = 0; i < payloadObject.length; i += size) {
+                    const batch = payloadObject.slice(i, i + size);
+                    const batchResults = await Promise.all(batch.map((payload) => {
+                        return flowManager.runOperationFlow(flow, payload, (0, lodash_1.omit)(context, 'data'));
+                    }));
+                    result.push(...batchResults);
+                }
+                return result;
+            }
+            if (iterationMode === 'parallel' || !iterationMode) {
+                return await Promise.all(payloadObject.map((payload) => {
+                    return flowManager.runOperationFlow(flow, payload, (0, lodash_1.omit)(context, 'data'));
+                }));
+            }
         }
-        else {
-            result = await flowManager.runOperationFlow(flow, payloadObject, (0, lodash_1.omit)(context, 'data'));
-        }
-        return result;
+        return await flowManager.runOperationFlow(flow, payloadObject, (0, lodash_1.omit)(context, 'data'));
     },
 });

package/dist/request/index.d.ts

@@ -0,0 +1,5 @@
+import type { AxiosInstance } from 'axios';
+export declare const _cache: {
+    axiosInstance: AxiosInstance | null;
+};
+export declare function getAxios(): Promise<AxiosInstance>;

package/dist/request/index.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAxios = exports._cache = void 0;
+const request_interceptor_1 = require("./request-interceptor");
+const response_interceptor_1 = require("./response-interceptor");
+exports._cache = {
+    axiosInstance: null,
+};
+async function getAxios() {
+    if (!exports._cache.axiosInstance) {
+        const axios = (await import('axios')).default;
+        exports._cache.axiosInstance = axios.create();
+        exports._cache.axiosInstance.interceptors.request.use(request_interceptor_1.requestInterceptor);
+        exports._cache.axiosInstance.interceptors.response.use(response_interceptor_1.responseInterceptor);
+    }
+    return exports._cache.axiosInstance;
+}
+exports.getAxios = getAxios;

package/dist/request/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/request/request-interceptor.d.ts

@@ -0,0 +1,2 @@
+import type { InternalAxiosRequestConfig } from 'axios';
+export declare const requestInterceptor: (config: InternalAxiosRequestConfig) => Promise<InternalAxiosRequestConfig<any>>;

package/dist/request/request-interceptor.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestInterceptor = void 0;
+const axios_1 = __importDefault(require("axios"));
+const promises_1 = require("node:dns/promises");
+const node_net_1 = require("node:net");
+const node_url_1 = require("node:url");
+const logger_1 = __importDefault(require("../logger"));
+const validate_ip_1 = require("./validate-ip");
+const requestInterceptor = async (config) => {
+    const uri = axios_1.default.getUri(config);
+    const { hostname } = new node_url_1.URL(uri);
+    let ip;
+    if ((0, node_net_1.isIP)(hostname) === 0) {
+        try {
+            const dns = await (0, promises_1.lookup)(hostname);
+            ip = dns.address;
+        }
+        catch (err) {
+            logger_1.default.warn(err, `Couldn't lookup the DNS for url "${uri}"`);
+            throw new Error(`Requested URL "${uri}" resolves to a denied IP address`);
+        }
+    }
+    else {
+        ip = hostname;
+    }
+    await (0, validate_ip_1.validateIP)(ip, uri);
+    return config;
+};
+exports.requestInterceptor = requestInterceptor;

package/dist/request/request-interceptor.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/request/response-interceptor.d.ts

@@ -0,0 +1,2 @@
+import type { AxiosResponse } from 'axios';
+export declare const responseInterceptor: (config: AxiosResponse<any, any>) => Promise<AxiosResponse<any, any>>;

package/dist/request/response-interceptor.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.responseInterceptor = void 0;
+const validate_ip_1 = require("./validate-ip");
+const responseInterceptor = async (config) => {
+    await (0, validate_ip_1.validateIP)(config.request.socket.remoteAddress, config.request.url);
+    return config;
+};
+exports.responseInterceptor = responseInterceptor;

package/dist/request/response-interceptor.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/request/validate-ip.d.ts

@@ -0,0 +1 @@
+export declare const validateIP: (ip: string, url: string) => Promise<void>;

package/dist/request/validate-ip.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateIP = void 0;
+const node_os_1 = __importDefault(require("node:os"));
+const env_1 = require("../env");
+const validateIP = async (ip, url) => {
+    const env = (0, env_1.getEnv)();
+    if (env.IMPORT_IP_DENY_LIST.includes(ip)) {
+        throw new Error(`Requested URL "${url}" resolves to a denied IP address`);
+    }
+    if (env.IMPORT_IP_DENY_LIST.includes('0.0.0.0')) {
+        const networkInterfaces = node_os_1.default.networkInterfaces();
+        for (const networkInfo of Object.values(networkInterfaces)) {
+            if (!networkInfo)
+                continue;
+            for (const info of networkInfo) {
+                if (info.address === ip) {
+                    throw new Error(`Requested URL "${url}" resolves to a denied IP address`);
+                }
+            }
+        }
+    }
+};
+exports.validateIP = validateIP;

package/dist/request/validate-ip.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/assets.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import type { Range, Stat } from '@directus/storage';
 import { Accountability } from '@directus/shared/types';
-import type { Readable } from 'node:stream';
 import { Knex } from 'knex';
+import type { Readable } from 'node:stream';
 import { AbstractServiceOptions, TransformationParams, TransformationPreset } from '../types';
 import { AuthorizationService } from './authorization';
 export declare class AssetsService {

package/dist/services/assets.js

@@ -38,7 +38,9 @@ const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const logger_1 = __importDefault(require("../logger"));
 const storage_1 = require("../storage");
+const get_milliseconds_1 = require("../utils/get-milliseconds");
 const TransformationUtils = __importStar(require("../utils/transformations"));
+const with_timeout_1 = require("../utils/with-timeout");
 const authorization_1 = require("./authorization");
 sharp_1.default.concurrency(1);
 // Note: don't put this in the service. The service can be initialized in multiple places, but they
@@ -135,13 +137,20 @@ class AssetsService {
                 height > env_1.default.ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION) {
                 throw new exceptions_1.IllegalAssetTransformation(`Image is too large to be transformed, or image size couldn't be determined.`);
             }
-            return await semaphore.runExclusive(async () => {
+            return await semaphore.runExclusive((0, with_timeout_1.withTimeout)(async () => {
                 const readStream = await storage.location(file.storage).read(file.filename_disk, range);
                 const transformer = (0, sharp_1.default)({
                     limitInputPixels: Math.pow(env_1.default.ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION, 2),
                     sequentialRead: true,
                     failOn: env_1.default.ASSETS_INVALID_IMAGE_SENSITIVITY_LEVEL,
                 });
+                // This "duplicate" timeout is required as the overall timeout applies to the
+                // whole promise block, rather than just Sharp. This ensures that sharp itself
+                // doesn't hang indefinitely, even when the outer function scope is already
+                // skipped.
+                transformer.timeout({
+                    seconds: Math.min(3600, Math.round((0, get_milliseconds_1.getMilliseconds)(env_1.default.ASSETS_TRANSFORM_TIMEOUT) * 1000)),
+                });
                 if (transforms.find((transform) => transform[0] === 'rotate') === undefined)
                     transformer.rotate();
                 transforms.forEach(([method, ...args]) => transformer[method].apply(transformer, args));
@@ -155,7 +164,7 @@ class AssetsService {
                     stat: await storage.location(file.storage).stat(assetFilename),
                     file,
                 };
-            });
+            }, (0, get_milliseconds_1.getMilliseconds)(env_1.default.ASSETS_TRANSFORM_TIMEOUT), new exceptions_1.IllegalAssetTransformation(`Image took too long to transform`)));
         }
         else {
             const readStream = await storage.location(file.storage).read(file.filename_disk, range);

package/dist/services/authentication.js

@@ -7,7 +7,6 @@ exports.AuthenticationService = void 0;
 const types_1 = require("@directus/shared/types");
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const lodash_1 = require("lodash");
-const ms_1 = __importDefault(require("ms"));
 const perf_hooks_1 = require("perf_hooks");
 const auth_1 = require("../auth");
 const constants_1 = require("../constants");
@@ -16,6 +15,7 @@ const emitter_1 = __importDefault(require("../emitter"));
 const env_1 = __importDefault(require("../env"));
 const exceptions_1 = require("../exceptions");
 const rate_limiter_1 = require("../rate-limiter");
+const get_milliseconds_1 = require("../utils/get-milliseconds");
 const stall_1 = require("../utils/stall");
 const activity_1 = require("./activity");
 const settings_1 = require("./settings");
@@ -152,7 +152,7 @@ class AuthenticationService {
             issuer: 'directus',
         });
         const refreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
+        const refreshTokenExpiration = new Date(Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL, 0));
         await this.knex('directus_sessions').insert({
             token: refreshToken,
             user: user.id,
@@ -182,7 +182,7 @@ class AuthenticationService {
         return {
             accessToken,
             refreshToken,
-            expires: (0, ms_1.default)(env_1.default.ACCESS_TOKEN_TTL),
+            expires: (0, get_milliseconds_1.getMilliseconds)(env_1.default.ACCESS_TOKEN_TTL),
             id: user.id,
         };
     }
@@ -282,7 +282,7 @@ class AuthenticationService {
             issuer: 'directus',
         });
         const newRefreshToken = nanoid(64);
-        const refreshTokenExpiration = new Date(Date.now() + (0, ms_1.default)(env_1.default.REFRESH_TOKEN_TTL));
+        const refreshTokenExpiration = new Date(Date.now() + (0, get_milliseconds_1.getMilliseconds)(env_1.default.REFRESH_TOKEN_TTL, 0));
         await this.knex('directus_sessions')
             .update({
             token: newRefreshToken,
@@ -295,7 +295,7 @@ class AuthenticationService {
         return {
             accessToken,
             refreshToken: newRefreshToken,
-            expires: (0, ms_1.default)(env_1.default.ACCESS_TOKEN_TTL),
+            expires: (0, get_milliseconds_1.getMilliseconds)(env_1.default.ACCESS_TOKEN_TTL),
             id: record.user_id,
         };
     }

package/dist/services/fields.js

@@ -167,6 +167,7 @@ class FieldsService {
             else if ((_d = (_c = field.meta) === null || _c === void 0 ? void 0 : _c.special) === null || _d === void 0 ? void 0 : _d.includes('cast-datetime')) {
                 field.type = 'dateTime';
             }
+            field.type = this.helpers.schema.processFieldType(field);
         }
         return result;
     }