github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-07-31 16:25:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix protobuf prettify logic (#732)

Browse Source
This commit is contained in:
M. Mert Yıldıran 2022-01-31 17:58:38 +03:00 committed by GitHub
parent 71425928cc
commit cbff1837c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/components/EntryDetailed/EntrySections.tsx
View File

@ -137,12 +137,12 @@ export const EntryBodySection: React.FC<EntryBodySectionProps> = ({
const chunk = body.slice(0, MAXIMUM_BYTES_TO_FORMAT); const chunk = body.slice(0, MAXIMUM_BYTES_TO_FORMAT);
const bodyBuf = isBase64Encoding ? atob(chunk) : chunk; const bodyBuf = isBase64Encoding ? atob(chunk) : chunk;
if (!isPretty) return bodyBuf;
try { try {
if (jsonLikeFormats.some(format => contentType?.indexOf(format) > -1)) { if (jsonLikeFormats.some(format => contentType?.indexOf(format) > -1)) {
if (!isPretty) return bodyBuf;
return jsonBeautify(JSON.parse(bodyBuf), null, 2, 80); return jsonBeautify(JSON.parse(bodyBuf), null, 2, 80);
} else if (xmlLikeFormats.some(format => contentType?.indexOf(format) > -1)) { } else if (xmlLikeFormats.some(format => contentType?.indexOf(format) > -1)) {
if (!isPretty) return bodyBuf;
return xmlBeautify(bodyBuf, { return xmlBeautify(bodyBuf, {
indentation: ' ', indentation: ' ',
filter: (node) => node.type !== 'Comment', filter: (node) => node.type !== 'Comment',
@ -152,7 +152,9 @@ export const EntryBodySection: React.FC<EntryBodySectionProps> = ({
} else if (protobufFormats.some(format => contentType?.indexOf(format) > -1)) { } else if (protobufFormats.some(format => contentType?.indexOf(format) > -1)) {
// Replace all non printable characters (ASCII) // Replace all non printable characters (ASCII)
const protobufDecoder = new ProtobufDecoder(bodyBuf, true); const protobufDecoder = new ProtobufDecoder(bodyBuf, true);
return jsonBeautify(protobufDecoder.decode().toSimple(), null, 2, 80); const protobufDecoded = protobufDecoder.decode().toSimple();
if (!isPretty) return JSON.stringify(protobufDecoded);
return jsonBeautify(protobufDecoded, null, 2, 80);
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);