kev/treasurechest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added public key validation

Browse Source
This commit is contained in:
Kevin Froman 2020-05-28 22:35:58 -05:00
parent ad50959bac
commit fd47ade07b
3 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/session/testSession.cs
View File

@ -28,6 +28,35 @@ namespace sessionTests
Assert.IsTrue(Enumerable.SequenceEqual(newK, session.getLatestPublicKey()));
}
[Test]
public void TestSessionNoPublicDupes(){
byte[] publicK = PublicKeyBox.GenerateKeyPair().PublicKey;
byte[] privateK = PublicKeyBox.GenerateKeyPair().PrivateKey;
byte[] newK = PublicKeyBox.GenerateKeyPair().PublicKey;
Session session = new Session(privateK, publicK, true);
session.addPublic(newK, getFutureTime(61));
try{
session.addPublic(newK, getFutureTime(61));
}
catch(DuplicatePublicKey){return;}
Assert.Fail();
}
[Test]
public void TestSessionAddPublicInvalidKey(){
byte[] publicK = PublicKeyBox.GenerateKeyPair().PublicKey;
byte[] privateK = PublicKeyBox.GenerateKeyPair().PrivateKey;
byte[] newK = {3, 5};
Session session = new Session(privateK, publicK, true);
try{
session.addPublic(newK, getFutureTime(61));
}
catch(InvalidKeyLength){
return;
}
Assert.Fail();
}
[Test]
public void TestSessionAddPublicInvalidTime(){
byte[] publicK = PublicKeyBox.GenerateKeyPair().PublicKey;

23
treasurechest/chestcrypto/session/exceptions.cs Normal file
View File

@ -0,0 +1,23 @@
using System;
namespace chestcrypto{
namespace exceptions{
public class DuplicatePublicKey : Exception
{
public DuplicatePublicKey()
{
}
public DuplicatePublicKey(string message)
: base(message)
{
}
public DuplicatePublicKey(string message, Exception inner)
: base(message, inner)
{
}
}
}
}

21
treasurechest/chestcrypto/session/session.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System;
using chestcrypto.exceptions;
@ -18,8 +19,24 @@ namespace chestcrypto{
private bool strictMode;
private const int minimumKeyExpireSeconds = 60;
private void validateKey(byte[] key){
if (key.Length != 32){
throw new InvalidKeyLength();
}
}
private bool publicKeyExists(byte[] key){
foreach( (int, byte[]) k in theirPublicKeys){
if (Enumerable.SequenceEqual(k.Item2, key)){
return true;
}
}
return false;
}
public Session(byte[] masterPrivate, byte[] masterPublic, bool strictMode){
if(masterPrivate.Length != 32 | masterPublic.Length != 32){throw new InvalidKeyLength();}
validateKey(masterPrivate);
validateKey(masterPublic);
ourMasterPrivateKey = masterPrivate;
theirMasterPublicKey = masterPublic;
this.strictMode = strictMode;
@ -29,6 +46,8 @@ namespace chestcrypto{
}
public void addPublic(byte[] publicKey, long timestamp){
validateKey(publicKey);
if (publicKeyExists(publicKey)){throw new DuplicatePublicKey();}
if (timestamp < DateTimeOffset.UtcNow.ToUnixTimeSeconds() + minimumKeyExpireSeconds){
throw new ArgumentOutOfRangeException();
}