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

improve keys checks for jsthemis in SecureMessage #465

Merged
merged 4 commits into from
May 7, 2019
Merged

improve keys checks for jsthemis in SecureMessage #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c1731d
improve checks for jsthemis
vixentael May 6, 2019
c9d9575
add tests for themis keys secure message
vixentael May 6, 2019
3fa8460
fix formatting
vixentael May 6, 2019
fc3c3aa
Merge branch 'master' into vxtl/T1176-js-correct-messages
vixentael May 6, 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
8 changes: 4 additions & 4 deletions src/wrappers/themis/jsthemis/secure_message.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ void SecureMessage::sign(const Nan::FunctionCallbackInfo<v8::Value>& args)
{
themis_status_t status = THEMIS_FAIL;
SecureMessage* obj = Nan::ObjectWrap::Unwrap<SecureMessage>(args.This());
if (obj->peer_public_key_.empty()) {
ThrowParameterError("Secure Message failed to sign message", "public key is empty");
if (obj->private_key_.empty()) {
ThrowParameterError("Secure Message failed to sign message", "private key is empty");
args.GetReturnValue().SetUndefined();
return;
}
Expand Down Expand Up @@ -306,8 +306,8 @@ void SecureMessage::verify(const Nan::FunctionCallbackInfo<v8::Value>& args)
{
themis_status_t status = THEMIS_FAIL;
SecureMessage* obj = Nan::ObjectWrap::Unwrap<SecureMessage>(args.This());
if (obj->private_key_.empty()) {
ThrowParameterError("Secure Message failed to verify signature", "private key is empty");
if (obj->peer_public_key_.empty()) {
ThrowParameterError("Secure Message failed to verify signature", "public key is empty");
args.GetReturnValue().SetUndefined();
return;
}
Expand Down
40 changes: 37 additions & 3 deletions tests/jsthemis/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ function expect_code(code) {
}
}

function expect_message(message) {
return function(err) {
return err.message.includes(message)
}
}

describe("jsthemis", function(){
describe("secure message", function(){
keypair = new addon.KeyPair();
Expand All @@ -15,10 +21,8 @@ describe("jsthemis", function(){
encrypter = new addon.SecureMessage(keypair.private(), peer_keypair.public());
decrypter = new addon.SecureMessage(peer_keypair.private(), keypair.public());
intruder_decrypter = new addon.SecureMessage(intruder_keypair.private(), keypair.public());
empty_secure_message = new addon.SecureMessage(new Buffer(""), new Buffer(""));
message = new Buffer("Test Message");
it("encrypt/decrypt", function(){

it("encrypt/decrypt", function(){
encrypted_message = encrypter.encrypt(message);
assert.equal(message.toString(), decrypter.decrypt(encrypted_message).toString());
assert.throws(function(){intruder_decrypter.decrypt(encrypted_message);}, expect_code(addon.FAIL));
Expand All @@ -33,14 +37,44 @@ describe("jsthemis", function(){
it("empty keys", function(){
encrypted_message = encrypter.encrypt(message);
signed_message = encrypter.sign(message);

// check codes and messages when SM is empty
empty_secure_message = new addon.SecureMessage(new Buffer(""), new Buffer(""));
assert.throws(function(){empty_secure_message.encrypt(message);}, expect_code(addon.INVALID_PARAMETER));
assert.throws(function(){empty_secure_message.encrypt(message);}, expect_message("private key is empty"));

assert.throws(function(){empty_secure_message.decrypt(encrypted_message);}, expect_code(addon.INVALID_PARAMETER));
assert.throws(function(){empty_secure_message.decrypt(encrypted_message);}, expect_message("private key is empty"));

assert.throws(function(){empty_secure_message.sign(message);}, expect_code(addon.INVALID_PARAMETER));
assert.throws(function(){empty_secure_message.sign(message);}, expect_message("private key is empty"));

assert.throws(function(){empty_secure_message.verify(signed_message);}, expect_code(addon.INVALID_PARAMETER));
assert.throws(function(){empty_secure_message.verify(signed_message);}, expect_message("public key is empty"));

// check codes and messages when SM has no public key
secure_message_no_public = new addon.SecureMessage(keypair.private(), new Buffer(""));
assert.throws(function(){secure_message_no_public.encrypt(message);}, expect_code(addon.INVALID_PARAMETER));
assert.throws(function(){secure_message_no_public.encrypt(message);}, expect_message("public key is empty"));

assert.throws(function(){secure_message_no_public.decrypt(encrypted_message);}, expect_code(addon.INVALID_PARAMETER));
assert.throws(function(){secure_message_no_public.decrypt(encrypted_message);}, expect_message("public key is empty"));
})
it("sign/verify with single key", function() {
signer = new addon.SecureMessage(keypair.private(), new Buffer(""));
verifier = new addon.SecureMessage(new Buffer(""), keypair.public());
signed_message = signer.sign(message);
verified_message = verifier.verify(signed_message);
assert.equal(message.toString(), verified_message.toString());
assert.throws(function(){signer.verify(signed_message);}, expect_code(addon.INVALID_PARAMETER));
})
it("mismatched keys", function(){
assert.throws(function(){new addon.SecureMessage(keypair.public(), keypair.private())}, expect_code(addon.INVALID_PARAMETER));
})
it("keys misuse", function(){
assert.throws(function(){new addon.SecureMessage(new Buffer("i am not a real private key"), new Buffer(""))}, expect_code(addon.INVALID_PARAMETER));
assert.throws(function(){new addon.SecureMessage(new Buffer(""), new Buffer("i am not a real public key"))}, expect_code(addon.INVALID_PARAMETER));
})
})
})

Expand Down