X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=8dc8840e786882aac5f9a0568e128de6bbed5d97;hb=26c24524a07c96855b88340d9867c3efe6f964c4;hp=20c0b50aa80701375bf5f9bbe044477862fb8dab;hpb=732fe4fc507605a73f7162cfcd808f8db6076950;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 20c0b50..8dc8840 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java @@ -87,37 +87,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 +133,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; } @@ -188,11 +169,113 @@ public class WebOfTrustConnector implements ConnectorListener { performRequest(SimpleFieldSetConstructor.create().put("Message", "RemoveContext").put("Identity", ownIdentity.getId()).put("Context", context).get(), "ContextRemoved"); } + /** + * Returns the value of the property with the given name. + * + * @param identity + * The identity whose properties to check + * @param name + * The name of the property to return + * @return The value of the property, or {@code null} if there is no value + * @throws PluginException + * 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"); + return reply.getFields().get("Property"); + } + + /** + * Sets the property with the given name to the given value. + * + * @param ownIdentity + * The identity to set the property on + * @param name + * The name of the property to set + * @param value + * The value to set + * @throws PluginException + * if an error occured talking to the Web of Trust plugin + */ + public void setProperty(OwnIdentity ownIdentity, String name, String value) throws PluginException { + performRequest(SimpleFieldSetConstructor.create().put("Message", "SetProperty").put("Identity", ownIdentity.getId()).put("Property", name).put("Value", value).get(), "PropertyAdded"); + } + + /** + * Removes the property with the given name. + * + * @param ownIdentity + * The identity to remove the property from + * @param name + * The name of the property to remove + * @throws PluginException + * if an error occured talking to the Web of Trust plugin + */ + public void removeProperty(OwnIdentity ownIdentity, String name) throws PluginException { + 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. * @@ -228,10 +311,12 @@ 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(); + reply.wait(60000); + throw new PluginException("Timeout waiting for " + targetMessages[0] + "!"); } catch (InterruptedException ie1) { logger.log(Level.WARNING, "Got interrupted while waiting for reply on GetOwnIdentities.", ie1); } @@ -239,6 +324,10 @@ public class WebOfTrustConnector implements ConnectorListener { 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; }