me/no-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all basic tests pass!

Browse Source
This commit is contained in:
Dave
2015-07-04 14:46:22 +02:00
parent 1c1a6012bf
commit cd1c7bdc69
9 changed files with 248 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nodash/core/NoAdapter.java
View File

@@ -4,6 +4,7 @@ import java.security.PublicKey;
import java.util.Collection;
import nodash.exceptions.NoAdapterException;
import nodash.exceptions.NoSessionExpiredException;
import nodash.exceptions.NoUserAlreadyOnlineException;
import nodash.exceptions.NoUserNotValidException;
import nodash.models.NoByteSet;
@@ -32,7 +33,8 @@ public interface NoAdapter {
public void shredNoSession(byte[] encryptedUuid) throws NoAdapterException;
public NoSession getNoSession(byte[] encryptedUuid) throws NoAdapterException;
public NoSession getNoSession(byte[] encryptedUuid) throws NoAdapterException,
NoSessionExpiredException;
public Collection<NoByteSet> pollNoByteSets(PublicKey address) throws NoAdapterException;

38
src/nodash/core/NoCore.java
View File

@@ -17,6 +17,8 @@
package nodash.core;
import org.apache.commons.codec.binary.Base64;
import nodash.exceptions.NoAdapterException;
import nodash.exceptions.NoByteSetBadDecryptionException;
import nodash.exceptions.NoDashFatalException;
@@ -59,7 +61,7 @@ public final class NoCore {
public byte[] login(byte[] data, char[] password) throws NoUserNotValidException,
NoUserAlreadyOnlineException, NoSessionExpiredException {
NoSession session = new NoSession(adapter, data, password);
NoSession session = new NoSession(data, password);
/* 1. Check that user is a valid user of the system based on their hash. */
try {
@@ -129,6 +131,7 @@ public final class NoCore {
byte[] userFile;
try {
userFile = save(cookie, password);
adapter.goOnline(user.createHash());
} catch (NoSessionExpiredException e) {
throw new NoDashFatalException("Session expired despite just being created.");
} catch (NoSessionConfirmedException e) {
@@ -139,6 +142,10 @@ public final class NoCore {
} catch (NoSessionAlreadyAwaitingConfirmationException e) {
throw new NoDashFatalException(
"Session already waiting confirmation despite just being created.");
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not go online.", e);
} catch (NoUserAlreadyOnlineException e) {
throw new NoDashFatalException("User with same hash is already online.");
}
return new NoRegister(cookie, userFile);
@@ -195,31 +202,46 @@ public final class NoCore {
throw new NoDashFatalException("Could not insert confirmed hash.", e);
}
try {
adapter.goOffline(newHash);
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not go offline.", e);
}
try {
adapter.shredNoSession(cookie);
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not shred session.", e);
}
try {
adapter.goOffline(session.getNoUserSafe().createHash());
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not go offline.", e);
}
if (!session.isNewUser()) {
try {
adapter.removeHash(oldHash);
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not remove old hash.", e);
}
}
}
public void shred(byte[] cookie) throws NoSessionExpiredException {
NoSession session = getNoSession(cookie);
public void shred(byte[] cookie) {
try {
adapter.shredNoSession(cookie);
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not shred session.", e);
}
try {
adapter.addNoByteSets(session.getIncomingSafe(), session.getNoUserSafe().getRsaPublicKey());
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not add bytesets back into pool.");
}
try {
adapter.goOffline(session.getNoUserSafe().createHash());
} catch (NoAdapterException e) {
throw new NoDashFatalException("Could not go offline.", e);
}
}
}

31
src/nodash/core/NoDefaultAdapter.java
View File

@@ -44,16 +44,18 @@ public class NoDefaultAdapter implements NoAdapter {
private static synchronized byte[] alterFile(byte[] hashToAdd, byte[] hashToRemove)
throws IOException {
if (!(hashToAdd == null ^ hashToRemove == null) && Arrays.equals(hashToAdd, hashToRemove)) {
throw new IllegalArgumentException("Hashes to add and remove cannot be the same.");
}
File file = new File(HASH_FILE);
if (!file.exists()) {
Files.createFile(file.toPath());
}
byte[] originalFileBytes = Files.readAllBytes(file.toPath());
if (hashToAdd == null && hashToRemove == null) {
return originalFileBytes;
}
if (!(hashToAdd == null ^ hashToRemove == null) && Arrays.equals(hashToAdd, hashToRemove)) {
throw new IllegalArgumentException("Hashes to add and remove cannot be the same.");
}
int hashes = originalFileBytes.length / 64;
List<Byte> newFile = new ArrayList<Byte>();
@@ -66,7 +68,7 @@ public class NoDefaultAdapter implements NoAdapter {
}
}
if (hashToAdd != null || Arrays.equals(hash, hashToAdd)) {
if (hashToAdd != null && Arrays.equals(hash, hashToAdd)) {
hashToAdd = null;
}
}
@@ -152,7 +154,7 @@ public class NoDefaultAdapter implements NoAdapter {
public boolean containsNoSession(byte[] encryptedUuid) {
String uuid;
try {
uuid = Base64.encodeBase64String(NoUtil.decrypt(encryptedUuid));
uuid = Base64.encodeBase64URLSafeString(NoUtil.decrypt(encryptedUuid));
} catch (IllegalBlockSizeException | BadPaddingException e) {
throw new NoDashFatalException("Could not decrypt given UUID.", e);
}
@@ -163,7 +165,6 @@ public class NoDefaultAdapter implements NoAdapter {
@Override
public void shredNoSession(byte[] encryptedUuid) {
NoSession session = getNoSession(encryptedUuid);
addNoByteSets(session.getIncomingSafe(), session.getNoUserSafe().getRsaPublicKey());
sessions.remove(session.getUuid());
}
@@ -172,7 +173,7 @@ public class NoDefaultAdapter implements NoAdapter {
if (containsNoSession(encryptedUuid)) {
String uuid;
try {
uuid = Base64.encodeBase64String(NoUtil.decrypt(encryptedUuid));
uuid = Base64.encodeBase64URLSafeString(NoUtil.decrypt(encryptedUuid));
} catch (IllegalBlockSizeException | BadPaddingException e) {
throw new NoDashFatalException("Could not decrypt given UUID.", e);
}
@@ -206,6 +207,14 @@ public class NoDefaultAdapter implements NoAdapter {
@Override
public void addNoByteSets(Collection<NoByteSet> addedByteSets, PublicKey address) {
if (addedByteSets == null) {
return;
}
if (address == null) {
throw new NullPointerException("Address cannot be null.");
}
if (byteSets.containsKey(address)) {
byteSets.get(address).addAll(addedByteSets);
} else {
@@ -215,7 +224,7 @@ public class NoDefaultAdapter implements NoAdapter {
@Override
public void goOnline(byte[] hash) throws NoUserAlreadyOnlineException {
String hashString = Base64.encodeBase64String(hash);
String hashString = Base64.encodeBase64URLSafeString(hash);
if (online.contains(hashString)) {
throw new NoUserAlreadyOnlineException();
}
@@ -224,13 +233,13 @@ public class NoDefaultAdapter implements NoAdapter {
@Override
public boolean isOnline(byte[] hash) {
String hashString = Base64.encodeBase64String(hash);
String hashString = Base64.encodeBase64URLSafeString(hash);
return online.contains(hashString);
}
@Override
public void goOffline(byte[] hash) {
String hashString = Base64.encodeBase64String(hash);
String hashString = Base64.encodeBase64URLSafeString(hash);
online.remove(hashString);
}

29
src/nodash/models/NoSession.java
View File

@@ -3,6 +3,7 @@ package nodash.models;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
@@ -32,13 +33,12 @@ public final class NoSession implements Serializable {
private NoUser original;
private NoState state;
private final long expiry;
private boolean newUserSession;
private Collection<NoByteSet> incoming;
private NoUser current;
private String uuid;
public NoSession() {
private NoSession() {
this.state = NoState.IDLE;
this.expiry = System.currentTimeMillis() + NoSession.SESSION_DURATION;
this.uuid = UUID.randomUUID().toString();
@@ -46,18 +46,25 @@ public final class NoSession implements Serializable {
public NoSession(NoUser newUser) {
this();
if (newUser == null) {
throw new NullPointerException("Session cannot be created with null user.");
}
this.state = NoState.MODIFIED;
this.original = null;
this.current = newUser;
this.newUserSession = true;
}
public NoSession(NoAdapter adapter, byte[] data, char[] password) throws NoUserNotValidException {
public NoSession(byte[] data, char[] password) throws NoUserNotValidException {
this();
this.newUserSession = false;
this.state = NoState.IDLE;
try {
this.original = NoUser.createUserFromFile(data, password);
byte[] originalData = Arrays.copyOf(data, data.length);
char[] originalPassword = Arrays.copyOf(password, password.length);
this.original = NoUser.createUserFromFile(originalData, originalPassword);
this.current = NoUser.createUserFromFile(data, password);
NoUtil.wipeBytes(data);
NoUtil.wipeChars(password);
this.uuid = UUID.randomUUID().toString();
} catch (IOException e) {
throw new NoUserNotValidException();
} catch (IllegalBlockSizeException e) {
@@ -80,7 +87,7 @@ public final class NoSession implements Serializable {
public NoState touchState() throws NoSessionConfirmedException, NoSessionExpiredException {
check();
if (this.newUserSession) {
if (this.original == null) {
if (this.state != NoState.AWAITING_CONFIRMATION) {
this.state = NoState.MODIFIED;
}
@@ -133,8 +140,6 @@ public final class NoSession implements Serializable {
this.incoming = new ArrayList<NoByteSet>();
List<NoAction> actions = this.current.getNoActions();
this.incoming = null;
this.original = null;
this.current = null;
/* 5.2.4: execute NoActions */
for (NoAction action : actions) {
/*
@@ -181,7 +186,7 @@ public final class NoSession implements Serializable {
}
public byte[] getOriginalHash() {
if (this.original != null) {
if (!isNewUser()) {
return this.original.createHash();
} else {
return null;
@@ -200,4 +205,8 @@ public final class NoSession implements Serializable {
public void close() {
this.state = NoState.CLOSED;
}
public boolean isNewUser() {
return this.original == null;
}
}

16
src/nodash/models/NoUser.java
View File

@@ -195,7 +195,21 @@ public class NoUser implements Serializable {
}
public String createHashString() {
return Base64.encodeBase64String(this.createHash());
return Base64.encodeBase64URLSafeString(this.createHash());
}
@Override
public boolean equals(Object otherUser) {
if (otherUser == null) {
return false;
}
if (!otherUser.getClass().equals(getClass())) {
return false;
}
return this.privateKey.equals(((NoUser) otherUser).privateKey);
}
}

96
src/nodash/test/NoCoreTest.java
View File

@@ -9,6 +9,7 @@ import nodash.core.NoCore;
import nodash.core.NoDefaultAdapter;
import nodash.core.NoRegister;
import nodash.exceptions.NoAdapterException;
import nodash.exceptions.NoDashFatalException;
import nodash.exceptions.NoDashSessionBadUuidException;
import nodash.exceptions.NoSessionAlreadyAwaitingConfirmationException;
import nodash.exceptions.NoSessionConfirmedException;
@@ -18,7 +19,9 @@ import nodash.exceptions.NoSessionNotChangedException;
import nodash.exceptions.NoUserAlreadyOnlineException;
import nodash.exceptions.NoUserNotValidException;
import nodash.models.NoUser;
import nodash.models.NoSession.NoState;
import org.apache.commons.codec.binary.Base64;
import org.junit.Test;
public class NoCoreTest {
@@ -36,7 +39,7 @@ public class NoCoreTest {
NoRegister registration2 = core.register(user2, "password".toCharArray());
assertFalse(Arrays.equals(registration1.cookie, registration2.cookie));
assertFalse(Arrays.equals(registration2.data, registration2.data));
assertFalse(Arrays.equals(registration1.data, registration2.data));
NoUser user3 = new NoUser();
try {
@@ -64,7 +67,8 @@ public class NoCoreTest {
@Test
public void testSaveAndConfirm() throws NoSessionExpiredException, NoSessionConfirmedException,
NoSessionNotAwaitingConfirmationException, NoUserNotValidException,
NoDashSessionBadUuidException, NoUserAlreadyOnlineException, NoSessionNotChangedException, NoSessionAlreadyAwaitingConfirmationException, NoAdapterException {
NoDashSessionBadUuidException, NoUserAlreadyOnlineException, NoSessionNotChangedException,
NoSessionAlreadyAwaitingConfirmationException, NoAdapterException {
NoAdapter adapter = new NoDefaultAdapter();
NoCore core = new NoCore(adapter);
@@ -85,11 +89,20 @@ public class NoCoreTest {
// Do nothing, true
}
byte[] badCookie = Arrays.copyOf(registration.cookie, registration.cookie.length);
badCookie[0] = (byte) (badCookie[0] == 'A' ? 'B' : 'A');
try {
core.confirm(new byte[] {'b', 'a', 'd', 'c', 'o', 'o', 'k', 'i', 'e'}, "password".toCharArray(),
newUserBadPassFile);
fail("Confirmed on bad cookie without throwing exception.");
core.confirm(badCookie, "password".toCharArray(), newUserBadPassFile);
fail("Confirmed on bad cookie without throwing fatal exception.");
} catch (NoSessionExpiredException e) {
// Do nothing, correct
}
try {
core.confirm(new byte[] {'b', 'a', 'd', 'c', 'o', 'o', 'k', 'i', 'e'},
"password".toCharArray(), newUserBadPassFile);
fail("Confirmed on bad cookie without throwing exception.");
} catch (NoDashFatalException e) {
// Do nothing, true
}
@@ -121,18 +134,79 @@ public class NoCoreTest {
@Test
public void testGetUser() {
fail("Not yet implemented");
public void testGetUser() throws NoSessionExpiredException, NoSessionConfirmedException,
NoSessionNotAwaitingConfirmationException, NoUserNotValidException,
NoUserAlreadyOnlineException {
NoCore core = new NoCore(new NoDefaultAdapter());
NoUser user = new NoUser();
NoRegister registration = core.register(user, "password".toCharArray());
byte[] file = Arrays.copyOf(registration.data, registration.data.length);
core.confirm(registration.cookie, "password".toCharArray(), file);
file = Arrays.copyOf(registration.data, registration.data.length);
byte[] cookie = core.login(file, "password".toCharArray());
byte[] badCookie = Arrays.copyOf(cookie, cookie.length);
badCookie[0] = (byte) (badCookie[0] == 'A' ? 'B' : 'A');
NoUser user2 = core.getNoUser(cookie);
assertNotNull(user2);
assertEquals(user, user2);
try {
core.getNoUser(badCookie);
fail("Did not fail when given a bad cookie.");
} catch (NoSessionExpiredException e) {
// Correct, do nothing.
}
}
@Test
public void testGetSessionState() {
fail("Not yet implemented");
public void testGetSessionState() throws NoSessionExpiredException, NoSessionConfirmedException,
NoSessionNotAwaitingConfirmationException, NoUserNotValidException,
NoUserAlreadyOnlineException, NoSessionNotChangedException, NoSessionAlreadyAwaitingConfirmationException {
NoCore core = new NoCore(new NoDefaultAdapter());
NoUser user = new NoUser();
NoRegister registration = core.register(user, "password".toCharArray());
assertEquals(core.getSessionState(registration.cookie), NoState.AWAITING_CONFIRMATION);
byte[] file = Arrays.copyOf(registration.data, registration.data.length);
core.confirm(registration.cookie, "password".toCharArray(), file);
file = Arrays.copyOf(registration.data, registration.data.length);
byte[] cookie = core.login(file, "password".toCharArray());
assertEquals(core.getSessionState(cookie), NoState.IDLE);
user = core.getNoUser(cookie);
user.createFile("password".toCharArray()); // touch randomizer
assertEquals(core.getSessionState(cookie), NoState.MODIFIED);
file = core.save(cookie, "password".toCharArray());
assertEquals(core.getSessionState(cookie), NoState.AWAITING_CONFIRMATION);
core.confirm(cookie, "password".toCharArray(), file);
try {
core.getSessionState(cookie);
fail("Didn't fail on getting session after confirm.");
} catch (NoSessionExpiredException e) {
// Do nothing, correct
}
}
@Test
public void testShred() {
fail("Not yet implemented");
public void testShred() throws NoAdapterException, NoSessionConfirmedException, NoSessionExpiredException {
NoAdapter adapter = new NoDefaultAdapter();
NoCore core = new NoCore(adapter);
NoUser user = new NoUser();
NoRegister registration = core.register(user, "password".toCharArray());
assertTrue(adapter.isOnline(user.createHash()));
assertEquals(core.getSessionState(registration.cookie), NoState.AWAITING_CONFIRMATION);
core.shred(registration.cookie);
assertFalse(adapter.isOnline(user.createHash()));
try {
core.getNoUser(registration.cookie);
fail("Returned a user object after shredding.");
} catch (NoSessionExpiredException e) {
// Do nothing, correct
}
}
}

11
src/nodash/test/NoDashBasicTests.java Normal file
View File

@@ -0,0 +1,11 @@
package nodash.test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({NoCoreTest.class, NoSessionTest.class, NoUserTest.class, NoUtilTest.class})
public class NoDashBasicTests {
}

92
src/nodash/test/NoSessionTest.java
View File

@@ -1,65 +1,71 @@
package nodash.test;
import static org.junit.Assert.*;
import java.util.Arrays;
import nodash.exceptions.NoSessionConfirmedException;
import nodash.exceptions.NoSessionExpiredException;
import nodash.exceptions.NoUserNotValidException;
import nodash.models.NoSession;
import nodash.models.NoSession.NoState;
import nodash.models.NoUser;
import org.junit.Test;
public class NoSessionTest {
@Test
public void testNoSession() throws NoSessionConfirmedException, NoSessionExpiredException {
NoSession session = new NoSession();
public void testNoSessionNoUser() throws NoSessionConfirmedException, NoSessionExpiredException {
NoUser user = new NoUser();
NoSession session = new NoSession(user);
assertNotNull(session.getNoUser());
assertNotNull(session.getUuid());
assertNull(session.getNoUser());
assertNotNull(session.getEncryptedUuid());
assertNull(session.getIncoming());
assertNull(session.getOriginalHash());
assertEquals(session.getNoUser(), user);
assertEquals(session.getNoState(), NoState.MODIFIED);
try {
new NoSession(null);
fail("Did not throw NullPointerException when given a null user.");
} catch (NullPointerException e) {
// Do nothing, correct
}
}
@Test
public void testNoSessionNoUser() {
fail("Not yet implemented");
public void testNoSessionByteArrayCharArray() throws NoUserNotValidException,
NoSessionExpiredException, NoSessionConfirmedException {
NoUser user = new NoUser();
final byte[] userFile1 = user.createFile("password".toCharArray());
byte[] userFile2 = Arrays.copyOf(userFile1, userFile1.length);
char[] userPassword = "password".toCharArray();
NoSession session = new NoSession(userFile2, userPassword);
assertFalse(Arrays.equals(userFile1, userFile2));
assertFalse(Arrays.equals("password".toCharArray(), userPassword));
assertNotNull(session.getNoUser());
assertNotNull(session.getOriginalHash());
assertNotNull(session.getUuid());
assertNull(session.getIncoming());
assertEquals(session.getNoUser(), user);
assertEquals(session.getNoState(), NoState.IDLE);
byte[] badUserFile = Arrays.copyOf(userFile1, userFile1.length);
badUserFile[0] = (byte) (badUserFile[0] == 'A' ? 'B' : 'A');
try {
new NoSession(badUserFile, "password".toCharArray());
fail("Did not throw NoUserNotValidException when given bad file.");
} catch (NoUserNotValidException e) {
// Do nothing, correct
}
@Test
public void testNoSessionByteArrayCharArray() {
fail("Not yet implemented");
try {
new NoSession(Arrays.copyOf(userFile2, userFile2.length), "badpassword".toCharArray());
fail("Did not throw NoUserNotValidException when given bad password.");
} catch (NoUserNotValidException e) {
// Do nothing, correct
}
@Test
public void testCheck() {
fail("Not yet implemented");
}
@Test
public void testTouchState() {
fail("Not yet implemented");
}
@Test
public void testInitiateSaveAttempt() {
fail("Not yet implemented");
}
@Test
public void testConfirmSave() {
fail("Not yet implemented");
}
@Test
public void testDecryptUuid() {
fail("Not yet implemented");
}
@Test
public void testConsume() {
fail("Not yet implemented");
}
@Test
public void testClose() {
fail("Not yet implemented");
}
}

2
src/nodash/test/NoUserTest.java
View File

@@ -59,7 +59,7 @@ public class NoUserTest {
byte[] hash = user.createHash();
String hashString = user.createHashString();
assertEquals(Base64.encodeBase64String(hash), hashString);
assertEquals(Base64.encodeBase64URLSafeString(hash), hashString);
}
@Test