import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.logging.Logger.getLogger;
+import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.NO;
+import static net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING;
+import static net.pterodactylus.sone.freenet.fcp.Command.AccessType.RESTRICTED_FCP;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.annotation.Nonnull;
import javax.inject.Singleton;
import net.pterodactylus.sone.core.Core;
/** All available FCP commands. */
private final Map<String, AbstractSoneCommand> commands;
+ private final AccessAuthorizer accessAuthorizer;
/**
* Creates a new FCP interface.
* The core
*/
@Inject
- public FcpInterface(Core core, CommandSupplier commandSupplier) {
+ public FcpInterface(Core core, CommandSupplier commandSupplier, AccessAuthorizer accessAuthorizer) {
commands = commandSupplier.supplyCommands(core);
+ this.accessAuthorizer = accessAuthorizer;
}
//
return;
}
AbstractSoneCommand command = commands.get(parameters.get("Message"));
- if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired.get() == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired.get() == FullAccessRequired.ALWAYS))) {
- sendErrorReply(pluginReplySender, null, 401, "Not authorized");
- return;
- }
if (command == null) {
sendErrorReply(pluginReplySender, null, 404, "Unrecognized Message: " + parameters.get("Message"));
return;
}
+ if (!accessAuthorizer.authorized(AccessType.values()[accessType], fullAccessRequired.get(), command.requiresWriteAccess())) {
+ sendErrorReply(pluginReplySender, null, 401, "Not authorized");
+ return;
+ }
String identifier = parameters.get("Identifier");
if ((identifier == null) || (identifier.length() == 0)) {
sendErrorReply(pluginReplySender, null, 400, "Missing Identifier.");
return;
}
try {
- Response response = command.execute(parameters, data, AccessType.values()[accessType]);
+ Response response = command.execute(parameters);
sendReply(pluginReplySender, identifier, response);
} catch (Exception e1) {
logger.log(Level.WARNING, "Could not process FCP command ā%sā.", command);
if (identifier != null) {
replyParameters.putOverwrite("Identifier", identifier);
}
- if (response.hasData()) {
- pluginReplySender.send(replyParameters, response.getData());
- } else if (response.hasBucket()) {
- pluginReplySender.send(replyParameters, response.getBucket());
- } else {
- pluginReplySender.send(replyParameters);
- }
+ pluginReplySender.send(replyParameters);
}
@Subscribe
}
+ @Singleton
+ public static class AccessAuthorizer {
+
+ public boolean authorized(@Nonnull AccessType accessType, @Nonnull FullAccessRequired fullAccessRequired, boolean commandRequiresWriteAccess) {
+ return (accessType != RESTRICTED_FCP) || (fullAccessRequired == NO) || ((fullAccessRequired == WRITING) && !commandRequiresWriteAccess);
+ }
+
+ }
+
}