X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=61068f8845eb7a77ce30d15c33568f7c167a62ea;hb=1bc88510da721fc90b270e4706ee2bdab41ecd18;hp=fd42ce66d5619d12f5441e93dc64e94d02c88e5b;hpb=8df45b32ccb53609dd90a5580e06a6f8e43a86a0;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java index fd42ce6..61068f8 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java @@ -25,6 +25,9 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import net.pterodactylus.sone.freenet.plugin.ConnectorListener; +import net.pterodactylus.sone.freenet.plugin.PluginConnector; +import net.pterodactylus.sone.freenet.plugin.PluginException; import net.pterodactylus.util.logging.Logging; import freenet.support.SimpleFieldSet; import freenet.support.api.Bucket; @@ -71,10 +74,10 @@ public class WebOfTrustConnector implements ConnectorListener { * Loads all own identities from the Web of Trust plugin. * * @return All own identity - * @throws PluginException + * @throws WebOfTrustException * if the own identities can not be loaded */ - public Set loadAllOwnIdentities() throws PluginException { + public Set loadAllOwnIdentities() throws WebOfTrustException { Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get(), "OwnIdentities"); SimpleFieldSet fields = reply.getFields(); int ownIdentityCounter = -1; @@ -87,37 +90,15 @@ public class WebOfTrustConnector implements ConnectorListener { String requestUri = fields.get("RequestURI" + ownIdentityCounter); String insertUri = fields.get("InsertURI" + ownIdentityCounter); String nickname = fields.get("Nickname" + ownIdentityCounter); - OwnIdentity ownIdentity = new OwnIdentity(this, id, nickname, requestUri, insertUri); + OwnIdentity ownIdentity = new OwnIdentity(id, nickname, requestUri, insertUri); + ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter + ".", fields)); + ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter + ".", fields)); ownIdentities.add(ownIdentity); } return ownIdentities; } /** - * Loads the contexts of the given identity. - * - * @param identity - * The identity to load the contexts for - * @return The contexts of the identity - * @throws PluginException - * if an error occured talking to the Web of Trust plugin - */ - public Set loadIdentityContexts(Identity identity) throws PluginException { - Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentity").put("TreeOwner", identity.getId()).put("Identity", identity.getId()).get(), "Identity"); - SimpleFieldSet fields = reply.getFields(); - int contextCounter = -1; - Set contexts = new HashSet(); - while (true) { - String context = fields.get("Context" + ++contextCounter); - if (context == null) { - break; - } - contexts.add(context); - } - return contexts; - } - - /** * Loads all identities that the given identities trusts with a score of * more than 0. * @@ -155,7 +136,10 @@ public class WebOfTrustConnector implements ConnectorListener { } String nickname = fields.get("Nickname" + identityCounter); String requestUri = fields.get("RequestURI" + identityCounter); - identities.add(new Identity(this, id, nickname, requestUri)); + Identity identity = new Identity(id, nickname, requestUri); + identity.setContexts(parseContexts("Contexts" + identityCounter + ".", fields)); + identity.setProperties(parseProperties("Properties" + identityCounter + ".", fields)); + identities.add(identity); } return identities; } @@ -200,7 +184,7 @@ public class WebOfTrustConnector implements ConnectorListener { * if an error occured talking to the Web of Trust plugin */ public String getProperty(Identity identity, String name) throws PluginException { - Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get(), "PropertyValue", "Error"); + Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get(), "PropertyValue"); return reply.getFields().get("Property"); } @@ -234,11 +218,67 @@ public class WebOfTrustConnector implements ConnectorListener { performRequest(SimpleFieldSetConstructor.create().put("Message", "RemoveProperty").put("Identity", ownIdentity.getId()).put("Property", name).get(), "PropertyRemoved"); } + /** + * Pings the Web of Trust plugin. If the plugin can not be reached, a + * {@link PluginException} is thrown. + * + * @throws PluginException + * if the plugin is not loaded + */ + public void ping() throws PluginException { + performRequest(SimpleFieldSetConstructor.create().put("Message", "Ping").get(), "Pong"); + } + // // PRIVATE ACTIONS // /** + * Parses the contexts from the given fields. + * + * @param prefix + * The prefix to use to access the contexts + * @param fields + * The fields to parse the contexts from + * @return The parsed contexts + */ + private Set parseContexts(String prefix, SimpleFieldSet fields) { + Set contexts = new HashSet(); + int contextCounter = -1; + while (true) { + String context = fields.get(prefix + "Context" + ++contextCounter); + if (context == null) { + break; + } + contexts.add(context); + } + return contexts; + } + + /** + * Parses the properties from the given fields. + * + * @param prefix + * The prefix to use to access the properties + * @param fields + * The fields to parse the properties from + * @return The parsed properties + */ + private Map parseProperties(String prefix, SimpleFieldSet fields) { + Map properties = new HashMap(); + int propertiesCounter = -1; + while (true) { + String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + ".Name"); + if (propertyName == null) { + break; + } + String propertyValue = fields.get(prefix + "Property" + propertiesCounter + ".Value"); + properties.put(propertyName, propertyValue); + } + return properties; + } + + /** * Sends a request containing the given fields and waits for the target * message. * @@ -274,17 +314,32 @@ public class WebOfTrustConnector implements ConnectorListener { for (String targetMessage : targetMessages) { replies.put(targetMessage, reply); } + replies.put("Error", reply); synchronized (reply) { pluginConnector.sendRequest(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, fields, data); try { - reply.wait(60000); + long now = System.currentTimeMillis(); + while ((reply.getFields() == null) && ((System.currentTimeMillis() - now) < 60000)) { + reply.wait(60000 - (System.currentTimeMillis() - now)); + } + if (reply.getFields() == null) { + for (String targetMessage : targetMessages) { + replies.remove(targetMessage); + } + replies.remove("Error"); + throw new PluginException("Timeout waiting for " + targetMessages[0] + "!"); + } } catch (InterruptedException ie1) { - logger.log(Level.WARNING, "Got interrupted while waiting for reply on GetOwnIdentities.", ie1); + logger.log(Level.WARNING, "Got interrupted while waiting for reply on " + targetMessages[0] + ".", ie1); } } for (String targetMessage : targetMessages) { replies.remove(targetMessage); } + replies.remove("Error"); + if ((reply.getFields() != null) && reply.getFields().get("Message").equals("Error")) { + throw new PluginException("Could not perform request for " + targetMessages[0]); + } return reply; } @@ -298,6 +353,7 @@ public class WebOfTrustConnector implements ConnectorListener { @Override public void receivedReply(PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) { String messageName = fields.get("Message"); + logger.log(Level.FINEST, "Received Reply from Plugin: " + messageName); Reply reply = replies.remove(messageName); if (reply == null) { logger.log(Level.FINE, "Not waiting for a “%s” message.", messageName);