tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-07 16:16:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

prettier

Browse Source
This commit is contained in:
ryan
2026-07-13 15:08:40 +08:00
parent 08e8eea932
commit 1eff7878a1
441 changed files with 26491 additions and 18405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/tests/unit/waf-binding-order.test.tsx
+48 -26
View File
@@ -1,17 +1,18 @@
import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
import {fireEvent, render, screen, waitFor} from '@testing-library/react';
import {createElement} from 'react';
import {beforeEach, describe, expect, it, vi} from 'vitest';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { createElement } from 'react';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import {
reorderRuleIDs,
WafSection,
} from '@/app/(main)/proxy-routes/detail/components/waf-section';
import type {ProxyRouteItem, WAFRule} from '@/lib/services/openflare';
import {WafService} from '@/lib/services/openflare';
import type { ProxyRouteItem, WAFRule } from '@/lib/services/openflare';
import { WafService } from '@/lib/services/openflare';
vi.mock('@/lib/services/openflare', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/lib/services/openflare')>();
const actual =
await importOriginal<typeof import('@/lib/services/openflare')>();
return {
...actual,
WafService: {
@@ -24,10 +25,22 @@ vi.mock('@/lib/services/openflare', async (importOriginal) => {
const graph = {
schema_version: 1,
nodes: [
{id: 'start', type: 'start' as const, position: {x: 0, y: 0}, config: {}},
{id: 'allow', type: 'allow' as const, position: {x: 100, y: 0}, config: {}},
{
id: 'start',
type: 'start' as const,
position: { x: 0, y: 0 },
config: {},
},
{
id: 'allow',
type: 'allow' as const,
position: { x: 100, y: 0 },
config: {},
},
],
edges: [
{ id: 'edge', source: 'start', source_handle: 'next', target: 'allow' },
],
edges: [{id: 'edge', source: 'start', source_handle: 'next', target: 'allow'}],
};
function rule(id: number, name: string, isGlobal = false): WAFRule {
@@ -64,13 +77,15 @@ describe('WAF route binding order', () => {
applied_rule_groups: [rule(1, '规则 A'), rule(2, '规则 B')],
applied_ids: [1, 2],
});
vi.mocked(WafService.updateSiteRuleGroups).mockImplementation(async (_routeID, ids) => ({
route_id: 9,
global_rule_group: rule(99, '全局规则', true),
rule_groups: [rule(1, '规则 A'), rule(2, '规则 B'), rule(3, '规则 C')],
applied_rule_groups: ids.map((id) => rule(id, `规则 ${id}`)),
applied_ids: ids,
}));
vi.mocked(WafService.updateSiteRuleGroups).mockImplementation(
async (_routeID, ids) => ({
route_id: 9,
global_rule_group: rule(99, '全局规则', true),
rule_groups: [rule(1, '规则 A'), rule(2, '规则 B'), rule(3, '规则 C')],
applied_rule_groups: ids.map((id) => rule(id, `规则 ${id}`)),
applied_ids: ids,
}),
);
});
it('reorders by the active and target IDs reported by drag end', () => {
@@ -78,26 +93,33 @@ describe('WAF route binding order', () => {
});
it('keeps the global rule fixed and submits custom rules in UI order', async () => {
const client = new QueryClient({defaultOptions: {queries: {retry: false}}});
const client = new QueryClient({
defaultOptions: { queries: { retry: false } },
});
render(
createElement(
QueryClientProvider,
{client},
createElement(WafSection, {route: {id: 9} as ProxyRouteItem}),
{ client },
createElement(WafSection, { route: { id: 9 } as ProxyRouteItem }),
),
);
expect(await screen.findByText('全局规则')).toBeInTheDocument();
expect(screen.getByText('始终生效')).toBeInTheDocument();
expect(screen.queryByRole('button', {name: '上移全局规则'})).not.toBeInTheDocument();
expect(
screen.queryByRole('button', { name: '上移全局规则' }),
).not.toBeInTheDocument();
fireEvent.click(screen.getByRole('checkbox', {name: '选择规则 C'}));
fireEvent.click(screen.getByRole('button', {name: '上移规则 C'}));
fireEvent.click(screen.getByRole('button', {name: '上移规则 C'}));
fireEvent.click(screen.getByRole('button', {name: '保存'}));
fireEvent.click(screen.getByRole('checkbox', { name: '选择规则 C' }));
fireEvent.click(screen.getByRole('button', { name: '上移规则 C' }));
fireEvent.click(screen.getByRole('button', { name: '上移规则 C' }));
fireEvent.click(screen.getByRole('button', { name: '保存' }));
await waitFor(() => {
expect(WafService.updateSiteRuleGroups).toHaveBeenCalledWith(9, [3, 1, 2]);
expect(WafService.updateSiteRuleGroups).toHaveBeenCalledWith(
9,
[3, 1, 2],
);
});
});
});
frontend/tests/unit/waf-rule-service.test.ts
+41 -32
View File
@@ -1,19 +1,19 @@
import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
import {fireEvent, render, screen, waitFor} from '@testing-library/react';
import type {AxiosResponse} from 'axios';
import {createElement} from 'react';
import {beforeEach, describe, expect, it, vi} from 'vitest';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import type { AxiosResponse } from 'axios';
import { createElement } from 'react';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import WafPage from '@/app/(main)/waf/page';
import apiClient from '@/lib/services/core/api-client';
import {WafService} from '@/lib/services/openflare';
import type {WAFSiteRuleGroups} from '@/lib/services/openflare';
import {WafService as DirectWafService} from '@/lib/services/openflare/waf.service';
import { WafService } from '@/lib/services/openflare';
import type { WAFSiteRuleGroups } from '@/lib/services/openflare';
import { WafService as DirectWafService } from '@/lib/services/openflare/waf.service';
const pushMock = vi.fn();
vi.mock('next/navigation', () => ({
useRouter: () => ({push: pushMock}),
useRouter: () => ({ push: pushMock }),
}));
vi.mock('@/lib/services/core/api-client', () => ({
@@ -23,7 +23,8 @@ vi.mock('@/lib/services/core/api-client', () => ({
}));
vi.mock('@/lib/services/openflare', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/lib/services/openflare')>();
const actual =
await importOriginal<typeof import('@/lib/services/openflare')>();
return {
...actual,
WafService: {
@@ -39,10 +40,22 @@ vi.mock('@/lib/services/openflare', async (importOriginal) => {
const graph = {
schema_version: 1,
nodes: [
{id: 'start', type: 'start' as const, position: {x: 0, y: 0}, config: {}},
{id: 'allow', type: 'allow' as const, position: {x: 200, y: 0}, config: {}},
{
id: 'start',
type: 'start' as const,
position: { x: 0, y: 0 },
config: {},
},
{
id: 'allow',
type: 'allow' as const,
position: { x: 200, y: 0 },
config: {},
},
],
edges: [
{ id: 'edge', source: 'start', source_handle: 'next', target: 'allow' },
],
edges: [{id: 'edge', source: 'start', source_handle: 'next', target: 'allow'}],
};
const ruleSummary = {
@@ -79,35 +92,35 @@ describe('WafService rule graph API', () => {
it('creates a rule with a name-only payload', async () => {
vi.mocked(apiClient.post).mockResolvedValue({
data: {error_msg: '', data: {id: 17, name: '入口防护', graph}},
data: { error_msg: '', data: { id: 17, name: '入口防护', graph } },
} as AxiosResponse);
await DirectWafService.createRule({name: '入口防护'});
await DirectWafService.createRule({ name: '入口防护' });
expect(apiClient.post).toHaveBeenCalledWith(
'/api/v1/d/waf/rule-groups',
{name: '入口防护'},
{ name: '入口防护' },
undefined,
);
});
it('saves the graph together with its current revision', async () => {
vi.mocked(apiClient.post).mockResolvedValue({
data: {error_msg: '', data: {id: 17, revision: 4, graph}},
data: { error_msg: '', data: { id: 17, revision: 4, graph } },
} as AxiosResponse);
await DirectWafService.saveRuleGraph(17, {revision: 3, graph});
await DirectWafService.saveRuleGraph(17, { revision: 3, graph });
expect(apiClient.post).toHaveBeenCalledWith(
'/api/v1/d/waf/rule-groups/17/graph',
{revision: 3, graph},
{ revision: 3, graph },
undefined,
);
});
it('updates rule metadata with the current name and enabled state', async () => {
vi.mocked(apiClient.post).mockResolvedValue({
data: {error_msg: '', data: {...ruleSummary, enabled: true}},
data: { error_msg: '', data: { ...ruleSummary, enabled: true } },
} as AxiosResponse);
await DirectWafService.updateRuleMeta(17, {
@@ -117,7 +130,7 @@ describe('WafService rule graph API', () => {
expect(apiClient.post).toHaveBeenCalledWith(
'/api/v1/d/waf/rule-groups/17/meta',
{name: '入口防护', enabled: true},
{ name: '入口防护', enabled: true },
undefined,
);
});
@@ -140,25 +153,21 @@ describe('WAF rule creation flow', () => {
it('creates by name and navigates directly to the graph editor', async () => {
const client = new QueryClient({
defaultOptions: {queries: {retry: false, gcTime: 0}},
defaultOptions: { queries: { retry: false, gcTime: 0 } },
});
render(
createElement(
QueryClientProvider,
{client},
createElement(WafPage),
),
createElement(QueryClientProvider, { client }, createElement(WafPage)),
);
fireEvent.click(await screen.findByRole('button', {name: '新建规则'}));
fireEvent.click(await screen.findByRole('button', { name: '新建规则' }));
expect(screen.queryByText('IP 白名单')).not.toBeInTheDocument();
fireEvent.change(screen.getByRole('textbox', {name: '规则名称'}), {
target: {value: '入口防护'},
fireEvent.change(screen.getByRole('textbox', { name: '规则名称' }), {
target: { value: '入口防护' },
});
fireEvent.click(screen.getByRole('button', {name: '创建并编排'}));
fireEvent.click(screen.getByRole('button', { name: '创建并编排' }));
await waitFor(() => {
expect(WafService.createRule).toHaveBeenCalledWith({name: '入口防护'});
expect(WafService.createRule).toHaveBeenCalledWith({ name: '入口防护' });
expect(pushMock).toHaveBeenCalledWith('/waf/rules/editor?id=17');
});
});