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.

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: handle malicious keys for hgetall #1416

Merged
merged 1 commit into from
Aug 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion lib/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,20 @@ Command.setReplyTransformer("hgetall", function (result) {
if (Array.isArray(result)) {
const obj = {};
Copy link
Contributor

Choose a reason for hiding this comment

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

Could probably just use Object.create(null) here to avoid the performance hit from the additional check below.

for (let i = 0; i < result.length; i += 2) {
obj[result[i]] = result[i + 1];
const key = result[i];
const value = result[i + 1];
if (obj[key]) {
// can only be truthy if the property is special somehow, like '__proto__' or 'constructor'
// https://github.com/luin/ioredis/issues/1267
Object.defineProperty(obj, key, {
value,
configurable: true,
enumerable: true,
writable: true,
});
} else {
obj[key] = value;
}
}
return obj;
}
Expand Down
12 changes: 12 additions & 0 deletions test/functional/hgetall.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import Redis from "../../lib/redis";
import { expect } from "chai";

describe("hgetall", function () {
it("should handle __proto__", async function () {
const redis = new Redis();
await redis.hset("test_key", "__proto__", "hello");
const ret = await redis.hgetall("test_key");
expect(ret.__proto__).to.eql("hello");
expect(Object.keys(ret)).to.eql(["__proto__"]);
});
});