add id to node

[jSite2.git] / src / net / pterodactylus / jsite / core / NodeManager.java

diff --git a/src/net/pterodactylus/jsite/core/NodeManager.java b/src/net/pterodactylus/jsite/core/NodeManager.java
index c676289..4224cf1 100644 (file)
--- a/src/net/pterodactylus/jsite/core/NodeManager.java
+++ b/src/net/pterodactylus/jsite/core/NodeManager.java
@@ -40,14 +40,17 @@ import java.util.logging.Logger;
 
 import net.pterodactylus.fcp.highlevel.HighLevelClient;
 import net.pterodactylus.fcp.highlevel.HighLevelClientListener;
+import net.pterodactylus.fcp.highlevel.HighLevelException;
+import net.pterodactylus.fcp.highlevel.KeyGenerationResult;
+import net.pterodactylus.jsite.util.IdGenerator;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.number.Hex;
 
 /**
  * TODO
  * 
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class NodeManager implements Iterable<Node>, PropertyChangeListener, HighLevelClientListener {
 
@@ -119,7 +122,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The node that was added.
         */
        private void fireNodeAdded(Node node) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeAdded(node);
                }
        }
@@ -131,7 +134,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The node that was removed
         */
        private void fireNodeRemoved(Node node) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeRemoved(node);
                }
        }
@@ -143,7 +146,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The node that is now connected
         */
        private void fireNodeConnected(Node node) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeConnected(node);
                }
        }
@@ -157,7 +160,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            The cause of the failure
         */
        private void fireNodeConnectionFailed(Node node, Throwable cause) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeConnectionFailed(node, cause);
                }
        }
@@ -172,7 +175,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
         *            if there was no exception
         */
        private void fireNodeDisconnected(Node node, Throwable throwable) {
-               for (NodeListener nodeListener: nodeListeners) {
+               for (NodeListener nodeListener : nodeListeners) {
                        nodeListener.nodeDisconnected(node, throwable);
                }
        }
@@ -237,6 +240,10 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                List<Node> loadedNodes = new ArrayList<Node>();
                while (nodeProperties.containsKey("nodes." + ++nodeIndex + ".name")) {
                        String nodePrefix = "nodes." + nodeIndex;
+                       String nodeId = nodeProperties.getProperty(nodePrefix + ".id");
+                       if (nodeId == null) {
+                               nodeId = Hex.toHex(IdGenerator.generateId());
+                       }
                        String nodeName = nodeProperties.getProperty(nodePrefix + ".name");
                        if (!Verifier.verifyNodeName(nodeName)) {
                                logger.log(Level.WARNING, "invalid node name “" + nodeName + "”, skipping…");
@@ -261,6 +268,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                                continue;
                        }
                        Node newNode = new Node();
+                       newNode.setId(nodeId);
                        newNode.setName(nodeName);
                        newNode.setHostname(nodeHostname);
                        newNode.setPort(nodePort);
@@ -269,7 +277,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                logger.fine("loaded " + loadedNodes.size() + " nodes from config");
                synchronized (syncObject) {
                        nodes.clear();
-                       for (Node node: loadedNodes) {
+                       for (Node node : loadedNodes) {
                                addNode(node);
                        }
                }
@@ -290,8 +298,9 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                }
                Properties nodeProperties = new Properties();
                int nodeIndex = -1;
-               for (Node node: nodes) {
+               for (Node node : nodes) {
                        String nodePrefix = "nodes." + ++nodeIndex;
+                       nodeProperties.setProperty(nodePrefix + ".id", node.getId());
                        nodeProperties.setProperty(nodePrefix + ".name", node.getName());
                        nodeProperties.setProperty(nodePrefix + ".hostname", node.getHostname());
                        nodeProperties.setProperty(nodePrefix + ".port", String.valueOf(node.getPort()));
@@ -345,6 +354,7 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                        if (nodeClients.containsKey(node)) {
                                disconnect(node);
                        }
+                       nodes.remove(node);
                        node.removePropertyChangeListener(this);
                        fireNodeRemoved(node);
                }
@@ -409,6 +419,45 @@ public class NodeManager implements Iterable<Node>, PropertyChangeListener, High
                return nodeClients.get(node);
        }
 
+       /**
+        * Returns the node for a high-level client.
+        * 
+        * @param highLevelClient
+        *            The high-level client to get the node for
+        * @return The node for the high-level client, or <code>null</code> if the
+        *         high-level client is not known
+        */
+       public Node getNode(HighLevelClient highLevelClient) {
+               return clientNodes.get(highLevelClient);
+       }
+
+       /**
+        * Generates a new SSK key pair.
+        * 
+        * @return An array with the private key at index <code>0</code> and the
+        *         public key at index <code>1</code>
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        * @throws JSiteException
+        *             if there is a problem with the node
+        */
+       public String[] generateKeyPair() throws IOException, JSiteException {
+               if (nodes.isEmpty()) {
+                       throw new NoNodeException("no node configured");
+               }
+               Node node = nodes.get(0);
+               HighLevelClient highLevelClient = nodeClients.get(node);
+               try {
+                       KeyGenerationResult keyGenerationResult = highLevelClient.generateKey().getResult();
+                       return new String[] { keyGenerationResult.getInsertURI(), keyGenerationResult.getRequestURI() };
+               } catch (HighLevelException hle1) {
+                       throw new BackendException(hle1);
+               } catch (InterruptedException e) {
+                       /* ignore. */
+               }
+               return null;
+       }
+
        //
        // PRIVATE METHODS
        //