bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Network code now works well enough for the server to think it successfully established a connection

Browse Source
This commit is contained in:
Christian Basler
2015-04-07 18:48:58 +02:00
parent 3299d8ca4a
commit 35088ca033
27 changed files with 636 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
domain/src/main/java/ch/dissem/bitmessage/Context.java
View File

@ -18,8 +18,12 @@ package ch.dissem.bitmessage;
import ch.dissem.bitmessage.ports.AddressRepository;
import ch.dissem.bitmessage.ports.Inventory;
import ch.dissem.bitmessage.ports.NetworkMessageReceiver;
import ch.dissem.bitmessage.ports.NetworkMessageSender;
import ch.dissem.bitmessage.ports.NetworkHandler;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.TreeSet;
/**
* Created by chris on 05.04.15.
@ -31,19 +35,22 @@ public class Context {
private Inventory inventory;
private AddressRepository addressRepo;
private NetworkMessageSender sender;
private NetworkMessageReceiver receiver;
private NetworkHandler networkHandler;
private Collection<Long> streams = new TreeSet<>();
private int port;
private Context(Inventory inventory, AddressRepository addressRepo,
NetworkMessageSender sender, NetworkMessageReceiver receiver) {
NetworkHandler networkHandler, int port) {
this.inventory = inventory;
this.addressRepo = addressRepo;
this.sender = sender;
this.receiver = receiver;
this.networkHandler = networkHandler;
this.port = port;
}
public static void init(Inventory inventory, AddressRepository addressRepository, NetworkMessageSender sender, NetworkMessageReceiver receiver) {
instance = new Context(inventory, addressRepository, sender, receiver);
public static void init(Inventory inventory, AddressRepository addressRepository, NetworkHandler networkHandler, int port) {
instance = new Context(inventory, addressRepository, networkHandler, port);
}
public static Context getInstance() {
@ -57,4 +64,25 @@ public class Context {
public AddressRepository getAddressRepository() {
return addressRepo;
}
public int getPort() {
return port;
}
public long[] getStreams() {
long[] result = new long[streams.size()];
int i = 0;
for (long stream : streams) {
result[i++] = stream;
}
return result;
}
public void addStream(long stream) {
streams.add(stream);
}
public void removeStream(long stream) {
streams.remove(stream);
}
}

2
domain/src/main/java/ch/dissem/bitmessage/entity/Version.java
View File

@ -146,7 +146,7 @@ public class Version implements MessagePayload {
}
public Builder defaults() {
version = Context.CURRENT;
version = Context.CURRENT_VERSION;
services = 1;
timestamp = System.currentTimeMillis() / 1000;
nonce = new Random().nextInt();

45
domain/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright 2015 Christian Basler
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ch.dissem.bitmessage.entity.payload;
import java.io.IOException;
import java.io.OutputStream;
/**
* Created by chris on 07.04.15.
*/
public class Broadcast implements ObjectPayload {
private long stream;
private byte[] tag;
private byte[] encrypted;
public Broadcast(long stream, byte[] tag, byte[] encrypted) {
this.stream = stream;
this.tag = tag;
this.encrypted = encrypted;
}
@Override
public long getStream() {
return stream;
}
@Override
public void write(OutputStream stream) throws IOException {
}
}

9
domain/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
View File

@ -23,12 +23,19 @@ import java.io.OutputStream;
* Created by chris on 24.03.15.
*/
public class GenericPayload implements ObjectPayload {
private long stream;
private byte[] data;
public GenericPayload(byte[] data) {
public GenericPayload(long stream, byte[] data) {
this.stream=stream;
this.data = data;
}
@Override
public long getStream() {
return stream;
}
@Override
public void write(OutputStream stream) throws IOException {
stream.write(data);

9
domain/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
View File

@ -23,10 +23,12 @@ import java.io.OutputStream;
* Created by chris on 24.03.15.
*/
public class GetPubkey implements ObjectPayload {
private long stream;
private byte[] ripe;
private byte[] tag;
public GetPubkey(byte[] ripeOrTag) {
public GetPubkey(long stream, byte[] ripeOrTag) {
this.stream=stream;
switch (ripeOrTag.length) {
case 20:
ripe = ripeOrTag;
@ -39,6 +41,11 @@ public class GetPubkey implements ObjectPayload {
}
}
@Override
public long getStream() {
return stream;
}
@Override
public void write(OutputStream stream) throws IOException {
if (tag != null) {

29
domain/src/main/java/ch/dissem/bitmessage/ports/NetworkMessageReceiver.java → domain/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
View File

@ -14,23 +14,30 @@
* limitations under the License.
*/
package ch.dissem.bitmessage.ports;
import ch.dissem.bitmessage.entity.NetworkMessage;
import ch.dissem.bitmessage.entity.payload.ObjectPayload;
import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
package ch.dissem.bitmessage.entity.payload;
import java.io.IOException;
import java.io.OutputStream;
/**
* Handles incoming messages
* Created by chris on 07.04.15.
*/
public interface NetworkMessageReceiver {
void registerListener(int port, MessageListener listener) throws IOException;
public class Msg implements ObjectPayload {
private long stream;
private byte[] encrypted;
void registerListener(NetworkAddress node, MessageListener listener) throws IOException;
public Msg(long stream, byte[] encrypted) {
this.stream = stream;
this.encrypted = encrypted;
}
interface MessageListener {
void receive(ObjectPayload payload);
@Override
public long getStream() {
return stream;
}
@Override
public void write(OutputStream stream) throws IOException {
stream.write(encrypted);
}
}

1
domain/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
View File

@ -22,4 +22,5 @@ import ch.dissem.bitmessage.entity.Streamable;
* The payload of an 'object' command. This is shared by the network.
*/
public interface ObjectPayload extends Streamable {
long getStream();
}

2
domain/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
View File

@ -22,8 +22,6 @@ package ch.dissem.bitmessage.entity.payload;
public interface Pubkey extends ObjectPayload {
long getVersion();
long getStream();
byte[] getSigningKey();
byte[] getEncryptionKey();

48
domain/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
View File

@ -25,11 +25,21 @@ import java.io.OutputStream;
* Created by chris on 24.03.15.
*/
public class V2Pubkey implements Pubkey {
protected long streamNumber;
protected long stream;
protected long behaviorBitfield;
protected byte[] publicSigningKey;
protected byte[] publicEncryptionKey;
protected V2Pubkey() {
}
private V2Pubkey(Builder builder) {
stream = builder.streamNumber;
behaviorBitfield = builder.behaviorBitfield;
publicSigningKey = builder.publicSigningKey;
publicEncryptionKey = builder.publicEncryptionKey;
}
@Override
public long getVersion() {
return 2;
@ -37,7 +47,7 @@ public class V2Pubkey implements Pubkey {
@Override
public long getStream() {
return streamNumber;
return stream;
}
@Override
@ -56,4 +66,38 @@ public class V2Pubkey implements Pubkey {
stream.write(publicSigningKey);
stream.write(publicEncryptionKey);
}
public static class Builder {
private long streamNumber;
private long behaviorBitfield;
private byte[] publicSigningKey;
private byte[] publicEncryptionKey;
public Builder() {
}
public Builder streamNumber(long streamNumber) {
this.streamNumber = streamNumber;
return this;
}
public Builder behaviorBitfield(long behaviorBitfield) {
this.behaviorBitfield = behaviorBitfield;
return this;
}
public Builder publicSigningKey(byte[] publicSigningKey) {
this.publicSigningKey = publicSigningKey;
return this;
}
public Builder publicEncryptionKey(byte[] publicEncryptionKey) {
this.publicEncryptionKey = publicEncryptionKey;
return this;
}
public V2Pubkey build() {
return new V2Pubkey(this);
}
}
}

64
domain/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
View File

@ -29,6 +29,17 @@ public class V3Pubkey extends V2Pubkey {
long extraBytes;
byte[] signature;
protected V3Pubkey(Builder builder) {
stream = builder.streamNumber;
behaviorBitfield = builder.behaviorBitfield;
publicSigningKey = builder.publicSigningKey;
publicEncryptionKey = builder.publicEncryptionKey;
nonceTrialsPerByte = builder.nonceTrialsPerByte;
extraBytes = builder.extraBytes;
signature = builder.signature;
}
@Override
public void write(OutputStream stream) throws IOException {
super.write(stream);
@ -42,4 +53,57 @@ public class V3Pubkey extends V2Pubkey {
public long getVersion() {
return 3;
}
public static class Builder extends V2Pubkey.Builder {
private long streamNumber;
private long behaviorBitfield;
private byte[] publicSigningKey;
private byte[] publicEncryptionKey;
private long nonceTrialsPerByte;
private long extraBytes;
private byte[] signature;
public Builder() {
}
public Builder streamNumber(long streamNumber) {
this.streamNumber = streamNumber;
return this;
}
public Builder behaviorBitfield(long behaviorBitfield) {
this.behaviorBitfield = behaviorBitfield;
return this;
}
public Builder publicSigningKey(byte[] publicSigningKey) {
this.publicSigningKey = publicSigningKey;
return this;
}
public Builder publicEncryptionKey(byte[] publicEncryptionKey) {
this.publicEncryptionKey = publicEncryptionKey;
return this;
}
public Builder nonceTrialsPerByte(long nonceTrialsPerByte) {
this.nonceTrialsPerByte = nonceTrialsPerByte;
return this;
}
public Builder extraBytes(long extraBytes) {
this.extraBytes = extraBytes;
return this;
}
public Builder signature(byte[] signature) {
this.signature = signature;
return this;
}
public V3Pubkey build() {
return new V3Pubkey(this);
}
}
}

13
domain/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
View File

@ -23,15 +23,22 @@ import java.io.OutputStream;
* Created by chris on 27.03.15.
*/
public class V4Pubkey implements Pubkey {
private long streamNumber;
private long stream;
private byte[] tag;
private byte[] encrypted;
private V3Pubkey decrypted;
public V4Pubkey(long stream, byte[] tag, byte[] encrypted) {
this.stream = stream;
this.tag = tag;
this.encrypted = encrypted;
}
public V4Pubkey(V3Pubkey decrypted) {
this.stream = decrypted.stream;
// TODO: this.tag = new BitmessageAddress(this).doubleHash
this.decrypted = decrypted;
// TODO: this.tag = new BitmessageAddress(this).doubleHash
}
@Override
@ -47,7 +54,7 @@ public class V4Pubkey implements Pubkey {
@Override
public long getStream() {
return streamNumber;
return stream;
}
@Override

24
domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
View File

@ -21,12 +21,9 @@ import ch.dissem.bitmessage.utils.Encode;
import java.io.IOException;
import java.io.OutputStream;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Objects;
/**
* A node's address. It's written in IPv6 format.
@ -51,6 +48,14 @@ public class NetworkAddress implements Streamable {
private byte[] ipv6;
private int port;
private NetworkAddress(Builder builder) {
time = builder.time;
stream = builder.stream;
services = builder.services;
ipv6 = builder.ipv6;
port = builder.port;
}
public int getPort() {
return port;
}
@ -63,14 +68,6 @@ public class NetworkAddress implements Streamable {
}
}
private NetworkAddress(Builder builder) {
time = builder.time;
stream = builder.stream;
services = builder.services;
ipv6 = builder.ipv6;
port = builder.port;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
@ -88,6 +85,11 @@ public class NetworkAddress implements Streamable {
return result;
}
@Override
public String toString() {
return toInetAddress() + ":" + port;
}
@Override
public void write(OutputStream stream) throws IOException {
write(stream, false);

61
domain/src/main/java/ch/dissem/bitmessage/factory/Factory.java
View File

@ -17,10 +17,10 @@
package ch.dissem.bitmessage.factory;
import ch.dissem.bitmessage.entity.NetworkMessage;
import ch.dissem.bitmessage.entity.payload.GenericPayload;
import ch.dissem.bitmessage.entity.payload.GetPubkey;
import ch.dissem.bitmessage.entity.payload.ObjectPayload;
import ch.dissem.bitmessage.entity.payload.*;
import ch.dissem.bitmessage.utils.Decode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
@ -29,26 +29,63 @@ import java.io.InputStream;
* Creates {@link NetworkMessage} objects from {@link InputStream InputStreams}
*/
public class Factory {
public static final Logger LOG = LoggerFactory.getLogger(Factory.class);
public static NetworkMessage getNetworkMessage(int version, InputStream stream) throws IOException {
return new V3MessageFactory().read(stream);
}
static ObjectPayload getObjectPayload(long objectType, long version, InputStream stream, int length) throws IOException {
static ObjectPayload getObjectPayload(long objectType, long version, long streamNumber, InputStream stream, int length) throws IOException {
if (objectType < 4) {
switch ((int) objectType) {
case 0: // getpubkey
return new GetPubkey(Decode.bytes(stream, length));
return new GetPubkey(streamNumber, Decode.bytes(stream, length));
case 1: // pubkey
break;
return parsePubkey((int) version, streamNumber, stream, length);
case 2: // msg
break;
return parseMsg((int) version, streamNumber, stream, length);
case 3: // broadcast
break;
return parseBroadcast((int) version, streamNumber, stream, length);
}
throw new RuntimeException("This must not happen, someone broke something in the code!");
} else {
// passthrough message
return new GenericPayload(Decode.bytes(stream, length));
LOG.error("This should not happen, someone broke something in the code!");
}
// fallback: just store the message - we don't really care what it is
LOG.error("Unexpected object type: " + objectType);
return new GenericPayload(streamNumber, Decode.bytes(stream, length));
}
private static ObjectPayload parsePubkey(int version, long streamNumber, InputStream stream, int length) throws IOException {
switch (version) {
case 2:
return new V2Pubkey.Builder()
.streamNumber(streamNumber)
.behaviorBitfield(Decode.int64(stream))
.publicSigningKey(Decode.bytes(stream, 64))
.publicEncryptionKey(Decode.bytes(stream, 64))
.build();
case 3:
V3Pubkey.Builder v3 = new V3Pubkey.Builder()
.streamNumber(streamNumber)
.behaviorBitfield(Decode.int64(stream))
.publicSigningKey(Decode.bytes(stream, 64))
.publicEncryptionKey(Decode.bytes(stream, 64))
.nonceTrialsPerByte(Decode.varInt(stream))
.extraBytes(Decode.varInt(stream));
int sigLength = (int) Decode.varInt(stream);
v3.signature(Decode.bytes(stream, sigLength));
return v3.build();
case 4:
// TODO
}
LOG.debug("Unexpected pubkey version " + version + ", handling as generic payload object");
return new GenericPayload(streamNumber, Decode.bytes(stream, length));
}
private static ObjectPayload parseMsg(int version, long streamNumber, InputStream stream, int length) throws IOException {
return new Msg(streamNumber, Decode.bytes(stream, length));
}
private static ObjectPayload parseBroadcast(int version, long streamNumber, InputStream stream, int length) throws IOException {
return new Broadcast(streamNumber, Decode.bytes(stream, 32), Decode.bytes(stream, length - 32));
}
}

44
domain/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
View File

@ -22,6 +22,8 @@ import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
import ch.dissem.bitmessage.utils.Decode;
import ch.dissem.bitmessage.utils.Security;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@ -31,6 +33,8 @@ import java.io.InputStream;
* Creates protocol v3 network messages from {@link InputStream InputStreams}
*/
class V3MessageFactory {
private Logger LOG = LoggerFactory.getLogger(V3MessageFactory.class);
public NetworkMessage read(InputStream stream) throws IOException {
if (testMagic(stream)) {
String command = getCommand(stream);
@ -45,8 +49,10 @@ class V3MessageFactory {
} else {
throw new IOException("Checksum failed for message '" + command + "'");
}
} else {
LOG.debug("Failed test for MAGIC bytes");
return null;
}
return null;
}
private MessagePayload getPayload(String command, InputStream stream, int length) throws IOException {
@ -64,6 +70,7 @@ class V3MessageFactory {
case "object":
return parseObject(stream, length);
default:
LOG.debug("Unknown command: " + command);
return null;
}
}
@ -75,7 +82,7 @@ class V3MessageFactory {
long version = Decode.varInt(stream);
long streamNumber = Decode.varInt(stream);
ObjectPayload payload = Factory.getObjectPayload(objectType, version, stream, length);
ObjectPayload payload = Factory.getObjectPayload(objectType, version, streamNumber, stream, length);
return new ObjectMessage.Builder()
.nonce(nonce)
@ -109,7 +116,7 @@ class V3MessageFactory {
long count = Decode.varInt(stream);
Addr.Builder builder = new Addr.Builder();
for (int i = 0; i < count; i++) {
builder.addAddress(parseAddress(stream));
builder.addAddress(parseAddress(stream, false));
}
return builder.build();
}
@ -118,8 +125,8 @@ class V3MessageFactory {
int version = Decode.int32(stream);
long services = Decode.int64(stream);
long timestamp = Decode.int64(stream);
NetworkAddress addrRecv = parseAddress(stream);
NetworkAddress addrFrom = parseAddress(stream);
NetworkAddress addrRecv = parseAddress(stream, true);
NetworkAddress addrFrom = parseAddress(stream, true);
long nonce = Decode.int64(stream);
String userAgent = Decode.varString(stream);
long[] streamNumbers = Decode.varIntList(stream);
@ -138,9 +145,16 @@ class V3MessageFactory {
return new InventoryVector(Decode.bytes(stream, 32));
}
private NetworkAddress parseAddress(InputStream stream) throws IOException {
long time = Decode.int64(stream);
long streamNumber = Decode.uint32(stream); // This isn't consistent, not sure if this is correct
private NetworkAddress parseAddress(InputStream stream, boolean light) throws IOException {
long time;
long streamNumber;
if (!light) {
time = Decode.int64(stream);
streamNumber = Decode.uint32(stream); // This isn't consistent, not sure if this is correct
} else {
time = 0;
streamNumber = 0;
}
long services = Decode.int64(stream);
byte[] ipv6 = Decode.bytes(stream, 16);
int port = Decode.uint16(stream);
@ -159,13 +173,21 @@ class V3MessageFactory {
private String getCommand(InputStream stream) throws IOException {
byte[] bytes = new byte[12];
stream.read(bytes);
return new String(bytes, "ASCII");
int end = -1;
for (int i = 0; i < bytes.length; i++) {
bytes[i] = (byte) stream.read();
if (end == -1) {
if (bytes[i] == 0) end = i;
} else {
if (bytes[i] != 0) throw new IOException("'\\0' padding expected for command");
}
}
return new String(bytes, 0, end, "ASCII");
}
private boolean testMagic(InputStream stream) throws IOException {
for (byte b : NetworkMessage.MAGIC_BYTES) {
if (b != stream.read()) return false;
if (b != (byte) stream.read()) return false;
}
return true;
}

11
domain/src/main/java/ch/dissem/bitmessage/ports/Inventory.java
View File

@ -17,7 +17,6 @@
package ch.dissem.bitmessage.ports;
import ch.dissem.bitmessage.entity.ObjectMessage;
import ch.dissem.bitmessage.entity.payload.ObjectPayload;
import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
import java.util.List;
@ -26,13 +25,13 @@ import java.util.List;
* The Inventory stores and retrieves objects, cleans up outdated objects and can tell which objects are still missing.
*/
public interface Inventory {
public List<InventoryVector> getInventory(long... streams);
List<InventoryVector> getInventory(long... streams);
public List<InventoryVector> getMissing(List<InventoryVector> offer);
List<InventoryVector> getMissing(List<InventoryVector> offer);
public ObjectMessage getObject(InventoryVector vector);
ObjectMessage getObject(InventoryVector vector);
public void storeObject(ObjectMessage object);
void storeObject(ObjectMessage object);
public void cleanup();
void cleanup();
}

15
domain/src/main/java/ch/dissem/bitmessage/ports/NetworkMessageSender.java → domain/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
View File

@ -17,11 +17,18 @@
package ch.dissem.bitmessage.ports;
import ch.dissem.bitmessage.entity.payload.ObjectPayload;
import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
/**
* Sends messages
* Handles incoming messages
*/
public interface NetworkMessageSender {
void send(NetworkAddress node, ObjectPayload payload);
public interface NetworkHandler {
void setListener(MessageListener listener);
void start();
void send(ObjectPayload payload);
interface MessageListener {
void receive(ObjectPayload payload);
}
}

5
domain/src/main/java/ch/dissem/bitmessage/utils/Decode.java
View File

@ -27,7 +27,10 @@ import java.nio.ByteBuffer;
public class Decode {
public static byte[] bytes(InputStream stream, int count) throws IOException {
byte[] result = new byte[count];
stream.read(result);
int off = 0;
while (off < count) {
off += stream.read(result, off, count - off);
}
return result;
}