feat(platform): prevent unscoped raw field lookups
This commit is contained in:
@@ -189,10 +189,13 @@ export default function App() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const updateHistoryFilters = (filters: Record<string, unknown> = {}, tab = historyTab) => {
|
const updateHistoryFilters = (filters: Record<string, unknown> = {}, tab = historyTab) => {
|
||||||
|
const hasKeywordInput = Object.prototype.hasOwnProperty.call(filters, 'keyword');
|
||||||
const nextFilters = normalizeHistoryFilterValues(filters);
|
const nextFilters = normalizeHistoryFilterValues(filters);
|
||||||
setHistoryFilters(nextFilters);
|
setHistoryFilters(nextFilters);
|
||||||
if (nextFilters.keyword) {
|
if (nextFilters.keyword) {
|
||||||
setAnalysisVin(nextFilters.keyword);
|
setAnalysisVin(nextFilters.keyword);
|
||||||
|
} else if (hasKeywordInput) {
|
||||||
|
setAnalysisVin('');
|
||||||
}
|
}
|
||||||
setActiveProtocol(nextFilters.protocol ?? '');
|
setActiveProtocol(nextFilters.protocol ?? '');
|
||||||
setHistoryTab(tab);
|
setHistoryTab(tab);
|
||||||
@@ -201,7 +204,7 @@ export default function App() {
|
|||||||
if (tab && tab !== 'location') {
|
if (tab && tab !== 'location') {
|
||||||
routeFilters.tab = tab;
|
routeFilters.tab = tab;
|
||||||
}
|
}
|
||||||
replaceHash('history', keyword ?? analysisVin, protocol, routeFilters);
|
replaceHash('history', hasKeywordInput ? keyword : (keyword ?? analysisVin), protocol, routeFilters);
|
||||||
};
|
};
|
||||||
|
|
||||||
const replaceHistoryHash = (filters: Record<string, string> = {}, tab = historyTab) => {
|
const replaceHistoryHash = (filters: Record<string, string> = {}, tab = historyTab) => {
|
||||||
|
|||||||
@@ -58,6 +58,19 @@ function isIncludeFieldsEnabled(value?: boolean | string) {
|
|||||||
return value === true || value === 'true';
|
return value === true || value === 'true';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasRawFieldQueryScope(filters: HistoryFilters) {
|
||||||
|
return Boolean(
|
||||||
|
filters.keyword?.trim() ||
|
||||||
|
filters.dateFrom?.trim() ||
|
||||||
|
filters.dateTo?.trim() ||
|
||||||
|
splitFields(filters.fields).length > 0
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function shouldBlockRawFieldQuery(filters: HistoryFilters) {
|
||||||
|
return isIncludeFieldsEnabled(filters.includeFields) && !hasRawFieldQueryScope(filters);
|
||||||
|
}
|
||||||
|
|
||||||
function isFiniteNumber(value: unknown): value is number {
|
function isFiniteNumber(value: unknown): value is number {
|
||||||
return typeof value === 'number' && Number.isFinite(value);
|
return typeof value === 'number' && Number.isFinite(value);
|
||||||
}
|
}
|
||||||
@@ -72,9 +85,10 @@ function formatNumber(value?: number, suffix = '') {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function mergeInitialFilters(initialVin: string, initialProtocol?: string, initialFilters: Record<string, string> = {}): HistoryFilters {
|
function mergeInitialFilters(initialVin: string, initialProtocol?: string, initialFilters: Record<string, string> = {}): HistoryFilters {
|
||||||
|
const hasExplicitFilters = Object.keys(initialFilters).length > 0;
|
||||||
return {
|
return {
|
||||||
...defaultFilters,
|
...defaultFilters,
|
||||||
keyword: initialVin || defaultFilters.keyword,
|
keyword: initialVin || (hasExplicitFilters ? '' : defaultFilters.keyword),
|
||||||
protocol: initialProtocol,
|
protocol: initialProtocol,
|
||||||
...initialFilters,
|
...initialFilters,
|
||||||
includeFields: isIncludeFieldsEnabled(initialFilters.includeFields)
|
includeFields: isIncludeFieldsEnabled(initialFilters.includeFields)
|
||||||
@@ -178,6 +192,12 @@ export function History({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const loadRawFrames = (nextFilters = filters, page = rawPagination.currentPage, pageSize = rawPagination.pageSize) => {
|
const loadRawFrames = (nextFilters = filters, page = rawPagination.currentPage, pageSize = rawPagination.pageSize) => {
|
||||||
|
if (shouldBlockRawFieldQuery(nextFilters)) {
|
||||||
|
setRawFrames({ items: [], total: 0, limit: pageSize, offset: (page - 1) * pageSize });
|
||||||
|
setRawPagination({ currentPage: page, pageSize });
|
||||||
|
Toast.warning('RAW 解析字段查询需要车辆、时间范围或字段裁剪');
|
||||||
|
return;
|
||||||
|
}
|
||||||
setLoadingRaw(true);
|
setLoadingRaw(true);
|
||||||
api.rawFramesQuery(buildRawQuery(nextFilters, pageSize, (page - 1) * pageSize))
|
api.rawFramesQuery(buildRawQuery(nextFilters, pageSize, (page - 1) * pageSize))
|
||||||
.then((nextPage) => {
|
.then((nextPage) => {
|
||||||
|
|||||||
@@ -3892,6 +3892,54 @@ test('updates history hash when vehicle history filters are submitted', async ()
|
|||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('prevents unscoped raw parsed-field query from history form', async () => {
|
||||||
|
window.history.replaceState(null, '', '/#/history?keyword=VIN-SAFE-RAW');
|
||||||
|
const fetchMock = vi.spyOn(globalThis, 'fetch').mockImplementation(async (input) => {
|
||||||
|
const path = String(input);
|
||||||
|
if (path.includes('/api/ops/health')) {
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({
|
||||||
|
data: { linkHealth: [], kafkaLag: 0, redisOnlineKeys: 0, tdengineWritable: true, mysqlWritable: true, runtime: { requestTimeoutMs: 5000 } },
|
||||||
|
traceId: 'trace-test',
|
||||||
|
timestamp: 1783094400000
|
||||||
|
})
|
||||||
|
} as Response;
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({
|
||||||
|
data: { items: [], total: 0, limit: 10, offset: 0 },
|
||||||
|
traceId: 'trace-test',
|
||||||
|
timestamp: 1783094400000
|
||||||
|
})
|
||||||
|
} as Response;
|
||||||
|
});
|
||||||
|
|
||||||
|
render(<App />);
|
||||||
|
|
||||||
|
await screen.findByRole('heading', { name: '轨迹回放' });
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(fetchMock).toHaveBeenCalledWith('/api/history/raw-frames/query', expect.objectContaining({
|
||||||
|
body: expect.stringContaining('VIN-SAFE-RAW')
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
fetchMock.mockClear();
|
||||||
|
|
||||||
|
const keywordInput = screen.getByPlaceholderText('VIN / 车牌 / 手机号');
|
||||||
|
fireEvent.change(keywordInput, { target: { value: '' } });
|
||||||
|
fireEvent.input(keywordInput, { target: { value: '' } });
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(keywordInput).toHaveValue('');
|
||||||
|
});
|
||||||
|
fireEvent.click(screen.getByRole('checkbox', { name: '返回解析字段' }));
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: 'search 查询' }));
|
||||||
|
|
||||||
|
expect((await screen.findAllByText('RAW 解析字段查询需要车辆、时间范围或字段裁剪')).length).toBeGreaterThanOrEqual(1);
|
||||||
|
expect(fetchMock).toHaveBeenCalledWith(expect.stringContaining('/api/history/locations?'), undefined);
|
||||||
|
expect(fetchMock).not.toHaveBeenCalledWith('/api/history/raw-frames/query', expect.anything());
|
||||||
|
});
|
||||||
|
|
||||||
test('shows trajectory playback workspace from history locations', async () => {
|
test('shows trajectory playback workspace from history locations', async () => {
|
||||||
window.history.replaceState(null, '', '/#/history?keyword=VIN-TRACK-001&protocol=JT808');
|
window.history.replaceState(null, '', '/#/history?keyword=VIN-TRACK-001&protocol=JT808');
|
||||||
vi.spyOn(globalThis, 'fetch').mockImplementation(async (input, init) => {
|
vi.spyOn(globalThis, 'fetch').mockImplementation(async (input, init) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user