From 08713793d5da8c1d7ddb58f3e0a06361ab9262c1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Wed, 10 Apr 2024 11:48:55 -0400 Subject: [PATCH 1/2] Security session plugin Signed-off-by: Craig Perkins --- public/plugin.ts | 66 ++++++++++++++++++++++++------------------------ server/plugin.ts | 4 +-- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/public/plugin.ts b/public/plugin.ts index 7ac039fb1..74252fc26 100644 --- a/public/plugin.ts +++ b/public/plugin.ts @@ -96,39 +96,39 @@ export class SecurityPlugin (config.readonly_mode?.roles || DEFAULT_READONLY_ROLES).includes(role) ); - if (apiPermission) { - core.application.register({ - id: PLUGIN_NAME, - title: 'Security', - order: 9050, - mount: async (params: AppMountParameters) => { - const { renderApp } = await import('./apps/configuration/configuration-app'); - const [coreStart, depsStart] = await core.getStartServices(); - - // merge OpenSearchDashboards yml configuration - includeClusterPermissions(config.clusterPermissions.include); - includeIndexPermissions(config.indexPermissions.include); - - excludeFromDisabledTransportCategories(config.disabledTransportCategories.exclude); - excludeFromDisabledRestCategories(config.disabledRestCategories.exclude); - - return renderApp(coreStart, depsStart as SecurityPluginStartDependencies, params, config); - }, - category: DEFAULT_APP_CATEGORIES.management, - }); - - if (deps.managementOverview) { - deps.managementOverview.register({ - id: PLUGIN_NAME, - title: 'Security', - order: 9050, - description: i18n.translate('security.securityDescription', { - defaultMessage: - 'Configure how users access data in OpenSearch with authentication, access control and audit logging.', - }), - }); - } - } + // if (apiPermission) { + // core.application.register({ + // id: PLUGIN_NAME, + // title: 'Security', + // order: 9050, + // mount: async (params: AppMountParameters) => { + // const { renderApp } = await import('./apps/configuration/configuration-app'); + // const [coreStart, depsStart] = await core.getStartServices(); + + // // merge OpenSearchDashboards yml configuration + // includeClusterPermissions(config.clusterPermissions.include); + // includeIndexPermissions(config.indexPermissions.include); + + // excludeFromDisabledTransportCategories(config.disabledTransportCategories.exclude); + // excludeFromDisabledRestCategories(config.disabledRestCategories.exclude); + + // return renderApp(coreStart, depsStart as SecurityPluginStartDependencies, params, config); + // }, + // category: DEFAULT_APP_CATEGORIES.management, + // }); + + // if (deps.managementOverview) { + // deps.managementOverview.register({ + // id: PLUGIN_NAME, + // title: 'Security', + // order: 9050, + // description: i18n.translate('security.securityDescription', { + // defaultMessage: + // 'Configure how users access data in OpenSearch with authentication, access control and audit logging.', + // }), + // }); + // } + // } core.application.register({ id: APP_ID_LOGIN, diff --git a/server/plugin.ts b/server/plugin.ts index 5f5f50913..72332bfd0 100644 --- a/server/plugin.ts +++ b/server/plugin.ts @@ -94,7 +94,7 @@ export class SecurityPlugin implements Plugin Date: Wed, 10 Apr 2024 15:33:46 -0400 Subject: [PATCH 2/2] Format Signed-off-by: Craig Perkins --- public/plugin.ts | 15 +++------------ server/plugin.ts | 2 -- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/public/plugin.ts b/public/plugin.ts index 74252fc26..e6dce21a6 100644 --- a/public/plugin.ts +++ b/public/plugin.ts @@ -15,30 +15,21 @@ import { BehaviorSubject } from 'rxjs'; import { SavedObjectsManagementColumn } from 'src/plugins/saved_objects_management/public'; -import { i18n } from '@osd/i18n'; import { AppMountParameters, AppStatus, AppUpdater, CoreSetup, CoreStart, - DEFAULT_APP_CATEGORIES, Plugin, PluginInitializerContext, } from '../../../src/core/public'; -import { APP_ID_LOGIN, CUSTOM_ERROR_PAGE_URI, LOGIN_PAGE_URI, PLUGIN_NAME } from '../common'; +import { APP_ID_LOGIN, CUSTOM_ERROR_PAGE_URI, LOGIN_PAGE_URI } from '../common'; import { APP_ID_CUSTOMERROR } from '../common'; import { setupTopNavButton } from './apps/account/account-app'; import { fetchAccountInfoSafe } from './apps/account/utils'; -import { - API_ENDPOINT_PERMISSIONS_INFO, - includeClusterPermissions, - includeIndexPermissions, -} from './apps/configuration/constants'; -import { - excludeFromDisabledRestCategories, - excludeFromDisabledTransportCategories, -} from './apps/configuration/panels/audit-logging/constants'; +import { API_ENDPOINT_PERMISSIONS_INFO } from './apps/configuration/constants'; + import { SecurityPluginStartDependencies, ClientConfigType, diff --git a/server/plugin.ts b/server/plugin.ts index 72332bfd0..013ded018 100644 --- a/server/plugin.ts +++ b/server/plugin.ts @@ -27,9 +27,7 @@ import { } from '../../../src/core/server'; import { SecurityPluginSetup, SecurityPluginStart } from './types'; -import { defineRoutes } from './routes'; import { SecurityPluginConfigType } from '.'; -import opensearchSecurityConfigurationPlugin from './backend/opensearch_security_configuration_plugin'; import opensearchSecurityPlugin from './backend/opensearch_security_plugin'; import { SecuritySessionCookie, getSecurityCookieOptions } from './session/security_cookie'; import { SecurityClient } from './backend/opensearch_security_client';