Skip to content
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "Corgea",
"publisher": "Corgea",
"description": "Corgea helps you automatically fix insecure code.",
"version": "1.5.2",
"version": "1.5.3",
"icon": "images/logo.png",
"license": "UNLICENSED",
"repository": {
Expand Down
19 changes: 10 additions & 9 deletions src/providers/vulnerabilitiesWebviewProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,10 @@ export default class VulnerabilitiesWebviewProvider implements vscode.WebviewVie
});
}

private _safeJsonStringify(value: any): string {
return JSON.stringify(value).replace(/</g, '\\u003c').replace(/>/g, '\\u003e');
}

private _getReactHtmlTemplate(data: any): string {
return `<!DOCTYPE html>
<html>
Expand All @@ -420,33 +424,30 @@ export default class VulnerabilitiesWebviewProvider implements vscode.WebviewVie
</head>
<body>
<div id="app"></div>
<script type="module" src="${data.bundleURI}"></script>
<script>
// Acquire VS Code API once and make it available globally
(function() {
if (!window.vscode) {
window.vscode = acquireVsCodeApi();
}
})();

// Pass initial data to React app
window.initialData = {
logoURI: '${data.logoURI}',
isLoading: ${data.isLoading},
isAuthenticated: ${data.isAuthenticated},
projectNotFound: ${data.projectNotFound},
vulnerabilities: ${JSON.stringify(data.vulnerabilities)},
scaVulnerabilities: ${JSON.stringify(data.scaVulnerabilities)},
fileGroups: ${JSON.stringify(data.fileGroups)},
packageGroups: ${JSON.stringify(data.packageGroups)},
vulnerabilities: ${this._safeJsonStringify(data.vulnerabilities)},
scaVulnerabilities: ${this._safeJsonStringify(data.scaVulnerabilities)},
fileGroups: ${this._safeJsonStringify(data.fileGroups)},
packageGroups: ${this._safeJsonStringify(data.packageGroups)},
hasVulnerabilities: ${data.hasVulnerabilities},
hasSCAVulnerabilities: ${data.hasSCAVulnerabilities},
scanState: ${JSON.stringify(data.scanState)},
scanState: ${this._safeJsonStringify(data.scanState)},
isInScanningMode: ${data.isInScanningMode},
autoRefreshEnabled: ${data.autoRefreshEnabled},
ideScanningEnabled: ${data.ideScanningEnabled}
};
</script>
<script type="module" src="${data.bundleURI}"></script>
</body>
</html>`;
}
Expand Down
10 changes: 10 additions & 0 deletions src/views/entry/SidePanelView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ import VulnerabilitiesApp from '../components/VulnerabilitiesApp/Vulnerabilities
// Global styles
import '../styles/global.css';

declare function acquireVsCodeApi(): {
postMessage: (message: any) => void;
getState: () => any;
setState: (state: any) => void;
};

if (typeof acquireVsCodeApi !== 'undefined' && !window.vscode) {
window.vscode = acquireVsCodeApi();
}

const container = document.getElementById('app');
if (!container) {
throw new Error('Root container not found');
Expand Down