tomas.kracmar/ma1sd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve crypto

Browse Source 
- Re-organize packages to be consistent
- Add Key store tests
This commit is contained in:
Max Dor
2019-03-01 15:16:19 +01:00
parent 93bd7354c2
commit dfedde0df6
32 changed files with 362 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/io/kamax/mxisd/test/storage/crypto/KeyTest.java → src/test/java/io/kamax/mxisd/test/crypto/KeyTest.java
View File

@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.test.storage.crypto;
package io.kamax.mxisd.test.crypto;
public class KeyTest {

13
src/test/java/io/kamax/mxisd/test/storage/crypto/SignatureManagerTest.java → src/test/java/io/kamax/mxisd/test/crypto/SignatureManagerTest.java
View File

@@ -18,12 +18,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.test.storage.crypto;
package io.kamax.mxisd.test.crypto;
import com.google.gson.JsonObject;
import io.kamax.matrix.json.GsonUtil;
import io.kamax.matrix.json.MatrixJson;
import io.kamax.mxisd.storage.crypto.*;
import io.kamax.mxisd.crypto.Signature;
import io.kamax.mxisd.crypto.SignatureManager;
import io.kamax.mxisd.crypto.ed25519.Ed25519Key;
import io.kamax.mxisd.crypto.ed25519.Ed25519KeyManager;
import io.kamax.mxisd.crypto.ed25519.Ed25519RegularKeyIdentifier;
import io.kamax.mxisd.crypto.ed25519.Ed25519SignatureManager;
import io.kamax.mxisd.storage.crypto.KeyStore;
import io.kamax.mxisd.storage.crypto.MemoryKeyStore;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -36,7 +43,7 @@ public class SignatureManagerTest {
private static SignatureManager signMgr;
private static SignatureManager build(String keySeed) {
Ed25519Key key = new Ed25519Key(new Ed2219RegularKeyIdentifier("0"), keySeed);
Ed25519Key key = new Ed25519Key(new Ed25519RegularKeyIdentifier("0"), keySeed);
KeyStore store = new MemoryKeyStore();
store.add(key);

42
src/test/java/io/kamax/mxisd/test/storage/crypto/FileKeyStoreTest.java Normal file
View File

@@ -0,0 +1,42 @@
/*
* mxisd - Matrix Identity Server Daemon
* Copyright (C) 2019 Kamax Sàrl
*
* https://www.kamax.io/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.test.storage.crypto;
import io.kamax.mxisd.storage.crypto.FileKeyStore;
import io.kamax.mxisd.storage.crypto.KeyStore;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
import java.util.UUID;
public class FileKeyStoreTest extends KeyStoreTest {
@Override
public KeyStore create() throws IOException {
String path = FileUtils.getTempDirectoryPath() +
"/mxisd-test-key-store-" +
UUID.randomUUID().toString().replace("-", "");
FileUtils.forceDeleteOnExit(new File(path));
return new FileKeyStore(path);
}
}

128
src/test/java/io/kamax/mxisd/test/storage/crypto/KeyStoreTest.java Normal file
View File

@@ -0,0 +1,128 @@
/*
* mxisd - Matrix Identity Server Daemon
* Copyright (C) 2019 Kamax Sàrl
*
* https://www.kamax.io/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.test.storage.crypto;
import io.kamax.mxisd.crypto.*;
import io.kamax.mxisd.exception.ObjectNotFoundException;
import io.kamax.mxisd.storage.crypto.KeyStore;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.Before;
import org.junit.Test;
import java.util.Optional;
import static org.junit.Assert.*;
public abstract class KeyStoreTest {
private KeyStore store;
public abstract KeyStore create() throws Exception;
private Key generateRandomKey() {
KeyIdentifier keyId = new GenericKeyIdentifier(KeyType.Regular, "algo", RandomStringUtils.randomAlphanumeric(6));
return new GenericKey(keyId, true, RandomStringUtils.randomAlphanumeric(48));
}
@Before
public void before() throws Exception {
store = create();
}
@Test
public void isEmptyAfterCreate() {
assertTrue(store.list().isEmpty());
assertFalse(store.getCurrentKey().isPresent());
}
@Test
public void add() {
Key key = generateRandomKey();
KeyIdentifier keyId = key.getId();
store.add(key);
Key keyFromStore = store.get(keyId);
assertEquals(key.getId(), keyFromStore.getId());
assertEquals(key.getPrivateKeyBase64(), keyFromStore.getPrivateKeyBase64());
assertEquals(key.isValid(), keyFromStore.isValid());
assertTrue(store.list().contains(keyId));
assertTrue(store.list(keyId.getType()).contains(keyId));
}
@Test(expected = IllegalStateException.class)
public void addDuplicate() {
Key key = generateRandomKey();
store.add(key);
store.add(key);
}
@Test
public void update() {
Key key = generateRandomKey();
store.add(key);
Key keyUpdated = new GenericKey(key.getId(), !key.isValid(), key.getPrivateKeyBase64());
store.update(keyUpdated);
Key keyFromStore = store.get(key.getId());
assertEquals(key.getId(), keyFromStore.getId());
assertEquals(key.getPrivateKeyBase64(), keyFromStore.getPrivateKeyBase64());
assertEquals(key.isValid(), !keyFromStore.isValid());
}
@Test(expected = ObjectNotFoundException.class)
public void updateNonExisting() {
store.update(generateRandomKey());
}
@Test
public void delete() {
Key key = generateRandomKey();
store.add(key);
store.delete(key.getId());
assertFalse(store.list().contains(key.getId()));
assertFalse(store.list(key.getId().getType()).contains(key.getId()));
}
@Test(expected = ObjectNotFoundException.class)
public void deleteNonExisting() {
store.delete(generateRandomKey().getId());
}
@Test
public void setCurrentKey() {
Key key = generateRandomKey();
store.add(key);
store.setCurrentKey(key.getId());
Optional<KeyIdentifier> currentKey = store.getCurrentKey();
assertTrue(currentKey.isPresent());
assertEquals(currentKey.get(), key.getId());
}
@Test(expected = IllegalArgumentException.class)
public void setCurrentKeyNonExisting() {
store.setCurrentKey(generateRandomKey().getId());
}
}

33
src/test/java/io/kamax/mxisd/test/storage/crypto/MemoryKeyStoreTest.java Normal file
View File

@@ -0,0 +1,33 @@
/*
* mxisd - Matrix Identity Server Daemon
* Copyright (C) 2019 Kamax Sàrl
*
* https://www.kamax.io/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package io.kamax.mxisd.test.storage.crypto;
import io.kamax.mxisd.storage.crypto.KeyStore;
import io.kamax.mxisd.storage.crypto.MemoryKeyStore;
public class MemoryKeyStoreTest extends KeyStoreTest {
@Override
public KeyStore create() {
return new MemoryKeyStore();
}
}