[MM-53269] Add configuration setting for integration requests timeout (#23805)

Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com>
Этот коммит содержится в:
Ben Schumacher
2023-12-18 16:07:00 +01:00
коммит произвёл GitHub
родитель 7874daa6f7
Коммит 1fdddfe678
20 изменённых файлов: 343 добавлений и 136 удалений

Просмотреть файл

@@ -6204,6 +6204,50 @@ const AdminDefinition: AdminDefinitionType = {
isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.INTEGRATIONS.INTEGRATION_MANAGEMENT)),
isHidden: it.licensedForFeature('Cloud'),
},
{
type: 'number',
key: 'ServiceSettings.OutgoingIntegrationRequestsTimeout',
label: t('admin.service.integrationRequestTitle'),
label_default: 'Integration request timeout: ',
help_text: t('admin.service.integrationRequestDesc'),
help_text_default: 'The number of seconds to wait for Integration requests. That includes <slashCommands>Slash Commands</slashCommands>, <outgoingWebhooks>Outgoing Webhooks</outgoingWebhooks>, <interactiveMessages>Interactive Messages</interactiveMessages> and <interactiveDialogs>Interactive Dialogs</interactiveDialogs>.',
help_text_values: {
slashCommands: (msg: string) => (
<ExternalLink
location='admin_console'
href={DeveloperLinks.CUSTOM_SLASH_COMMANDS}
>
{msg}
</ExternalLink>
),
outgoingWebhooks: (msg: string) => (
<ExternalLink
location='admin_console'
href={DeveloperLinks.OUTGOING_WEBHOOKS}
>
{msg}
</ExternalLink>
),
interactiveMessages: (msg: string) => (
<ExternalLink
location='admin_console'
href={DeveloperLinks.INTERACTIVE_MESSAGES}
>
{msg}
</ExternalLink>
),
interactiveDialogs: (msg: string) => (
<ExternalLink
location='admin_console'
href={DeveloperLinks.INTERACTIVE_DIALOGS}
>
{msg}
</ExternalLink>
),
},
help_text_markdown: false,
isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.INTEGRATIONS.INTEGRATION_MANAGEMENT)),
},
{
type: 'bool',
key: 'ServiceSettings.EnablePostUsernameOverride',

Просмотреть файл

@@ -2244,6 +2244,8 @@
"admin.service.iconTitle": "Enable integrations to override profile picture icons:",
"admin.service.insecureTlsDesc": "When true, any outgoing HTTPS requests will accept unverified, self-signed certificates. For example, outgoing webhooks to a server with a self-signed TLS certificate, using any domain, will be allowed. Note that this makes these connections susceptible to man-in-the-middle attacks.",
"admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
"admin.service.integrationRequestDesc": "The number of seconds to wait for Integration requests. That includes <slashCommands>Slash Commands</slashCommands>, <outgoingWebhooks>Outgoing Webhooks</outgoingWebhooks>, <interactiveMessages>Interactive Messages</interactiveMessages> and <interactiveDialogs>Interactive Dialogs</interactiveDialogs>.",
"admin.service.integrationRequestTitle": "Integration request timeout: ",
"admin.service.internalConnectionsDesc": "A whitelist of local network addresses that can be requested by the Mattermost server on behalf of a client. Care should be used when configuring this setting to prevent unintended access to your local network. See <link>documentation</link> to learn more. Changing this requires a server restart before taking effect.",
"admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
"admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",

Просмотреть файл

@@ -1139,6 +1139,8 @@ export const DeveloperLinks = {
ENABLE_OAUTH2: 'https://mattermost.com/pl/enable-oauth',
INCOMING_WEBHOOKS: 'https://mattermost.com/pl/incoming-webhooks',
OUTGOING_WEBHOOKS: 'https://mattermost.com/pl/outgoing-webhooks',
INTERACTIVE_MESSAGES: 'https://mattermost.com/pl/interactive-messages',
INTERACTIVE_DIALOGS: 'https://mattermost.com/pl/interactive-dialogs',
PERSONAL_ACCESS_TOKENS: 'https://mattermost.com/pl/personal-access-tokens',
PLUGIN_SIGNING: 'https://mattermost.com/pl/sign-plugins',
PLUGINS: 'https://mattermost.com/pl/plugins',