Skip to content

Commit

Permalink
fix(core-p2p): disable rate limit for forger (#2445)
Browse files Browse the repository at this point in the history
  • Loading branch information
air1one authored and faustbrian committed Apr 18, 2019
1 parent 43c4129 commit c497f93
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 4 deletions.
2 changes: 1 addition & 1 deletion __tests__/integration/core-p2p/mocks/core-container.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Managers } from "@arkecosystem/crypto";
import { defaults } from "../../../../packages/core-p2p/src/defaults";
import { blocks2to100 } from "../../../utils/fixtures";
import { delegates } from "../../../utils/fixtures/testnet/delegates";
import { genesisBlock } from "../../../utils/fixtures/unitnet/block-model";
import { defaults } from "./p2p-options";

Managers.configManager.setFromPreset("unitnet");

Expand Down
1 change: 1 addition & 0 deletions __tests__/integration/core-p2p/mocks/p2p-options.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "../../../../packages/core-p2p/src/defaults";
28 changes: 26 additions & 2 deletions __tests__/integration/core-p2p/socket-server/peer.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import "jest-extended";

import "../mocks/core-container";
import { defaults } from "../mocks/p2p-options";

import { Blocks, Managers } from "@arkecosystem/crypto/src";
import delay from "delay";
import SocketCluster from "socketcluster";
import socketCluster from "socketcluster-client";
import { startSocketServer } from "../../../../packages/core-p2p/src/socket-server";
import { createPeerService } from "../../../helpers/peers";
Expand All @@ -13,6 +15,7 @@ import { wallets } from "../../../utils/fixtures/unitnet/wallets";

Managers.configManager.setFromPreset("unitnet");

let server: SocketCluster;
let socket;
let emit;

Expand All @@ -26,11 +29,12 @@ const headers = {

beforeAll(async () => {
process.env.CORE_ENV = "test";
defaults.remoteAccess = []; // empty for rate limit tests

const { service, processor } = createPeerService();

await startSocketServer(service, { server: { port: 4007 } });
await delay(3000);
server = await startSocketServer(service, { server: { port: 4007 } });
await delay(1000);

socket = socketCluster.create({
port: 4007,
Expand Down Expand Up @@ -171,5 +175,25 @@ describe("Peer socket endpoint", () => {
expect(onSocketError).toHaveBeenCalled();
expect(socket.getState()).toBe("closed");
});

it("should not be disconnected and banned if is configured in remoteAccess", async () => {
// need to restart the server for config changes to be updated
defaults.remoteAccess = ["127.0.0.1", "::ffff:127.0.0.1"];
server.destroy();
await delay(2000);
const { service } = createPeerService();
server = await startSocketServer(service, { server: { port: 4007 } });

await delay(1000);

for (let i = 0; i < 30; i++) {
const { data } = await emit("p2p.peer.getStatus", {
headers,
});
expect(data.height).toBeNumber();
}

expect(socket.getState()).toBe("open");
});
});
});
2 changes: 1 addition & 1 deletion packages/core-p2p/src/socket-server/worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export class Worker extends SCWorker {
}

private hasExceededRateLimit(remoteAddress: string): boolean {
if ((this.config.whitelist || []).includes(remoteAddress)) {
if ([...this.config.whitelist, ...this.config.remoteAccess].includes(remoteAddress)) {
return false;
}

Expand Down

0 comments on commit c497f93

Please sign in to comment.