Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core): Initialize License and LDAP in the correct order #5673

Merged
merged 2 commits into from
Mar 10, 2023
Merged

fix(core): Initialize License and LDAP in the correct order #5673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ec4ada
fix(core): Initialize LDAP right before setting up the controllers (n…
netroy Mar 10, 2023
068de92
initLicense should happen much earlier
netroy Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions packages/cli/src/Server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,16 @@ import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData'
import { toHttpNodeParameters } from '@/CurlConverterHelper';
import { eventBusRouter } from '@/eventbus/eventBusRoutes';
import { isLogStreamingEnabled } from '@/eventbus/MessageEventBus/MessageEventBusHelper';
import { getLicense } from '@/License';
import { licenseController } from './license/license.controller';
import { Push, setupPushServer, setupPushHandler } from '@/push';
import { setupAuthMiddlewares } from './middlewares';
import { initEvents } from './events';
import { getLdapLoginLabel, isLdapEnabled, isLdapLoginEnabled } from './Ldap/helpers';
import {
getLdapLoginLabel,
handleLdapInit,
isLdapEnabled,
isLdapLoginEnabled,
} from './Ldap/helpers';
import { AbstractServer } from './AbstractServer';
import { configureMetrics } from './metrics';
import { setupBasicAuth } from './middlewares/basicAuth';
Expand Down Expand Up @@ -357,20 +361,6 @@ class Server extends AbstractServer {
return this.frontendSettings;
}

async initLicense(): Promise<void> {
const license = getLicense();
await license.init(this.frontendSettings.instanceId);

const activationKey = config.getEnv('license.activationKey');
if (activationKey) {
try {
await license.activate(activationKey);
} catch (e) {
LoggerProxy.error('Could not activate license', e);
}
}
}

private registerControllers(ignoredEndpoints: Readonly<string[]>) {
const { app, externalHooks, activeWorkflowRunner, nodeTypes } = this;
const repositories = Db.collections;
Expand Down Expand Up @@ -428,7 +418,6 @@ class Server extends AbstractServer {

await this.externalHooks.run('frontend.settings', [this.frontendSettings]);

await this.initLicense();
await this.postHog.init(this.frontendSettings.instanceId);

const publicApiEndpoint = config.getEnv('publicApi.path');
Expand Down Expand Up @@ -490,9 +479,8 @@ class Server extends AbstractServer {
}),
);

// ----------------------------------------
// User Management
// ----------------------------------------
await handleLdapInit();

this.registerControllers(ignoredEndpoints);

this.app.use(`/${this.restEndpoint}/credentials`, credentialsController);
Expand Down
8 changes: 5 additions & 3 deletions packages/cli/src/commands/BaseCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export abstract class BaseCommand extends Command {

protected userSettings: IUserSettings;

protected instanceId: string;

async init(): Promise<void> {
await initErrorHandling();

Expand All @@ -49,9 +51,9 @@ export abstract class BaseCommand extends Command {
const credentialTypes = Container.get(CredentialTypes);
CredentialsOverwrites(credentialTypes);

const instanceId = this.userSettings.instanceId ?? '';
await Container.get(PostHogClient).init(instanceId);
await Container.get(InternalHooks).init(instanceId);
this.instanceId = this.userSettings.instanceId ?? '';
await Container.get(PostHogClient).init(this.instanceId);
await Container.get(InternalHooks).init(this.instanceId);

await Db.init().catch(async (error: Error) =>
this.exitWithCrash('There was an error initializing DB', error),
Expand Down
19 changes: 16 additions & 3 deletions packages/cli/src/commands/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import * as GenericHelpers from '@/GenericHelpers';
import * as Server from '@/Server';
import { TestWebhooks } from '@/TestWebhooks';
import { getAllInstalledPackages } from '@/CommunityNodes/packageModel';
import { handleLdapInit } from '@/Ldap/helpers';
import { EDITOR_UI_DIST_DIR, GENERATED_STATIC_DIR } from '@/constants';
import { eventBus } from '@/eventbus';
import { BaseCommand } from './BaseCommand';
import { InternalHooks } from '@/InternalHooks';
import { getLicense } from '@/License';

// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
const open = require('open');
Expand Down Expand Up @@ -182,11 +182,26 @@ export class Start extends BaseCommand {
await Promise.all(files.map(compileFile));
}

async initLicense(): Promise<void> {
const license = getLicense();
await license.init(this.instanceId);

const activationKey = config.getEnv('license.activationKey');
if (activationKey) {
try {
await license.activate(activationKey);
} catch (e) {
LoggerProxy.error('Could not activate license', e as Error);
}
}
}

async init() {
await this.initCrashJournal();
await super.init();
this.logger.info('Initializing n8n process');

await this.initLicense();
await this.initBinaryManager();
await this.initExternalHooks();

Expand Down Expand Up @@ -326,8 +341,6 @@ export class Start extends BaseCommand {
);
}

await handleLdapInit();

await Server.start();

// Start to get active workflows and run their triggers
Expand Down