Skip to content

Commit b8cb94b

Browse files
committed
- Updated telemetry backend
- Filtered out non alphanumeric characters from jdk versions fetched dynamically.
1 parent 9241921 commit b8cb94b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

vscode/src/telemetry/telemetry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export namespace Telemetry {
2626

2727
export const getIsTelemetryFeatureAvailable = (): boolean => {
2828
const TELEMETRY_API = TelemetryConfiguration.getInstance()?.getApiConfig();
29-
return TELEMETRY_API?.baseUrl != null && TELEMETRY_API?.baseUrl.trim().length > 0;
29+
return TELEMETRY_API?.baseUrl != null && TELEMETRY_API?.baseUrl.trim().length > 0 && (TELEMETRY_API?.baseUrl.trim().startsWith("https://") || process.env['oracle_oracleJava_allow_httpTelemetryServer'] === "true");
3030
}
3131

3232
export const initializeTelemetry = (contextInfo: ExtensionContextInfo): TelemetryManager => {

vscode/src/webviews/jdkDownloader/view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export class JdkDownloaderView {
196196
if (isString(availableVersions)) {
197197
const availableVersionsObj = JSON.parse(availableVersions);
198198
if (availableVersionsObj?.items) {
199-
const jdkVersions = availableVersionsObj?.items?.map((version: any) => version.jdkDetails.jdkVersion);
199+
const jdkVersions = availableVersionsObj?.items?.map((version: any) => String(version.jdkDetails.jdkVersion).replace(/[^a-zA-Z0-9_.+-]/g,""));
200200
LOGGER.log(`Fetched Oracle JDK versions: ${jdkVersions}`);
201201

202202
return jdkVersions;

0 commit comments

Comments
 (0)