Skip to content

Mayuran/DAPI-339/[All API's] Provided an invalid json in request and got success response. [ FE passing incomplete buffer in BE call ]/ #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions src/features/Apiexplorer/RequestResponseRenderer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import styles from '../RequestJSONBox/RequestJSONBox.module.scss';
import { ValidDialog } from '../ValidDialog';
import { translate } from '@docusaurus/Translate';
import { Button } from '@deriv-com/quill-ui';
import { hasDuplicateKeys } from '@site/src/utils';

export interface IResponseRendererProps<T extends TSocketEndpointNames> {
name: T;
Expand All @@ -33,27 +34,38 @@ function RequestResponseRenderer<T extends TSocketEndpointNames>({
disableApiNameOnRequest();
}, []);

const setInvalidJson = () => {
setIsNotValid(true);
setToggleModal(false);
};

const parseRequestJSON = () => {
let request_data: TSocketRequestProps<T> extends never ? undefined : TSocketRequestProps<T>;

try {
if (hasDuplicateKeys(reqData)) {
setInvalidJson();
return;
}
request_data = JSON.parse(reqData);
return request_data;
} catch (error) {
setIsNotValid(true);
setToggleModal(false);
setInvalidJson();
return;
}

return request_data;
};

const handleClick = useCallback(() => {
if (!is_logged_in && auth == AUTH_ENABLED) {
setToggleModal(true);
return;
}
clear();
send(parseRequestJSON());
setResponseState(true);
const request_data = parseRequestJSON();
if (request_data) {
clear();
send(request_data);
setResponseState(true);
}
}, [reqData, send, clear, auth, is_logged_in]);

const handleClear = () => {
Expand Down
27 changes: 20 additions & 7 deletions src/features/Apiexplorer/SubscribeRenderer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import PlaygroundSection from '../RequestResponseRenderer/PlaygroundSection';
import LoginDialog from '../LoginDialog';
import ValidDialog from '../ValidDialog';
import { translate } from '@docusaurus/Translate';
import { hasDuplicateKeys } from '@site/src/utils';

export interface IResponseRendererProps<T extends TSocketSubscribableEndpointNames> {
name: T;
Expand Down Expand Up @@ -54,27 +55,39 @@ function SubscribeRenderer<T extends TSocketSubscribableEndpointNames>({
if (is_switching_account) unsubscribe();
}, [is_switching_account]);

const setInvalidJson = () => {
setIsNotValid(true);
setToggleModal(false);
};

const parseRequestJSON = useCallback(() => {
let request_data: TSocketRequestProps<T> extends never ? undefined : TSocketRequestProps<T>;

try {
if (hasDuplicateKeys(reqData)) {
setInvalidJson();
return;
}

request_data = JSON.parse(reqData);
return request_data;
} catch (error) {
setIsNotValid(true);
setToggleModal(false);
setInvalidJson();
return;
}

return request_data;
}, [reqData]);

const handleClick = useCallback(() => {
if (!is_logged_in && auth == AUTH_ENABLED) {
setToggleModal(true);
return;
}
if (is_subscribed) unsubscribe();
subscribe(parseRequestJSON());
setResponseState(true);
const request_data = parseRequestJSON();
if (request_data) {
if (is_subscribed) unsubscribe();
subscribe(request_data);
setResponseState(true);
}
}, [parseRequestJSON, subscribe, auth]);

const handleClear = () => {
Expand Down
16 changes: 16 additions & 0 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,22 @@ export const findVirtualAccount = (accounts: IUserLoginAccount[]) => {
return accounts.find((item) => item.name.includes('VRTC'));
};

export const hasDuplicateKeys = (jsonStr: string) => {
const keyCounts = new Map();
const regex = /"([^"]+)"\s*:/g;
let match;

while ((match = regex.exec(jsonStr)) !== null) {
const key = match[1];
if (keyCounts.has(key)) {
return true; // Found a duplicate
}
keyCounts.set(key, 1);
}

return false; // No duplicates found
};

/**
* Returns the appropriate TMB config URL based on the environment
* @returns {string} The TMB config URL
Expand Down
Loading