Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #5198 from openshift-cherrypick-robot/cherry-pick-…
…4915-to-release-4.3

[release-4.3] Bug 1821647: Correctly handle Unicode characters in pod terminal
  • Loading branch information
openshift-merge-robot committed May 2, 2020
2 parents afb0423 + 3771576 commit 9d93972
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions frontend/public/components/pod-exec.jsx
@@ -1,5 +1,6 @@
import * as React from 'react';
import * as _ from 'lodash-es';
import { Base64 } from 'js-base64';
import { ExpandIcon } from '@patternfly/react-icons';
import { Button } from '@patternfly/react-core';

Expand Down Expand Up @@ -99,7 +100,7 @@ export const PodExec = connectToFlags(FLAGS.OPENSHIFT)(
return;
}
}
const data = atob(raw.slice(1));
const data = Base64.decode(raw.slice(1));
current && current.onDataReceived(data);
previous = data;
})
Expand Down Expand Up @@ -156,7 +157,7 @@ export const PodExec = connectToFlags(FLAGS.OPENSHIFT)(
}

onResize_(rows, cols) {
const data = btoa(JSON.stringify({ Height: rows, Width: cols }));
const data = Base64.encode(JSON.stringify({ Height: rows, Width: cols }));
this.ws && this.ws.send(`4${data}`);
}

Expand All @@ -165,7 +166,7 @@ export const PodExec = connectToFlags(FLAGS.OPENSHIFT)(
}

onData_(data) {
this.ws && this.ws.send(`0${btoa(data)}`);
this.ws && this.ws.send(`0${Base64.encode(data)}`);
}

render() {
Expand Down

0 comments on commit 9d93972

Please sign in to comment.