Revert "feat(core): Read ephemeral license from environment and cleanup ee flags (#5797)" (#5816)

Revert "feat(core): Read ephemeral license from environment and clean up ee flags (#5797)"

This reverts commit a81ca7c19c.

packages/cli/package.json

@@ -114,7 +114,7 @@
     "tsconfig-paths": "^4.1.2"
   },
   "dependencies": {
-    "@n8n_io/license-sdk": "^1.9.1",
+    "@n8n_io/license-sdk": "~1.8.0",
     "@oclif/command": "^1.8.16",
     "@oclif/core": "^1.16.4",
     "@oclif/errors": "^1.3.6",

packages/cli/src/Ldap/constants.ts

@@ -2,6 +2,8 @@ import type { LdapConfig } from './types';
 
 export const LDAP_FEATURE_NAME = 'features.ldap';
 
+export const LDAP_ENABLED = 'enterprise.features.ldap';
+
 export const LDAP_LOGIN_LABEL = 'sso.ldap.loginLabel';
 
 export const LDAP_LOGIN_ENABLED = 'sso.ldap.loginEnabled';

packages/cli/src/Ldap/helpers.ts

@@ -17,6 +17,7 @@ import { LdapManager } from './LdapManager.ee';
 import {
 	BINARY_AD_ATTRIBUTES,
 	LDAP_CONFIG_SCHEMA,
+	LDAP_ENABLED,
 	LDAP_FEATURE_NAME,
 	LDAP_LOGIN_ENABLED,
 	LDAP_LOGIN_LABEL,
@@ -36,7 +37,7 @@ import {
  */
 export const isLdapEnabled = (): boolean => {
 	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isLdapEnabled();
+	return isUserManagementEnabled() && (config.getEnv(LDAP_ENABLED) || license.isLdapEnabled());
 };
 
 /**

packages/cli/src/License.ts

@@ -8,11 +8,6 @@ import { LICENSE_FEATURES, N8N_VERSION, SETTINGS_LICENSE_CERT_KEY } from './cons
 import { Service } from 'typedi';
 
 async function loadCertStr(): Promise<TLicenseContainerStr> {
-	// if we have an ephemeral license, we don't want to load it from the database
-	const ephemeralLicense = config.get('license.cert');
-	if (ephemeralLicense) {
-		return ephemeralLicense;
-	}
 	const databaseSettings = await Db.collections.Settings.findOne({
 		where: {
 			key: SETTINGS_LICENSE_CERT_KEY,
@@ -23,8 +18,6 @@ async function loadCertStr(): Promise<TLicenseContainerStr> {
 }
 
 async function saveCertStr(value: TLicenseContainerStr): Promise<void> {
-	// if we have an ephemeral license, we don't want to save it to the database
-	if (config.get('license.cert')) return;
 	await Db.collections.Settings.upsert(
 		{
 			key: SETTINGS_LICENSE_CERT_KEY,

packages/cli/src/Server.ts

@@ -311,8 +311,8 @@ class Server extends AbstractServer {
 				sharing: false,
 				ldap: false,
 				saml: false,
-				logStreaming: false,
+				logStreaming: config.getEnv('enterprise.features.logStreaming'),
-				advancedExecutionFilters: false,
+				advancedExecutionFilters: config.getEnv('enterprise.features.advancedExecutionFilters'),
 			},
 			hideUsagePage: config.getEnv('hideUsagePage'),
 			license: {

packages/cli/src/UserManagement/UserManagementHelper.ts

@@ -57,7 +57,10 @@ export function isUserManagementEnabled(): boolean {
 
 export function isSharingEnabled(): boolean {
 	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isSharingEnabled();
+	return (
+		isUserManagementEnabled() &&
+		(config.getEnv('enterprise.features.sharing') || license.isSharingEnabled())
+	);
 }
 
 export async function getRoleId(scope: Role['scope'], name: Role['name']): Promise<Role['id']> {

packages/cli/src/api/e2e.api.ts

@@ -5,7 +5,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/naming-convention */
 import { Router } from 'express';
-import type { Request } from 'express';
 import bodyParser from 'body-parser';
 import { v4 as uuid } from 'uuid';
 import config from '@/config';
@@ -13,26 +12,12 @@ import * as Db from '@/Db';
 import type { Role } from '@db/entities/Role';
 import { hashPassword } from '@/UserManagement/UserManagementHelper';
 import { eventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
-import Container from 'typedi';
-import { License } from '../License';
 
 if (process.env.E2E_TESTS !== 'true') {
 	console.error('E2E endpoints only allowed during E2E tests');
 	process.exit(1);
 }
 
-const enabledFeatures = {
-	sharing: true, //default to true here instead of setting it in config/index.ts for e2e
-	ldap: false,
-	saml: false,
-	logStreaming: false,
-	advancedExecutionFilters: false,
-};
-
-type Feature = keyof typeof enabledFeatures;
-
-Container.get(License).isFeatureEnabled = (feature: Feature) => enabledFeatures[feature] ?? false;
-
 const tablesToTruncate = [
 	'auth_identity',
 	'auth_provider_sync_history',
@@ -93,7 +78,7 @@ const setupUserManagement = async () => {
 };
 
 const resetLogStreaming = async () => {
-	enabledFeatures.logStreaming = false;
+	config.set('enterprise.features.logStreaming', false);
 	for (const id in eventBus.destinations) {
 		await eventBus.removeDestination(id);
 	}
@@ -142,8 +127,7 @@ e2eController.post('/db/setup-owner', bodyParser.json(), async (req, res) => {
 	res.writeHead(204).end();
 });
 
-e2eController.post('/enable-feature/:feature', async (req: Request<{ feature: Feature }>, res) => {
+e2eController.post('/enable-feature/:feature', async (req, res) => {
-	const { feature } = req.params;
+	config.set(`enterprise.features.${req.params.feature}`, true);
-	enabledFeatures[feature] = true;
 	res.writeHead(204).end();
 });

packages/cli/src/config/index.ts

@@ -26,6 +26,10 @@ if (inE2ETests) {
 
 const config = convict(schema, { args: [] });
 
+if (inE2ETests) {
+	config.set('enterprise.features.sharing', true);
+}
+
 // eslint-disable-next-line @typescript-eslint/unbound-method
 config.getEnv = config.get;
 

packages/cli/src/config/schema.ts

@@ -990,6 +990,31 @@ export const schema = {
 		},
 	},
 
+	enterprise: {
+		features: {
+			sharing: {
+				format: Boolean,
+				default: false,
+			},
+			ldap: {
+				format: Boolean,
+				default: false,
+			},
+			saml: {
+				format: Boolean,
+				default: false,
+			},
+			logStreaming: {
+				format: Boolean,
+				default: false,
+			},
+			advancedExecutionFilters: {
+				format: Boolean,
+				default: false,
+			},
+		},
+	},
+
 	sso: {
 		justInTimeProvisioning: {
 			format: Boolean,
@@ -1141,12 +1166,6 @@ export const schema = {
 			env: 'N8N_LICENSE_TENANT_ID',
 			doc: 'Tenant id used by the license manager',
 		},
-		cert: {
-			format: String,
-			default: '',
-			env: 'N8N_LICENSE_CERT',
-			doc: 'Ephemeral license certificate',
-		},
 	},
 
 	hideUsagePage: {

packages/cli/src/eventbus/MessageEventBus/MessageEventBusHelper.ts

@@ -1,7 +1,8 @@
+import config from '@/config';
 import { License } from '@/License';
 import { Container } from 'typedi';
 
 export function isLogStreamingEnabled(): boolean {
 	const license = Container.get(License);
-	return license.isLogStreamingEnabled();
+	return config.getEnv('enterprise.features.logStreaming') || license.isLogStreamingEnabled();
 }

packages/cli/src/executions/executionHelpers.ts

@@ -2,6 +2,7 @@ import { Container } from 'typedi';
 import type { IExecutionFlattedDb } from '@/Interfaces';
 import type { ExecutionStatus } from 'n8n-workflow';
 import { License } from '@/License';
+import config from '@/config';
 
 export function getStatusUsingPreviousExecutionStatusMethod(
 	execution: IExecutionFlattedDb,
@@ -21,5 +22,8 @@ export function getStatusUsingPreviousExecutionStatusMethod(
 
 export function isAdvancedExecutionFiltersEnabled(): boolean {
 	const license = Container.get(License);
-	return license.isAdvancedExecutionFiltersEnabled();
+	return (
+		config.getEnv('enterprise.features.advancedExecutionFilters') ||
+		license.isAdvancedExecutionFiltersEnabled()
+	);
 }

packages/cli/src/sso/saml/constants.ts

@@ -28,6 +28,8 @@ export class SamlUrls {
 
 export const SAML_PREFERENCES_DB_KEY = 'features.saml';
 
+export const SAML_ENTERPRISE_FEATURE_ENABLED = 'enterprise.features.saml';
+
 export const SAML_LOGIN_LABEL = 'sso.saml.loginLabel';
 
 export const SAML_LOGIN_ENABLED = 'sso.saml.loginEnabled';

packages/cli/src/sso/saml/samlHelpers.ts

@@ -10,7 +10,7 @@ import type { SamlPreferences } from './types/samlPreferences';
 import type { SamlUserAttributes } from './types/samlUserAttributes';
 import type { FlowResult } from 'samlify/types/src/flow';
 import type { SamlAttributeMapping } from './types/samlAttributeMapping';
-import { SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
+import { SAML_ENTERPRISE_FEATURE_ENABLED, SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
 import {
 	isEmailCurrentAuthenticationMethod,
 	isSamlCurrentAuthenticationMethod,
@@ -52,7 +52,10 @@ export function setSamlLoginLabel(label: string): void {
 
 export function isSamlLicensed(): boolean {
 	const license = Container.get(License);
-	return isUserManagementEnabled() && license.isSamlEnabled();
+	return (
+		isUserManagementEnabled() &&
+		(license.isSamlEnabled() || config.getEnv(SAML_ENTERPRISE_FEATURE_ENABLED))
+	);
 }
 
 export function isSamlLicensedAndEnabled(): boolean {

packages/cli/test/integration/eventbus.test.ts

@@ -23,8 +23,6 @@ import { MessageEventBusDestinationWebhook } from '@/eventbus/MessageEventBusDes
 import { MessageEventBusDestinationSentry } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
 import { EventMessageAudit } from '@/eventbus/EventMessageClasses/EventMessageAudit';
 import { EventNamesTypes } from '@/eventbus/EventMessageClasses';
-import Container from 'typedi';
-import { License } from '../../src/License';
 
 jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
 jest.mock('axios');
@@ -79,7 +77,6 @@ async function confirmIdSent(id: string) {
 }
 
 beforeAll(async () => {
-	Container.get(License).isLogStreamingEnabled = () => true;
 	app = await utils.initTestServer({ endpointGroups: ['eventBus'] });
 
 	globalOwnerRole = await testDb.getGlobalOwnerRole();
@@ -104,6 +101,7 @@ beforeAll(async () => {
 	utils.initConfigFile();
 	config.set('eventBus.logWriter.logBaseName', 'n8n-test-logwriter');
 	config.set('eventBus.logWriter.keepLogCount', 1);
+	config.set('enterprise.features.logStreaming', true);
 	config.set('userManagement.disabled', false);
 	config.set('userManagement.isInstanceOwnerSetUp', true);
 
@@ -112,7 +110,6 @@ beforeAll(async () => {
 
 afterAll(async () => {
 	jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
-	Container.reset();
 	await testDb.terminate();
 	await eventBus.close();
 });
@@ -181,6 +178,7 @@ test.skip('should send message to syslog', async () => {
 		eventName: 'n8n.test.message' as EventNamesTypes,
 		id: uuid(),
 	});
+	config.set('enterprise.features.logStreaming', true);
 
 	const syslogDestination = eventBus.destinations[
 		testSyslogDestination.id!
@@ -221,6 +219,7 @@ test.skip('should confirm send message if there are no subscribers', async () =>
 		eventName: 'n8n.test.unsub' as EventNamesTypes,
 		id: uuid(),
 	});
+	config.set('enterprise.features.logStreaming', true);
 
 	const syslogDestination = eventBus.destinations[
 		testSyslogDestination.id!
@@ -256,6 +255,7 @@ test('should anonymize audit message to syslog ', async () => {
 		},
 		id: uuid(),
 	});
+	config.set('enterprise.features.logStreaming', true);
 
 	const syslogDestination = eventBus.destinations[
 		testSyslogDestination.id!
@@ -317,6 +317,7 @@ test('should send message to webhook ', async () => {
 		eventName: 'n8n.test.message' as EventNamesTypes,
 		id: uuid(),
 	});
+	config.set('enterprise.features.logStreaming', true);
 
 	const webhookDestination = eventBus.destinations[
 		testWebhookDestination.id!
@@ -351,6 +352,7 @@ test('should send message to sentry ', async () => {
 		eventName: 'n8n.test.message' as EventNamesTypes,
 		id: uuid(),
 	});
+	config.set('enterprise.features.logStreaming', true);
 
 	const sentryDestination = eventBus.destinations[
 		testSentryDestination.id!

packages/cli/test/integration/ldap/ldap.api.test.ts

@@ -17,8 +17,6 @@ import * as testDb from './../shared/testDb';
 import type { AuthAgent } from '../shared/types';
 import * as utils from '../shared/utils';
 import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
-import Container from 'typedi';
-import { License } from '../../../src/License';
 
 jest.mock('@/telemetry');
 jest.mock('@/UserManagement/email/NodeMailer');
@@ -43,7 +41,6 @@ const defaultLdapConfig = {
 };
 
 beforeAll(async () => {
-	Container.get(License).isLdapEnabled = () => true;
 	app = await utils.initTestServer({ endpointGroups: ['auth', 'ldap'] });
 
 	const [globalOwnerRole, fetchedGlobalMemberRole] = await testDb.getAllRoles();
@@ -80,10 +77,10 @@ beforeEach(async () => {
 	config.set('userManagement.disabled', false);
 	config.set('userManagement.isInstanceOwnerSetUp', true);
 	config.set('userManagement.emails.mode', '');
+	config.set('enterprise.features.ldap', true);
 });
 
 afterAll(async () => {
-	Container.reset();
 	await testDb.terminate();
 });
 

packages/cli/test/integration/saml/saml.api.test.ts

@@ -7,25 +7,22 @@ import { randomEmail, randomName, randomValidPassword } from '../shared/random';
 import * as testDb from '../shared/testDb';
 import * as utils from '../shared/utils';
 import { sampleConfig } from './sampleMetadata';
-import Container from 'typedi';
-import { License } from '../../../src/License';
 
 let owner: User;
 let authOwnerAgent: SuperAgentTest;
 
 async function enableSaml(enable: boolean) {
 	await setSamlLoginEnabled(enable);
+	config.set('enterprise.features.saml', enable);
 }
 
 beforeAll(async () => {
-	Container.get(License).isSamlEnabled = () => true;
 	const app = await utils.initTestServer({ endpointGroups: ['me', 'saml'] });
 	owner = await testDb.createOwner();
 	authOwnerAgent = utils.createAuthAgent(app)(owner);
 });
 
 afterAll(async () => {
-	Container.reset();
 	await testDb.terminate();
 });
 

packages/cli/test/integration/shared/utils.ts

@@ -74,13 +74,13 @@ import { InternalHooks } from '@/InternalHooks';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { PostHogClient } from '@/posthog';
 import { LdapManager } from '@/Ldap/LdapManager.ee';
+import { LDAP_ENABLED } from '@/Ldap/constants';
 import { handleLdapInit } from '@/Ldap/helpers';
 import { Push } from '@/push';
 import { setSamlLoginEnabled } from '@/sso/saml/samlHelpers';
 import { SamlService } from '@/sso/saml/saml.service.ee';
 import { SamlController } from '@/sso/saml/routes/saml.controller.ee';
 import { EventBusController } from '@/eventbus/eventBus.controller';
-import { License } from '../../../src/License';
 
 export const mockInstance = <T>(
 	ctor: new (...args: any[]) => T,
@@ -186,7 +186,7 @@ export async function initTestServer({
 					);
 					break;
 				case 'ldap':
-					Container.get(License).isLdapEnabled = () => true;
+					config.set(LDAP_ENABLED, true);
 					await handleLdapInit();
 					const { service, sync } = LdapManager.getInstance();
 					registerController(

packages/cli/test/integration/workflows.controller.ee.test.ts

@@ -12,8 +12,6 @@ import { createWorkflow } from './shared/testDb';
 import type { SaveCredentialFunction } from './shared/types';
 import { makeWorkflow } from './shared/utils';
 import { randomCredentialPayload } from './shared/random';
-import Container from 'typedi';
-import { License } from '../../src/License';
 
 let owner: User;
 let member: User;
@@ -25,7 +23,6 @@ let saveCredential: SaveCredentialFunction;
 let sharingSpy: jest.SpyInstance<boolean>;
 
 beforeAll(async () => {
-	Container.get(License).isSharingEnabled = () => true;
 	const app = await utils.initTestServer({ endpointGroups: ['workflows'] });
 
 	const globalOwnerRole = await testDb.getGlobalOwnerRole();
@@ -45,6 +42,8 @@ beforeAll(async () => {
 	sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
 
 	await utils.initNodeTypes();
+
+	config.set('enterprise.features.sharing', true);
 });
 
 beforeEach(async () => {
@@ -52,7 +51,6 @@ beforeEach(async () => {
 });
 
 afterAll(async () => {
-	Container.reset();
 	await testDb.terminate();
 });
 

pnpm-lock.yaml

@@ -113,7 +113,7 @@ importers:
   packages/cli:
     specifiers:
       '@apidevtools/swagger-cli': 4.0.0
-      '@n8n_io/license-sdk': ^1.9.1
+      '@n8n_io/license-sdk': ~1.8.0
       '@oclif/command': ^1.8.16
       '@oclif/core': ^1.16.4
       '@oclif/dev-cli': ^1.22.2
@@ -256,7 +256,7 @@ importers:
       xmllint-wasm: ^3.0.1
       yamljs: ^0.3.0
     dependencies:
-      '@n8n_io/license-sdk': 1.9.1
+      '@n8n_io/license-sdk': 1.8.0
       '@oclif/command': 1.8.18_@oclif+config@1.18.5
       '@oclif/core': 1.16.6
       '@oclif/errors': 1.3.6
@@ -3744,14 +3744,16 @@ packages:
     dev: false
     optional: true
 
-  /@n8n_io/license-sdk/1.9.1:
+  /@n8n_io/license-sdk/1.8.0:
-    resolution: {integrity: sha512-M7tvmYpPSqVDQcxQUKW6XB26zXBZXRTocHtLvE+QJQ4mMbGg2KGwJsYwO9W4DGe8lQ7YD8ZMzG0fLzt0It+zGQ==}
+    resolution: {integrity: sha512-dSBD6EHTu6kWWz1ILxtCcaQqVZu+p/8J0eQ2ntx7Jk8BYSvn5Hh4Oz5M81ut9Pz+2uak+GnIuI6KeYUe1QBXIQ==}
     engines: {node: '>=14.0.0', npm: '>=7.10.0'}
     dependencies:
+      axios: 1.1.3
       crypto-js: 4.1.1
       node-machine-id: 1.1.12
       node-rsa: 1.1.1
-      undici: 5.21.0
+    transitivePeerDependencies:
+      - debug
     dev: false
 
   /@n8n_io/riot-tmpl/3.0.0:
@@ -7758,6 +7760,16 @@ packages:
       - debug
     dev: false
 
+  /axios/1.1.3:
+    resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==}
+    dependencies:
+      follow-redirects: 1.15.2
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+    dev: false
+
   /babel-core/7.0.0-bridge.0_@babel+core@7.20.12:
     resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
     peerDependencies:
@@ -20397,13 +20409,6 @@ packages:
       undertaker-registry: 1.0.1
     dev: true
 
-  /undici/5.21.0:
-    resolution: {integrity: sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==}
-    engines: {node: '>=12.18'}
-    dependencies:
-      busboy: 1.6.0
-    dev: false
-
   /unescape/1.0.1:
     resolution: {integrity: sha512-O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ==}
     engines: {node: '>=0.10.0'}