[CLD-6324] Cloud IP Filtering (#24726)
* Initial comit for ip filtering service implementation * Add audit logs for IP Filters * start of webapp work * Stashing * Updates based on Agniva's feedback around service vs einterface * Updates completed * Commit before refactoring, everything's working * First pass of cleanup complete, front-end tests added * actually add files * Updates to some translation strings, running i18n-extract * Lock everything behind a feature flag * Fix tests, try to fix some linter stuff * Fixed linter for JS, on to scss * Fixed linter for scss * Fix linter * More fixes for pipeline * Support for IPV6 * Remove tsx file that was removed in masteR * Revert package.json and package-lock.json to master, add cidr-regex dep into channels/package.json * Another commit to force fix Github * Fixes around IPV6. Some suggestions from Matt re: UX review. Fixing pipelines for tests and types on new cidr-regex package * Changes to address Matt's feedback * A few more changes for clean up * Add support for permissions * Fix vet for OpenAPI spec * Actually add the yaml file for openapi * Add permission migration to allow support for IP Filtering * Fix tests * Final fixes from Matt * Remove cancel button from page, update link outs to documentation * Update test to account for removed cancel button * Adjustments based on feedback from Harrison * More fixes from PR feedback * Add a t to fix translations that doesn't seem to be breaking anyone else? * More fix * updates for PR feedback * Fix linter * Fix types * Now fix the linter again * Add back tests because Harrison was able to get them running * Adjustments for PR feedback * Remove admin_definition.jsx * Fix linter * [CLD-6453] IP Filtering notification email for sysadmins (#25224) * Initial commit for IP filtering alert email * Updates to style for email, addition of ip_filtering email: * Fix pipelines * Adjustments from Matt's feedback * Padding changes * template diff (#25249) Co-authored-by: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com> * Fix hardcoded true, remove bool return value --------- Co-authored-by: Mattermost Build <build@mattermost.com> Co-authored-by: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com> * Lock feature behind enterprise license. Drop cidr-regex in favour of ipaddr.js dependency. Refactor isIpAddressWithinRanges to use ipaddr.js * Add a couple server tests * fix linter * Fix types from merge conflicts --------- Co-authored-by: Mattermost Build <build@mattermost.com> Co-authored-by: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com>
Этот коммит содержится в:
@@ -61,6 +61,9 @@ import {
|
||||
AdminConfig,
|
||||
EnvironmentConfig,
|
||||
RequestLicenseBody,
|
||||
AllowedIPRanges,
|
||||
AllowedIPRange,
|
||||
FetchIPResponse,
|
||||
} from '@mattermost/types/config';
|
||||
import {CustomEmoji} from '@mattermost/types/emojis';
|
||||
import {ServerError} from '@mattermost/types/errors';
|
||||
@@ -4161,6 +4164,27 @@ export default class Client4 {
|
||||
);
|
||||
};
|
||||
|
||||
getIPFilters = () => {
|
||||
return this.doFetch<AllowedIPRange[]>(
|
||||
`${this.getBaseRoute()}/ip_filtering`,
|
||||
{method: 'get'},
|
||||
)
|
||||
}
|
||||
|
||||
getCurrentIP = () => {
|
||||
return this.doFetch<FetchIPResponse>(
|
||||
`${this.getBaseRoute()}/ip_filtering/my_ip`,
|
||||
{method: 'get'},
|
||||
)
|
||||
}
|
||||
|
||||
applyIPFilters = (filters: AllowedIPRanges) => {
|
||||
return this.doFetch<AllowedIPRange[]>(
|
||||
`${this.getBaseRoute()}/ip_filtering`,
|
||||
{method: 'post', body: JSON.stringify(filters)},
|
||||
)
|
||||
}
|
||||
|
||||
submitTrueUpReview = () => {
|
||||
return this.doFetch(
|
||||
`${this.getBaseRoute()}/license/review`,
|
||||
|
||||
Ссылка в новой задаче
Block a user