Skip to content

Commit 3c6e053

Browse files
Merge pull request #2517 from RedisInsight/feature/RI-4852-jpickle-alternative-library
RI-4852: Use alternative library pickleparse for parsing pickle objects
2 parents ec57c65 + 950c330 commit 3c6e053

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,14 +246,14 @@
246246
"html-entities": "^2.3.2",
247247
"html-react-parser": "^1.2.4",
248248
"java-object-serialization": "^0.1.1",
249-
"jpickle": "^0.4.1",
250249
"json-bigint": "^1.0.0",
251250
"jsonpath": "^1.1.1",
252251
"lodash": "^4.17.21",
253252
"lz4js": "^0.2.0",
254253
"msgpackr": "^1.9.7",
255254
"pako": "^2.1.0",
256255
"php-serialize": "^4.0.2",
256+
"pickleparser": "^0.1.0",
257257
"rawproto": "^0.7.6",
258258
"react": "^18.2.0",
259259
"react-contenteditable": "^3.3.5",

redisinsight/ui/src/utils/formatters/valueFormatters.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Buffer } from 'buffer'
44
import { isUndefined } from 'lodash'
55
import { serialize, unserialize } from 'php-serialize'
66
import { getData } from 'rawproto'
7-
import { loads as loadsPickle } from 'jpickle'
7+
import { Parser } from 'pickleparser'
88
import JSONBigInt from 'json-bigint'
99

1010
import JSONViewer from 'uiSrc/components/json-viewer/JSONViewer'
@@ -108,7 +108,8 @@ const formattingBuffer = (
108108
}
109109
case KeyValueFormat.Pickle: {
110110
try {
111-
const decoded = loadsPickle(bufferToUTF8(reply))
111+
const parser = new Parser()
112+
const decoded = parser.parse(new Uint8Array(reply.data))
112113

113114
if (isUndefined(decoded)) {
114115
return {

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9022,11 +9022,6 @@ jest@^27.5.1:
90229022
import-local "^3.0.2"
90239023
jest-cli "^27.5.1"
90249024

9025-
jpickle@^0.4.1:
9026-
version "0.4.1"
9027-
resolved "https://registry.yarnpkg.com/jpickle/-/jpickle-0.4.1.tgz#17eea5d3624cccec38f86e89a059abd05952364a"
9028-
integrity sha512-XHSTQUtl/Yv2cNzeQ7NKFuK0Z3d1iqQC2iEwV0cu3/dG6PV3DgACEQ3wGagHRDV6MKzypPWwHVSDY8kBWkbfTA==
9029-
90309025
js-base64@^2.4.9:
90319026
version "2.6.4"
90329027
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
@@ -11095,6 +11090,11 @@ php-serialize@^4.0.2:
1109511090
resolved "https://registry.yarnpkg.com/php-serialize/-/php-serialize-4.0.2.tgz#869bd4e01c2d26ac41c1d3e8058ab00ec072e3e5"
1109611091
integrity sha512-73K9MqCnRn07sXxOht6kVLg+fg1lf/VYpecKy4n9ABcw1PJIAWfaxuQKML27EjolGHWxlXTy3rfh59AGrcUvIA==
1109711092

11093+
pickleparser@^0.1.0:
11094+
version "0.1.0"
11095+
resolved "https://registry.yarnpkg.com/pickleparser/-/pickleparser-0.1.0.tgz#ea637e0c077c42bf41fe98f3608d633aeeaed2c6"
11096+
integrity sha512-L81sYaXj6JlEOtVPwhXsEjlDQ0fjxPGf9ay4uBfQnsrR87mZ8SFQR/OD8kdqjQdeyMFcWyCMhx7WKZT1yZK7FQ==
11097+
1109811098
picocolors@^1.0.0:
1109911099
version "1.0.0"
1110011100
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"

0 commit comments

Comments
 (0)