Skip to content

Commit 51b5bc7

Browse files
authored
Fixes from release (#14720)
1 parent 97d1128 commit 51b5bc7

File tree

3 files changed

+10
-55
lines changed

3 files changed

+10
-55
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ This changelog is deprecated. Here is where you can find details about the lates
66
- Highlighted features for the latest release are described in the VS Code release notes, under the "Contributions to extensions" section: https://code.visualstudio.com/updates
77
- All issues and code changes can be found by searching our Github repo under the latest milestone. [Example from November 2022](https://github.com/microsoft/vscode-jupyter/issues?q=is%3Aclosed+milestone%3A%22November+2022%22+)
88

9+
10+
## 2023.10.1100000000
11+
12+
### Fixes
13+
14+
1. Fixed vulnerability described in [CVE-2023-36018](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2023-36018)
15+
916
## 2022.10.110 (2 November 2022)
1017

1118
### Enhancements

src/kernels/raw/launcher/kernelProcess.node.ts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -480,16 +480,6 @@ export class KernelProcess implements IKernelProcess {
480480
private addPythonConnectionArgs(connectionFile: Uri): string[] {
481481
const newConnectionArgs: string[] = [];
482482

483-
newConnectionArgs.push(`--ip=${this._connection.ip}`);
484-
newConnectionArgs.push(`--stdin=${this._connection.stdin_port}`);
485-
newConnectionArgs.push(`--control=${this._connection.control_port}`);
486-
newConnectionArgs.push(`--hb=${this._connection.hb_port}`);
487-
newConnectionArgs.push(`--Session.signature_scheme="${this._connection.signature_scheme}"`);
488-
newConnectionArgs.push(`--Session.key=b"${this._connection.key}"`); // Note we need the 'b here at the start for a byte string
489-
newConnectionArgs.push(`--shell=${this._connection.shell_port}`);
490-
newConnectionArgs.push(`--transport="${this._connection.transport}"`);
491-
newConnectionArgs.push(`--iopub=${this._connection.iopub_port}`);
492-
493483
// Turn this on if you get desparate. It can cause crashes though as the
494484
// logging code isn't that robust.
495485
// if (isTestExecution()) {

src/kernels/raw/launcher/kernelProcess.node.unit.test.ts

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -305,21 +305,7 @@ suite('kernel Process', () => {
305305
when(pythonExecFactory.createActivatedEnvironment(anything())).thenResolve(instance(pythonProcess));
306306
when(connectionMetadata.kind).thenReturn('startUsingPythonInterpreter');
307307
when(connectionMetadata.kernelSpec).thenReturn(kernelSpec);
308-
const expectedArgs = [
309-
`-m`,
310-
`ipykernel`,
311-
`--ip=${connection.ip}`,
312-
`--stdin=${connection.stdin_port}`,
313-
`--control=${connection.control_port}`,
314-
`--hb=${connection.hb_port}`,
315-
`--Session.signature_scheme="${connection.signature_scheme}"`,
316-
`--Session.key=b"${connection.key}"`,
317-
`--shell=${connection.shell_port}`,
318-
`--transport="${connection.transport}"`,
319-
`--iopub=${connection.iopub_port}`,
320-
`--f="${expectedConnectionFile}"`,
321-
`--debug`
322-
];
308+
const expectedArgs = [`-m`, `ipykernel`, `--f="${expectedConnectionFile}"`, `--debug`];
323309
await kernelProcess.launch(__dirname, 0, token.token);
324310

325311
verify(processService.execObservable(anything(), anything())).never();
@@ -353,21 +339,7 @@ suite('kernel Process', () => {
353339
when(pythonExecFactory.createActivatedEnvironment(anything())).thenResolve(instance(pythonProcess));
354340
when(connectionMetadata.kind).thenReturn('startUsingPythonInterpreter');
355341
when(connectionMetadata.kernelSpec).thenReturn(kernelSpec);
356-
const expectedArgs = [
357-
`-m`,
358-
`ipykernel`,
359-
`--ip=${connection.ip}`,
360-
`--stdin=${connection.stdin_port}`,
361-
`--control=${connection.control_port}`,
362-
`--hb=${connection.hb_port}`,
363-
`--Session.signature_scheme="${connection.signature_scheme}"`,
364-
`--Session.key=b"${connection.key}"`,
365-
`--shell=${connection.shell_port}`,
366-
`--transport="${connection.transport}"`,
367-
`--iopub=${connection.iopub_port}`,
368-
`--f="${Uri.file(tempFile).fsPath}"`,
369-
`--debug`
370-
];
342+
const expectedArgs = [`-m`, `ipykernel`, `--f="${Uri.file(tempFile).fsPath}"`, `--debug`];
371343
await kernelProcess.launch(__dirname, 0, token.token);
372344

373345
verify(processService.execObservable(anything(), anything())).never();
@@ -394,21 +366,7 @@ suite('kernel Process', () => {
394366
when(pythonExecFactory.createActivatedEnvironment(anything())).thenResolve(instance(pythonProcess));
395367
when(connectionMetadata.kind).thenReturn('startUsingPythonInterpreter');
396368
when(connectionMetadata.kernelSpec).thenReturn(kernelSpec);
397-
const expectedArgs = [
398-
`-m`,
399-
`ipykernel`,
400-
`--ip=${connection.ip}`,
401-
`--stdin=${connection.stdin_port}`,
402-
`--control=${connection.control_port}`,
403-
`--hb=${connection.hb_port}`,
404-
`--Session.signature_scheme="${connection.signature_scheme}"`,
405-
`--Session.key=b"${connection.key}"`,
406-
`--shell=${connection.shell_port}`,
407-
`--transport="${connection.transport}"`,
408-
`--iopub=${connection.iopub_port}`,
409-
`--f=${Uri.file('connection.json').fsPath}`,
410-
`--debug`
411-
];
369+
const expectedArgs = [`-m`, `ipykernel`, `--f=${Uri.file('connection.json').fsPath}`, `--debug`];
412370
await kernelProcess.launch(__dirname, 0, token.token);
413371

414372
verify(processService.execObservable(anything(), anything())).never();

0 commit comments

Comments
 (0)