directus 9.4.2 → 9.4.3

package/dist/app.js

@@ -106,6 +106,15 @@ async function createApp() {
         directives: {
             // Unsafe-eval is required for vue3 / vue-i18n / app extensions
             scriptSrc: ["'self'", "'unsafe-eval'"],
+            // Even though this is recommended to have enabled, it breaks most local
+            // installations. Making this opt-in rather than opt-out is a little more
+            // friendly. Ref #10806
+            upgradeInsecureRequests: null,
+            // These are required for MapLibre
+            workerSrc: ["'self'", 'blob:'],
+            childSrc: ["'self'", 'blob:'],
+            imgSrc: ["'self'", 'data:', 'blob:'],
+            connectSrc: ["'self'", 'https://*'],
         },
     }, (0, get_config_from_env_1.getConfigFromEnv)('CONTENT_SECURITY_POLICY_'))));
     await emitter_1.default.emitInit('app.before', { app });

package/dist/cli/index.js

@@ -22,7 +22,7 @@ const pkg = require('../../package.json');
 async function createCli() {
     const program = new commander_1.Command();
     const extensionManager = (0, extensions_1.getExtensionManager)();
-    await extensionManager.initialize({ schedule: false });
+    await extensionManager.initialize({ schedule: false, watch: false });
     await emitter_1.default.emitInit('cli.before', { program });
     program.name('directus').usage('[command] [options]');
     program.version(pkg.version, '-v, --version');

package/dist/controllers/extensions.js

@@ -16,7 +16,7 @@ router.get('/:type', (0, async_handler_1.default)(async (req, res, next) => {
         throw new exceptions_1.RouteNotFoundException(req.path);
     }
     const extensionManager = (0, extensions_1.getExtensionManager)();
-    const extensions = extensionManager.listExtensions(type);
+    const extensions = extensionManager.getExtensionsList(type);
     res.locals.payload = {
         data: extensions,
     };

package/dist/database/migrations/run.js

@@ -13,7 +13,7 @@ async function run(database, direction, log = true) {
     let migrationFiles = await fs_extra_1.default.readdir(__dirname);
     const customMigrationsPath = path_1.default.resolve(env_1.default.EXTENSIONS_PATH, 'migrations');
     let customMigrationFiles = ((await fs_extra_1.default.pathExists(customMigrationsPath)) && (await fs_extra_1.default.readdir(customMigrationsPath))) || [];
-    migrationFiles = migrationFiles.filter((file) => file.startsWith('run') === false && file.endsWith('.d.ts') === false);
+    migrationFiles = migrationFiles.filter((file) => /^[0-9]+[A-Z]-[^.]+\.(?:js|ts)$/.test(file));
     customMigrationFiles = customMigrationFiles.filter((file) => file.endsWith('.js'));
     const completedMigrations = await database.select('*').from('directus_migrations').orderBy('version');
     const migrations = [

package/dist/env.js

@@ -52,6 +52,7 @@ const defaults = {
     AUTH_PROVIDERS: '',
     AUTH_DISABLE_DEFAULT: false,
     EXTENSIONS_PATH: './extensions',
+    EXTENSIONS_AUTO_RELOAD: false,
     EMAIL_FROM: 'no-reply@directus.io',
     EMAIL_TRANSPORT: 'sendmail',
     EMAIL_SENDMAIL_NEW_LINE: 'unix',

package/dist/extensions.d.ts

@@ -2,22 +2,27 @@ import { Router } from 'express';
 import { AppExtensionType, ExtensionType } from '@directus/shared/types';
 export declare function getExtensionManager(): ExtensionManager;
 declare class ExtensionManager {
-    private isInitialized;
+    private isLoaded;
+    private isScheduleHookEnabled;
     private extensions;
     private appExtensions;
-    private apiHooks;
-    private apiEndpoints;
+    private apiExtensions;
     private apiEmitter;
     private endpointRouter;
-    private isScheduleHookEnabled;
+    private watcher;
     constructor();
-    initialize({ schedule }?: {
+    initialize({ schedule, watch }?: {
         schedule: boolean;
+        watch: boolean;
     }): Promise<void>;
     reload(): Promise<void>;
-    listExtensions(type?: ExtensionType): string[];
+    getExtensionsList(type?: ExtensionType): string[];
     getAppExtensions(type: AppExtensionType): string | undefined;
     getEndpointRouter(): Router;
+    private load;
+    private unload;
+    private initializeWatcher;
+    private updateWatchedExtensions;
     private getExtensions;
     private generateExtensionBundles;
     private getSharedDepsMapping;

package/dist/extensions.js

@@ -45,6 +45,8 @@ const plugin_alias_1 = __importDefault(require("@rollup/plugin-alias"));
 const url_1 = require("./utils/url");
 const get_module_default_1 = __importDefault(require("./utils/get-module-default"));
 const lodash_1 = require("lodash");
+const chokidar_1 = __importDefault(require("chokidar"));
+const utils_1 = require("@directus/shared/utils");
 let extensionManager;
 function getExtensionManager() {
     if (extensionManager) {
@@ -56,19 +58,66 @@ function getExtensionManager() {
 exports.getExtensionManager = getExtensionManager;
 class ExtensionManager {
     constructor() {
-        this.isInitialized = false;
+        this.isLoaded = false;
+        this.isScheduleHookEnabled = true;
         this.extensions = [];
         this.appExtensions = {};
-        this.apiHooks = [];
-        this.apiEndpoints = [];
-        this.isScheduleHookEnabled = true;
+        this.apiExtensions = { hooks: [], endpoints: [] };
+        this.watcher = null;
         this.apiEmitter = new emitter_1.Emitter();
         this.endpointRouter = (0, express_1.Router)();
     }
-    async initialize({ schedule } = { schedule: true }) {
+    async initialize({ schedule, watch } = { schedule: true, watch: true }) {
         this.isScheduleHookEnabled = schedule;
-        if (this.isInitialized)
-            return;
+        if (watch) {
+            this.initializeWatcher();
+        }
+        if (!this.isLoaded) {
+            await this.load();
+            this.updateWatchedExtensions(this.extensions);
+            const loadedExtensions = this.getExtensionsList();
+            if (loadedExtensions.length > 0) {
+                logger_1.default.info(`Loaded extensions: ${loadedExtensions.join(', ')}`);
+            }
+        }
+    }
+    async reload() {
+        if (this.isLoaded) {
+            logger_1.default.info('Reloading extensions');
+            const prevExtensions = (0, lodash_1.clone)(this.extensions);
+            await this.unload();
+            await this.load();
+            const added = this.extensions.filter((extension) => !prevExtensions.some((prevExtension) => extension.path === prevExtension.path));
+            const removed = prevExtensions.filter((prevExtension) => !this.extensions.some((extension) => prevExtension.path === extension.path));
+            this.updateWatchedExtensions(added, removed);
+            const addedExtensions = added.map((extension) => extension.name);
+            const removedExtensions = removed.map((extension) => extension.name);
+            if (addedExtensions.length > 0) {
+                logger_1.default.info(`Added extensions: ${addedExtensions.join(', ')}`);
+            }
+            if (removedExtensions.length > 0) {
+                logger_1.default.info(`Removed extensions: ${removedExtensions.join(', ')}`);
+            }
+        }
+        else {
+            logger_1.default.warn('Extensions have to be loaded before they can be reloaded');
+        }
+    }
+    getExtensionsList(type) {
+        if (type === undefined) {
+            return this.extensions.map((extension) => extension.name);
+        }
+        else {
+            return this.extensions.filter((extension) => extension.type === type).map((extension) => extension.name);
+        }
+    }
+    getAppExtensions(type) {
+        return this.appExtensions[type];
+    }
+    getEndpointRouter() {
+        return this.endpointRouter;
+    }
+    async load() {
         try {
             await (0, node_1.ensureExtensionDirs)(env_1.default.EXTENSIONS_PATH, env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES);
             this.extensions = await this.getExtensions();
@@ -82,38 +131,42 @@ class ExtensionManager {
         if (env_1.default.SERVE_APP) {
             this.appExtensions = await this.generateExtensionBundles();
         }
-        const loadedExtensions = this.listExtensions();
-        if (loadedExtensions.length > 0) {
-            logger_1.default.info(`Loaded extensions: ${loadedExtensions.join(', ')}`);
-        }
-        this.isInitialized = true;
+        this.isLoaded = true;
     }
-    async reload() {
-        if (!this.isInitialized)
-            return;
-        logger_1.default.info('Reloading extensions');
+    async unload() {
         this.unregisterHooks();
         this.unregisterEndpoints();
         this.apiEmitter.offAll();
         if (env_1.default.SERVE_APP) {
             this.appExtensions = {};
         }
-        this.isInitialized = false;
-        await this.initialize();
+        this.isLoaded = false;
     }
-    listExtensions(type) {
-        if (type === undefined) {
-            return this.extensions.map((extension) => extension.name);
-        }
-        else {
-            return this.extensions.filter((extension) => extension.type === type).map((extension) => extension.name);
+    initializeWatcher() {
+        if (env_1.default.EXTENSIONS_AUTO_RELOAD && env_1.default.NODE_ENV !== 'development' && !this.watcher) {
+            logger_1.default.info('Watching extensions for changes...');
+            const localExtensionPaths = (env_1.default.SERVE_APP ? constants_1.EXTENSION_TYPES : constants_1.API_EXTENSION_TYPES).map((type) => path_1.default.resolve(env_1.default.EXTENSIONS_PATH, (0, utils_1.pluralize)(type)));
+            this.watcher = chokidar_1.default.watch([path_1.default.resolve('.', 'package.json'), ...localExtensionPaths], {
+                ignoreInitial: true,
+            });
+            this.watcher
+                .on('add', () => this.reload())
+                .on('change', () => this.reload())
+                .on('unlink', () => this.reload());
         }
     }
-    getAppExtensions(type) {
-        return this.appExtensions[type];
-    }
-    getEndpointRouter() {
-        return this.endpointRouter;
+    updateWatchedExtensions(added, removed = []) {
+        if (this.watcher) {
+            const toPackageExtensionPaths = (extensions) => extensions
+                .filter((extension) => !extension.local)
+                .map((extension) => extension.type !== 'pack'
+                ? path_1.default.resolve(extension.path, extension.entrypoint || '')
+                : path_1.default.resolve(extension.path, 'package.json'));
+            const addedPackageExtensionPaths = toPackageExtensionPaths(added);
+            const removedPackageExtensionPaths = toPackageExtensionPaths(removed);
+            this.watcher.add(addedPackageExtensionPaths);
+            this.watcher.unwatch(removedPackageExtensionPaths);
+        }
     }
     async getExtensions() {
         const packageExtensions = await (0, node_1.getPackageExtensions)('.', env_1.default.SERVE_APP ? constants_1.EXTENSION_PACKAGE_TYPES : constants_1.API_EXTENSION_PACKAGE_TYPES);
@@ -188,7 +241,7 @@ class ExtensionManager {
         const registerFunctions = {
             filter: (event, handler) => {
                 emitter_1.default.onFilter(event, handler);
-                this.apiHooks.push({
+                this.apiExtensions.hooks.push({
                     type: 'filter',
                     path: hookPath,
                     event,
@@ -197,7 +250,7 @@ class ExtensionManager {
             },
             action: (event, handler) => {
                 emitter_1.default.onAction(event, handler);
-                this.apiHooks.push({
+                this.apiExtensions.hooks.push({
                     type: 'action',
                     path: hookPath,
                     event,
@@ -206,7 +259,7 @@ class ExtensionManager {
             },
             init: (event, handler) => {
                 emitter_1.default.onInit(event, handler);
-                this.apiHooks.push({
+                this.apiExtensions.hooks.push({
                     type: 'init',
                     path: hookPath,
                     event,
@@ -225,7 +278,7 @@ class ExtensionManager {
                             }
                         }
                     });
-                    this.apiHooks.push({
+                    this.apiExtensions.hooks.push({
                         type: 'schedule',
                         path: hookPath,
                         task,
@@ -263,12 +316,12 @@ class ExtensionManager {
             logger: logger_1.default,
             getSchema: get_schema_1.getSchema,
         });
-        this.apiEndpoints.push({
+        this.apiExtensions.endpoints.push({
             path: endpointPath,
         });
     }
     unregisterHooks() {
-        for (const hook of this.apiHooks) {
+        for (const hook of this.apiExtensions.hooks) {
             switch (hook.type) {
                 case 'filter':
                     emitter_1.default.offFilter(hook.event, hook.handler);
@@ -280,18 +333,18 @@ class ExtensionManager {
                     emitter_1.default.offInit(hook.event, hook.handler);
                     break;
                 case 'schedule':
-                    hook.task.destroy();
+                    hook.task.stop();
                     break;
             }
             delete require.cache[require.resolve(hook.path)];
         }
-        this.apiHooks = [];
+        this.apiExtensions.hooks = [];
     }
     unregisterEndpoints() {
-        for (const endpoint of this.apiEndpoints) {
+        for (const endpoint of this.apiExtensions.endpoints) {
             delete require.cache[require.resolve(endpoint.path)];
         }
         this.endpointRouter.stack = [];
-        this.apiEndpoints = [];
+        this.apiExtensions.endpoints = [];
     }
 }

package/dist/services/assets.js

@@ -52,9 +52,6 @@ class AssetsService {
             .from('directus_settings')
             .first();
         const systemPublicKeys = Object.values(publicSettings || {});
-        if (systemPublicKeys.includes(id) === false && ((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
-            await this.authorizationService.checkAccess('read', 'directus_files', id);
-        }
         /**
          * This is a little annoying. Postgres will error out if you're trying to search in `where`
          * with a wrong type. In case of directus_files where id is a uuid, we'll have to verify the
@@ -63,6 +60,9 @@ class AssetsService {
         const isValidUUID = (0, uuid_validate_1.default)(id, 4);
         if (isValidUUID === false)
             throw new exceptions_1.ForbiddenException();
+        if (systemPublicKeys.includes(id) === false && ((_a = this.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
+            await this.authorizationService.checkAccess('read', 'directus_files', id);
+        }
         const file = (await this.knex.select('*').from('directus_files').where({ id }).first());
         if (!file)
             throw new exceptions_1.ForbiddenException();

package/dist/services/authentication.js

@@ -43,7 +43,7 @@ class AuthenticationService {
         const user = await this.knex
             .select('u.id', 'u.first_name', 'u.last_name', 'u.email', 'u.password', 'u.status', 'u.role', 'r.admin_access', 'r.app_access', 'u.tfa_secret', 'u.provider', 'u.external_identifier', 'u.auth_data')
             .from('directus_users as u')
-            .innerJoin('directus_roles as r', 'u.role', 'r.id')
+            .leftJoin('directus_roles as r', 'u.role', 'r.id')
             .where('u.id', await provider.getUserID((0, lodash_1.cloneDeep)(payload)))
             .andWhere('u.provider', providerName)
             .first();
@@ -247,6 +247,9 @@ class AuthenticationService {
                 collection: record.share_collection,
                 item: record.share_item,
             };
+            tokenPayload.app_access = false;
+            tokenPayload.admin_access = false;
+            delete tokenPayload.id;
         }
         const customClaims = await emitter_1.default.emitFilter('auth.jwt', tokenPayload, {
             status: 'pending',

package/dist/services/graphql.js

@@ -1397,10 +1397,10 @@ class GraphQLService {
                 resolve: async () => {
                     const extensionManager = (0, extensions_1.getExtensionManager)();
                     return {
-                        interfaces: extensionManager.listExtensions('interface'),
-                        displays: extensionManager.listExtensions('display'),
-                        layouts: extensionManager.listExtensions('layout'),
-                        modules: extensionManager.listExtensions('module'),
+                        interfaces: extensionManager.getExtensionsList('interface'),
+                        displays: extensionManager.getExtensionsList('display'),
+                        layouts: extensionManager.getExtensionsList('layout'),
+                        modules: extensionManager.getExtensionsList('module'),
                     };
                 },
             },

package/dist/utils/get-local-type.js

@@ -107,7 +107,7 @@ function getLocalType(column, field) {
             return 'hash';
         if (special.includes('csv'))
             return 'csv';
-        if (special.includes('uuid'))
+        if (special.includes('uuid') || special.includes('file'))
             return 'uuid';
         if (type === null || type === void 0 ? void 0 : type.startsWith('geometry')) {
             return special[0] || 'geometry';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.4.2",
+	"version": "9.4.3",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -76,16 +76,16 @@
 	],
 	"dependencies": {
 		"@aws-sdk/client-ses": "^3.40.0",
-		"@directus/app": "9.4.2",
-		"@directus/drive": "9.4.2",
-		"@directus/drive-azure": "9.4.2",
-		"@directus/drive-gcs": "9.4.2",
-		"@directus/drive-s3": "9.4.2",
-		"@directus/extensions-sdk": "9.4.2",
-		"@directus/format-title": "9.4.2",
-		"@directus/schema": "9.4.2",
-		"@directus/shared": "9.4.2",
-		"@directus/specs": "9.4.2",
+		"@directus/app": "9.4.3",
+		"@directus/drive": "9.4.3",
+		"@directus/drive-azure": "9.4.3",
+		"@directus/drive-gcs": "9.4.3",
+		"@directus/drive-s3": "9.4.3",
+		"@directus/extensions-sdk": "9.4.3",
+		"@directus/format-title": "9.4.3",
+		"@directus/schema": "9.4.3",
+		"@directus/shared": "9.4.3",
+		"@directus/specs": "9.4.3",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
@@ -97,6 +97,7 @@
 		"busboy": "^0.3.1",
 		"camelcase": "^6.2.0",
 		"chalk": "^4.1.1",
+		"chokidar": "^3.5.2",
 		"commander": "^8.0.0",
 		"cookie-parser": "^1.4.5",
 		"cors": "^2.8.5",
@@ -170,7 +171,7 @@
 		"sqlite3": "^5.0.2",
 		"tedious": "^13.0.0"
 	},
-	"gitHead": "1a5a9180ee6d0ad8f03076bc6e3cfdd62a0dd2f9",
+	"gitHead": "65bfe68b0c7993a1bd5b0daac0855265911313d0",
 	"devDependencies": {
 		"@types/async": "3.2.10",
 		"@types/atob": "2.1.2",