Added some address generation and handling

inventory/src/main/java/ch/dissem/bitmessage/inventory/DatabaseRepository.java

@@ -17,17 +17,19 @@
 package ch.dissem.bitmessage.inventory;
 
 import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Streamable;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.factory.Factory;
-import ch.dissem.bitmessage.ports.AddressRepository;
 import ch.dissem.bitmessage.ports.Inventory;
+import ch.dissem.bitmessage.ports.NodeRegistry;
 import org.flywaydb.core.Flyway;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.sql.*;
 import java.util.LinkedList;
 import java.util.List;
@@ -38,7 +40,7 @@ import static ch.dissem.bitmessage.utils.UnixTime.now;
 /**
  * Stores everything in a database
  */
-public class DatabaseRepository implements Inventory, AddressRepository {
+public class DatabaseRepository implements Inventory, NodeRegistry {
     private static final Logger LOG = LoggerFactory.getLogger(DatabaseRepository.class);
 
     private static final String DB_URL = "jdbc:h2:~/jabit";
@@ -170,6 +172,13 @@ public class DatabaseRepository implements Inventory, AddressRepository {
         }
     }
 
+    protected void writeBlob(PreparedStatement ps, int parameterIndex, Streamable data) throws SQLException, IOException {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        data.write(os);
+        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
+        ps.setBlob(parameterIndex, is);
+    }
+
     @Override
     public void cleanup() {
         try {
@@ -180,7 +189,7 @@ public class DatabaseRepository implements Inventory, AddressRepository {
         }
     }
 
-    private Connection getConnection() {
+    protected Connection getConnection() {
         try {
             return DriverManager.getConnection(DB_URL, DB_USER, DB_PWD);
         } catch (SQLException e) {

inventory/src/main/java/ch/dissem/bitmessage/inventory/JdbcAddressRepository.java

@@ -0,0 +1,101 @@
+/*
+ * 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.inventory;
+
+import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.factory.Factory;
+import ch.dissem.bitmessage.ports.AddressRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.sql.*;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Created by chris on 23.04.15.
+ */
+public class JdbcAddressRepository extends DatabaseRepository implements AddressRepository {
+    private static final Logger LOG = LoggerFactory.getLogger(DatabaseRepository.class);
+
+    @Override
+    public List<BitmessageAddress> findIdentities() {
+        return find("private_signing_key IS NOT NULL");
+    }
+
+    @Override
+    public List<BitmessageAddress> findContacts() {
+        return find("private_signing_key IS NULL");
+    }
+
+    private List<BitmessageAddress> find(String where) {
+        List<BitmessageAddress> result = new LinkedList<>();
+        try {
+            Statement stmt = getConnection().createStatement();
+            ResultSet rs = stmt.executeQuery("SELECT address, alias, public_key, private_key FROM Address WHERE " + where);
+            while (rs.next()) {
+                BitmessageAddress address;
+                Blob privateKeyBlob = rs.getBlob("private_key");
+                if (privateKeyBlob != null) {
+                    PrivateKey privateKey = PrivateKey.read(privateKeyBlob.getBinaryStream());
+                    address = new BitmessageAddress(privateKey);
+                } else {
+                    address = new BitmessageAddress(rs.getString("address"));
+                    Blob publicKeyBlob = rs.getBlob("public_key");
+                    if (publicKeyBlob != null) {
+                        Pubkey pubkey = Factory.readPubkey(address.getVersion(), address.getStream(),
+                                publicKeyBlob.getBinaryStream(), (int)publicKeyBlob.length());
+                        address.setPubkey(pubkey);
+                    }
+                }
+                address.setAlias(rs.getString("alias"));
+
+                result.add(address);
+            }
+        } catch (IOException | SQLException e) {
+            LOG.error(e.getMessage(), e);
+        }
+        return result;
+    }
+
+    @Override
+    public void save(BitmessageAddress address) {
+        try {
+            PreparedStatement ps = getConnection().prepareStatement(
+                    "INSERT INTO Address (address, alias, public_key, private_key) VALUES (?, ?, ?, ?, ?)");
+            ps.setString(1, address.getAddress());
+            ps.setString(2, address.getAlias());
+            writeBlob(ps, 3, address.getPubkey());
+            writeBlob(ps, 4, address.getPrivateKey());
+        } catch (IOException | SQLException e) {
+            LOG.error(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void remove(BitmessageAddress address) {
+        try {
+            Statement stmt = getConnection().createStatement();
+            stmt.executeUpdate("DELETE FROM Address WHERE address = '" + address.getAddress() + "'");
+        } catch (SQLException e) {
+            LOG.error(e.getMessage(), e);
+        }
+    }
+}

inventory/src/main/java/ch/dissem/bitmessage/inventory/SimpleNodeRegistry.java

@@ -17,7 +17,7 @@
 package ch.dissem.bitmessage.inventory;
 
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.ports.AddressRepository;
+import ch.dissem.bitmessage.ports.NodeRegistry;
 
 import java.util.Collections;
 import java.util.List;
@@ -25,7 +25,7 @@ import java.util.List;
 /**
  * Created by chris on 06.04.15.
  */
-public class SimpleAddressRepository implements AddressRepository {
+public class SimpleNodeRegistry implements NodeRegistry {
     @Override
     public List<NetworkAddress> getKnownAddresses(int limit, long... streams) {
         return Collections.singletonList(new NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(8444).build());

inventory/src/main/resources/db/migration/V1.2__Create_address_table.sql

@@ -0,0 +1,6 @@
+CREATE TABLE Address (
+  address                VARCHAR(40)   NOT NULL PRIMARY KEY,
+  alias                  VARCHAR(255),
+  public_key             BLOB,
+  private_key            BLOB
+);