admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 01:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): Add SSH key generation (#6006)

Browse Source 
* basic prefs and ssh key generation

* review change

* cleanup save

* lint fix
This commit is contained in:
Michael Auerswald
2023-04-19 17:46:10 +02:00
committed by GitHub
parent 953198e092
commit 71ed1f410c
18 changed files with 313 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/cli/src/Server.ts
View File

@@ -160,7 +160,9 @@ import { variablesController } from './environments/variables.controller';
import { LdapManager } from './Ldap/LdapManager.ee';
import { getVariablesLimit, isVariablesEnabled } from '@/environments/enviromentHelpers';
import { getCurrentAuthenticationMethod } from './sso/ssoHelpers';
import { isVersionControlEnabled } from './environment/versionControl/versionControlHelper';
import { isVersionControlLicensed } from '@/environments/versionControl/versionControlHelper';
import { VersionControlService } from '@/environments/versionControl/versionControl.service.ee';
import { VersionControlController } from '@/environments/versionControl/versionControl.controller.ee';
const exec = promisify(callbackExec);
@@ -356,7 +358,7 @@ class Server extends AbstractServer {
saml: isSamlLicensed(),
advancedExecutionFilters: isAdvancedExecutionFiltersEnabled(),
variables: isVariablesEnabled(),
versionControl: isVersionControlEnabled(),
versionControl: isVersionControlLicensed(),
});
if (isLdapEnabled()) {
@@ -393,6 +395,7 @@ class Server extends AbstractServer {
const mailer = Container.get(UserManagementMailer);
const postHog = this.postHog;
const samlService = Container.get(SamlService);
const versionControlService = Container.get(VersionControlService);
const controllers: object[] = [
new EventBusController(),
@@ -421,6 +424,7 @@ class Server extends AbstractServer {
postHog,
}),
new SamlController(samlService),
new VersionControlController(versionControlService),
];
if (isLdapEnabled()) {
@@ -545,12 +549,10 @@ class Server extends AbstractServer {
// initialize SamlService if it is licensed, even if not enabled, to
// set up the initial environment
if (isSamlLicensed()) {
try {
await Container.get(SamlService).init();
} catch (error) {
LoggerProxy.error(`SAML initialization failed: ${error.message}`);
}
try {
await Container.get(SamlService).init();
} catch (error) {
LoggerProxy.warn(`SAML initialization failed: ${error.message}`);
}
// ----------------------------------------
@@ -559,6 +561,18 @@ class Server extends AbstractServer {
this.app.use(`/${this.restEndpoint}/variables`, variablesController);
// ----------------------------------------
// Version Control
// ----------------------------------------
// initialize SamlService if it is licensed, even if not enabled, to
// set up the initial environment
try {
await Container.get(VersionControlService).init();
} catch (error) {
LoggerProxy.warn(`Version Control initialization failed: ${error.message}`);
}
// ----------------------------------------
// Returns parameter values which normally get loaded from an external API or