Skip to content
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.

Sign up for GitHub

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

fix: security upgrade axios from 0.27.2 to 1.6.0 [HEAD-1036] #387

Merged
merged 4 commits into from
Dec 4, 2023
Merged

fix: security upgrade axios from 0.27.2 to 1.6.0 [HEAD-1036] #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5dc17a5
fix: package.json & package-lock.json to reduce vulnerabilities
snyk-bot Oct 28, 2023
37c69cc
chore: fix misspelling
cat2608 Dec 1, 2023
c6cb40c
chore: update imports order due to lint
cat2608 Dec 1, 2023
9fc9cda
fix: set `Authorization` instead of overriding headers
cat2608 Dec 1, 2023
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
46 changes: 29 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@
"scope": "application"
},
"snyk.yesTelemetry": {
"//": "Name starts with y to put it at the end, as configs are sorted alphbetically",
"//": "Name starts with y to put it at the end, as configs are sorted alphabetically",
"type": "boolean",
"default": true,
"markdownDescription": "Send usage statistics to Snyk",
"scope": "application"
},
"snyk.yesWelcomeNotification": {
"//": "Name starts with y to put it at the end, as configs are sorted alphbetically",
"//": "Name starts with y to put it at the end, as configs are sorted alphabetically",
"type": "boolean",
"default": true,
"markdownDescription": "Show welcome notification after installation and restart",
"scope": "application"
},
"snyk.yesBackgroundOssNotification": {
"//": "Name starts with y to put it at the end, as configs are sorted alphbetically",
"//": "Name starts with y to put it at the end, as configs are sorted alphabetically",
"type": "boolean",
"default": true,
"markdownDescription": "Show scan notification for critical Open Source Security vulnerabilities when Snyk view is hidden",
Expand Down Expand Up @@ -440,7 +440,7 @@
"@sentry/tracing": "^6.19.7",
"@snyk/code-client": "^4.12.4",
"analytics-node": "^4.0.1",
"axios": "^0.27.2",
"axios": "^1.6.0",
"glob": "^7.2.0",
"he": "^1.2.0",
"htmlparser2": "^7.2.0",
Expand Down
6 changes: 1 addition & 5 deletions src/snyk/advisor/services/advisorApiClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ export class AdvisorApiClient implements IAdvisorApiClient {
const token = await this.configuration.getToken();
this.http.interceptors.request.use(req => {
req.baseURL = this.configuration.baseApiUrl;
req.headers = {
...req.headers,
Authorization: `token ${token}`,
} as { [header: string]: string };

req.headers['Authorization'] = `token ${token}`;
Copy link
Contributor

@cat2608 cat2608 Dec 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change needed due to Axios upgrade. This change sets the Authorization header individually instead of overwriting the entire headers object.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: if this is the only place where axios is used, we may be able to get rid of the functionality entirely. I think advisor is a remnant of an incomplete contribution, which we need to remove anyway. Have you found any location where it is used in the extension right now?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bastiandoetsch after some research, I can see that this feature was completed here. I'm not sure why it's not a toggle in the settings of Snyk. To be able to see it, we enabled it with

  "snyk.features.preview": {
    "advisor": true
  }

image

return req;
});
return this.http.post<T, R>(url, data, config);
Expand Down
10 changes: 5 additions & 5 deletions src/snyk/common/languageServer/staticLsApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import axios, { CancelTokenSource } from 'axios';
import { IConfiguration } from '../configuration/configuration';
import { PROTOCOL_VERSION } from '../constants/languageServer';
import { LsExecutable } from './lsExecutable';
import { LsSupportedPlatform } from './supportedPlatforms';
import { getAxiosConfig } from '../proxy';
import { IVSCodeWorkspace } from '../vscode/workspace';
import { DownloadAxiosResponse } from '../download/downloader';
import { IConfiguration } from '../configuration/configuration';
import { ILog } from '../logger/interfaces';
import { getAxiosConfig } from '../proxy';
import { IVSCodeWorkspace } from '../vscode/workspace';
import { LsExecutable } from './lsExecutable';
import { LsSupportedPlatform } from './supportedPlatforms';

export type LsMetadata = {
tag: string;
Expand Down
2 changes: 1 addition & 1 deletion src/snyk/common/proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import fs from 'fs/promises';
import { Agent, AgentOptions, globalAgent } from 'https';
import { HttpsProxyAgent, HttpsProxyAgentOptions } from 'https-proxy-agent';
import * as url from 'url';
import { IVSCodeWorkspace } from './vscode/workspace';
import { IConfiguration } from './configuration/configuration';
import { ILog } from './logger/interfaces';
import { IVSCodeWorkspace } from './vscode/workspace';

export async function getHttpsProxyAgent(
workspace: IVSCodeWorkspace,
Expand Down
Loading