X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FNodeManager.java;h=957e1bc33a92f9574a954f6169007bcb38ae411f;hb=f09a940c1098882fb137ad0b96e8bc9835170d3f;hp=84867cda4f504b62236340f27ec76bb59a94d9c0;hpb=4be8c6526b4e80d5b8f8df8598da128be766ced7;p=jSite2.git diff --git a/src/net/pterodactylus/jsite/core/NodeManager.java b/src/net/pterodactylus/jsite/core/NodeManager.java index 84867cd..957e1bc 100644 --- a/src/net/pterodactylus/jsite/core/NodeManager.java +++ b/src/net/pterodactylus/jsite/core/NodeManager.java @@ -19,16 +19,20 @@ package net.pterodactylus.jsite.core; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -38,18 +42,22 @@ 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 HighLevelClientListener { +public class NodeManager implements Iterable, PropertyChangeListener, HighLevelClientListener { /** Logger. */ - private static final Logger logger = Logger.getLogger(NodeManager.class.getName()); + private static final Logger logger = Logging.getLogger(NodeManager.class.getName()); /** The FCP client name. */ private final String clientName; @@ -60,20 +68,23 @@ public class NodeManager implements HighLevelClientListener { /** Object used for synchronization. */ private final Object syncObject = new Object(); - /** Node listeners. */ - private List nodeListeners = Collections.synchronizedList(new ArrayList()); + /** Node listener support. */ + private final NodeListenerSupport nodeListenerSupport = new NodeListenerSupport(); /** All nodes. */ - private List nodes = Collections.synchronizedList(new ArrayList()); + private final List nodes = Collections.synchronizedList(new ArrayList()); - /** All FCP connections. */ - private Map nodeClients = Collections.synchronizedMap(new HashMap()); + /** Map from node ID to node. */ + private final Map idNodes = Collections.synchronizedMap(new HashMap()); - /** Keeps track of which connection is in use right now. */ - private Set usedConnections = Collections.synchronizedSet(new HashSet()); + /** All FCP connections. */ + private final Map nodeClients = Collections.synchronizedMap(new HashMap()); /** Maps nodes to high-level clients. */ - private Map clientNodes = Collections.synchronizedMap(new HashMap()); + private final Map clientNodes = Collections.synchronizedMap(new HashMap()); + + /** Collection of currently connected nodes. */ + private final Set connectedNodes = Collections.synchronizedSet(new HashSet()); /** * Creates a new FCP collector. @@ -99,7 +110,7 @@ public class NodeManager implements HighLevelClientListener { * The listener to add */ public void addNodeListener(NodeListener nodeListener) { - nodeListeners.add(nodeListener); + nodeListenerSupport.addListener(nodeListener); } /** @@ -109,34 +120,7 @@ public class NodeManager implements HighLevelClientListener { * The listener to remove */ public void removeNodeListener(NodeListener nodeListener) { - nodeListeners.remove(nodeListener); - } - - /** - * Notifies all listeners that the given node was connected. - * - * @param node - * The node that is now connected - */ - private void fireNodeConnected(Node node) { - for (NodeListener nodeListener: nodeListeners) { - nodeListener.nodeConnected(node); - } - } - - /** - * Notifies all listeners that the given node was disconnected. - * - * @param node - * The node that is now disconnected - * @param throwable - * The exception that caused the disconnect, or null - * if there was no exception - */ - private void fireNodeDisconnected(Node node, Throwable throwable) { - for (NodeListener nodeListener: nodeListeners) { - nodeListener.nodeDisconnected(node, throwable); - } + nodeListenerSupport.removeListener(nodeListener); } // @@ -164,6 +148,25 @@ public class NodeManager implements HighLevelClientListener { return nodes.contains(node); } + /** + * Returns whether the given node is currently connected. + * + * @param node + * The node to check + * @return true if the node is currently connected, + * false otherwise + */ + public boolean isNodeConnected(Node node) { + return connectedNodes.contains(node); + } + + /** + * {@inheritDoc} + */ + public Iterator iterator() { + return nodes.iterator(); + } + // // ACTIONS // @@ -175,6 +178,7 @@ public class NodeManager implements HighLevelClientListener { * if an I/O error occurs loading the nodes */ public void load() throws IOException { + logger.log(Level.FINEST, "load()"); File directoryFile = new File(directory); File nodeFile = new File(directoryFile, "nodes.properties"); if (!nodeFile.exists() || !nodeFile.isFile() || !nodeFile.canRead()) { @@ -192,6 +196,10 @@ public class NodeManager implements HighLevelClientListener { List loadedNodes = new ArrayList(); 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…"); @@ -216,14 +224,18 @@ public class NodeManager implements HighLevelClientListener { continue; } Node newNode = new Node(); + newNode.setId(nodeId); newNode.setName(nodeName); newNode.setHostname(nodeHostname); newNode.setPort(nodePort); loadedNodes.add(newNode); } + logger.log(Level.FINE, "loaded " + loadedNodes.size() + " nodes from config"); synchronized (syncObject) { nodes.clear(); - nodes.addAll(loadedNodes); + for (Node node : loadedNodes) { + addNode(node); + } } } @@ -234,6 +246,7 @@ public class NodeManager implements HighLevelClientListener { * if an I/O error occurs saving the nodes */ public void save() throws IOException { + logger.log(Level.FINEST, "save()"); File directoryFile = new File(directory); if (!directoryFile.exists()) { if (!directoryFile.mkdirs()) { @@ -242,8 +255,9 @@ public class NodeManager implements HighLevelClientListener { } 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())); @@ -264,13 +278,24 @@ public class NodeManager implements HighLevelClientListener { * @see #connect(Node) * @param node * The node to connect to + * @return true if the node was added, false if + * the node was not added because it was already known */ - public void addNode(Node node) { - synchronized (syncObject) { - if (!nodes.contains(node)) { - nodes.add(node); - } + public boolean addNode(Node node) { + logger.log(Level.FINEST, "addNode(node=" + node + ")"); + if (nodes.contains(node)) { + logger.log(Level.WARNING, "was told to add already known node: " + node); + return false; } + node.addPropertyChangeListener(this); + HighLevelClient highLevelClient = new HighLevelClient(clientName); + nodes.add(node); + idNodes.put(node.getId(), node); + clientNodes.put(highLevelClient, node); + nodeClients.put(node, highLevelClient); + highLevelClient.addHighLevelClientListener(this); + nodeListenerSupport.fireNodeAdded(node); + return true; } /** @@ -281,6 +306,7 @@ public class NodeManager implements HighLevelClientListener { * The node to remove */ public void removeNode(Node node) { + logger.log(Level.FINEST, "removeNode(node=" + node + ")"); synchronized (syncObject) { if (!nodes.contains(node)) { return; @@ -288,6 +314,10 @@ public class NodeManager implements HighLevelClientListener { if (nodeClients.containsKey(node)) { disconnect(node); } + nodes.remove(node); + idNodes.remove(node.getId()); + node.removePropertyChangeListener(this); + nodeListenerSupport.fireNodeRemoved(node); } } @@ -298,16 +328,19 @@ public class NodeManager implements HighLevelClientListener { * The node to connect to */ public void connect(Node node) { + logger.log(Level.FINEST, "connect(node=" + node + ")"); + HighLevelClient highLevelClient; + highLevelClient = nodeClients.get(node); + if (highLevelClient == null) { + logger.log(Level.WARNING, "was told to connect to unknown node: " + node); + return; + } try { - HighLevelClient highLevelClient = new HighLevelClient(clientName, node.getHostname(), node.getPort()); - synchronized (syncObject) { - clientNodes.put(highLevelClient, node); - nodeClients.put(node, highLevelClient); - } - highLevelClient.addHighLevelClientListener(this); - highLevelClient.connect(); + highLevelClient.connect(node.getHostname(), node.getPort()); + } catch (UnknownHostException uhe1) { + nodeListenerSupport.fireNodeConnectionFailed(node, uhe1); } catch (IOException ioe1) { - fireNodeDisconnected(node, ioe1); + nodeListenerSupport.fireNodeConnectionFailed(node, ioe1); } } @@ -318,6 +351,7 @@ public class NodeManager implements HighLevelClientListener { * The node to disconnect */ public void disconnect(Node node) { + logger.log(Level.FINEST, "disconnect(node=" + node + ")"); synchronized (syncObject) { if (!nodes.contains(node)) { return; @@ -336,50 +370,75 @@ public class NodeManager implements HighLevelClientListener { return Collections.unmodifiableList(nodes); } - // - // PRIVATE METHODS - // + /** + * Returns the high-level client for a given node. + * + * @param node + * The node to get a high-level client for + * @return The high-level client for a node, or null if the + * node was disconnected or removed + */ + public HighLevelClient getHighLevelClient(Node node) { + return nodeClients.get(node); + } /** - * Finds a currently unused high-level client, optionally waiting until a - * client is free and marking it used. + * Returns the node for a high-level client. * - * @param wait - * true to wait for a free connection, - * false to return null - * @param markAsUsed - * true to mark the connection as used before - * returning it, false not to mark it - * @return An unused FCP connection, or null if no connection - * could be found + * @param highLevelClient + * The high-level client to get the node for + * @return The node for the high-level client, or null if the + * high-level client is not known */ - @SuppressWarnings("unused") - private HighLevelClient findUnusedClient(boolean wait, boolean markAsUsed) { - synchronized (syncObject) { - HighLevelClient freeHighLevelClient = null; - while (freeHighLevelClient == null) { - for (HighLevelClient highLevelClient: nodeClients.values()) { - if (!usedConnections.contains(highLevelClient)) { - freeHighLevelClient = highLevelClient; - break; - } - } - if (freeHighLevelClient != null) { - if (markAsUsed) { - usedConnections.add(freeHighLevelClient); - } - return freeHighLevelClient; - } - if (!wait) { - return null; - } - } - /* we never get here, but the compiler doesn't realize. */ - return null; + public Node getNode(HighLevelClient highLevelClient) { + return clientNodes.get(highLevelClient); + } + + /** + * Returns the node identified by the given ID. + * + * @param id + * The ID of the node + * @return The node with the given ID, or null if no such node + * was found + */ + Node getNode(String id) { + return idNodes.get(id); + } + + /** + * Generates a new SSK key pair. + * + * @return An array with the private key at index 0 and the + * public key at index 1 + * @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 { + logger.log(Level.FINEST, "generateKeyPair()"); + 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 + // + + // // INTERFACE HighLevelClientListener // @@ -387,26 +446,61 @@ public class NodeManager implements HighLevelClientListener { * {@inheritDoc} */ public void clientConnected(HighLevelClient highLevelClient) { + logger.log(Level.FINEST, "clientConnected(highLevelClient=" + highLevelClient + ")"); Node node = clientNodes.get(highLevelClient); if (node == null) { logger.log(Level.WARNING, "got event for unknown client"); return; } - fireNodeConnected(node); + connectedNodes.add(node); + nodeListenerSupport.fireNodeConnected(node); } /** * {@inheritDoc} */ public void clientDisconnected(HighLevelClient highLevelClient, Throwable throwable) { + logger.log(Level.FINEST, "clientDisconnected(highLevelClient=" + highLevelClient + ",throwable=" + throwable + ")"); synchronized (syncObject) { - Node node = clientNodes.remove(highLevelClient); + Node node = clientNodes.get(highLevelClient); if (node == null) { logger.log(Level.WARNING, "got event for unknown client"); return; } - nodeClients.remove(node); - fireNodeDisconnected(node, throwable); + connectedNodes.remove(node); + nodeListenerSupport.fireNodeDisconnected(node, throwable); + } + } + + // + // INTERFACE PropertyChangeListener + // + + /** + * {@inheritDoc} + */ + public void propertyChange(PropertyChangeEvent propertyChangeEvent) { + Object eventSource = propertyChangeEvent.getSource(); + if (eventSource instanceof Node) { + String propertyName = propertyChangeEvent.getPropertyName(); + if ("hostname".equals(propertyName) || "port".equals(propertyName)) { + Node node = (Node) eventSource; + HighLevelClient highLevelClient = nodeClients.get(node); + if (highLevelClient == null) { + logger.log(Level.WARNING, "got property change event for unknown node: " + node); + return; + } + if (highLevelClient.isConnected()) { + highLevelClient.disconnect(); + try { + highLevelClient.connect(node.getHostname(), node.getPort()); + } catch (UnknownHostException uhe1) { + nodeListenerSupport.fireNodeConnectionFailed(node, uhe1); + } catch (IOException ioe1) { + nodeListenerSupport.fireNodeConnectionFailed(node, ioe1); + } + } + } } }