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.

Sign up for GitHub

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

Jump to bottom

feat(core-p2p): Validate GET replies from other peers #2102

Merged
merged 12 commits into from
Feb 22, 2019
Merged

feat(core-p2p): Validate GET replies from other peers #2102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eb1a98d
feat(core-p2p): Validate GET replies from other peers
vasild Feb 14, 2019
078a34f
Merge branch 'develop' into peer-reply-validation
faustbrian Feb 20, 2019
7a0de8d
Merge branch 'develop' into peer-reply-validation
faustbrian Feb 21, 2019
305f4e5
Merge branch 'develop' into peer-reply-validation
spkjp Feb 22, 2019
94761b2
Merge remote-tracking branch 'ArkEcosystem/core/develop' into peer-re…
vasild Feb 22, 2019
e1bfb8a
chore(core-p2p): Remove call to a nonexistent function
vasild Feb 22, 2019
da6b63e
fix(core-p2p): adjust tests to mock proper responses
vasild Feb 22, 2019
7790151
chore(core-p2p): allow "common: null" in reply for common blocks
vasild Feb 22, 2019
e423f88
Merge remote-tracking branch 'ArkEcosystem/core/develop' into peer-re…
vasild Feb 22, 2019
abb0242
chore(core-p2p): Move replySchemas to a separate file
vasild Feb 22, 2019
0936cc1
Merge branch 'develop' into peer-reply-validation
faustbrian Feb 22, 2019
b4f1d2e
Merge remote-tracking branch 'ArkEcosystem/core/develop' into peer-re…
vasild Feb 22, 2019
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
Prev Previous commit
Next Next commit
chore(core-p2p): Move replySchemas to a separate file
  • Loading branch information
@vasild
vasild committed Feb 22, 2019
commit abb0242548aa02275b01b0ea485eaca5b3390ecb
86 changes: 4 additions & 82 deletions packages/core-p2p/src/peer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,87 +7,9 @@ import util from "util";
import { config as localConfig } from "./config";
import { PeerPingTimeoutError, PeerStatusResponseError, PeerVerificationFailedError } from "./errors";
import { PeerVerificationResult, PeerVerifier } from "./peer-verifier";
import { replySchemas } from "./reply-schemas";

export class Peer implements P2P.IPeer {
private static replySchemas: any = {
"/peer/blocks": Joi.object().keys({
blocks: Joi.array()
.items(
Joi.object().keys({
height: Joi.number()
.integer()
.min(1)
.required(),
id: Joi.string()
.max(64)
.hex()
.required(),
}),
)
.required(),
}),
"/peer/blocks/common?ids=": Joi.object()
.keys({
common: [
Joi.object()
.keys({
height: Joi.number()
.integer()
.min(1)
.required(),
id: Joi.string()
.max(64)
.hex()
.required(),
})
.required(),
Joi.any().valid(null),
],
success: Joi.boolean()
.equal(true)
.required(),
})
.required(),
"/peer/list": Joi.object()
.keys({
peers: Joi.array()
.items(
Joi.object().keys({
ip: Joi.string()
.ip({ cidr: "forbidden" })
.required(),
status: [Joi.string(), Joi.number().integer()],
}),
)
.required(),
success: Joi.boolean()
.equal(true)
.required(),
})
.required(),
"/peer/status": Joi.object()
.keys({
header: Joi.object()
.keys({
height: Joi.number()
.integer()
.min(1)
.required(),
id: Joi.string()
.max(64)
.hex()
.required(),
})
.required(),
height: Joi.number()
.integer()
.min(1),
success: Joi.boolean()
.equal(true)
.required(),
})
.required(),
};
public downloadSize: any;
public hashid: string;
public nethash: any;
Expand Down Expand Up @@ -475,14 +397,14 @@ export class Peer implements P2P.IPeer {
* @return {Boolean} true if validated successfully
*/
private validateReply(reply: any, endpoint: string): boolean {
let schema = Peer.replySchemas[endpoint];
let schema = replySchemas[endpoint];
if (schema === undefined) {
// See if any of the keys in replySchemas is a prefix of endpoint and pick the longest one.
let len = 0;
const definedEndpoints = Object.keys(Peer.replySchemas);
const definedEndpoints = Object.keys(replySchemas);
for (const d of definedEndpoints) {
if (endpoint.startsWith(d) && len < d.length) {
schema = Peer.replySchemas[d];
schema = replySchemas[d];
len = d.length;
}
}
Expand Down
81 changes: 81 additions & 0 deletions packages/core-p2p/src/reply-schemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import Joi from "joi";

export const replySchemas: any = {
"/peer/blocks": Joi.object().keys({
blocks: Joi.array()
.items(
Joi.object().keys({
height: Joi.number()
.integer()
.min(1)
.required(),
id: Joi.string()
.max(64)
.hex()
.required(),
}),
)
.required(),
}),
"/peer/blocks/common?ids=": Joi.object()
.keys({
common: [
Joi.object()
.keys({
height: Joi.number()
.integer()
.min(1)
.required(),
id: Joi.string()
.max(64)
.hex()
.required(),
})
.required(),
Joi.any().valid(null),
],
success: Joi.boolean()
.equal(true)
.required(),
})
.required(),
"/peer/list": Joi.object()
.keys({
peers: Joi.array()
.items(
Joi.object().keys({
ip: Joi.string()
.ip({ cidr: "forbidden" })
.required(),
status: [Joi.string(), Joi.number().integer()],
}),
)
.required(),
success: Joi.boolean()
.equal(true)
.required(),
})
.required(),
"/peer/status": Joi.object()
.keys({
header: Joi.object()
.keys({
height: Joi.number()
.integer()
.min(1)
.required(),
id: Joi.string()
.max(64)
.hex()
.required(),
})
.required(),
height: Joi.number()
.integer()
.min(1),
success: Joi.boolean()
.equal(true)
.required(),
})
.required(),
};