garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

more push callback checks

Browse Source
This commit is contained in:
Athou
2013-07-29 12:21:46 +02:00
parent f5943889ec
commit 737e24e7dc
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java
View File

@@ -17,6 +17,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.Response.Status;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -87,22 +88,36 @@ public class PubSubHubbubCallbackREST {
@POST @POST
@Consumes({ MediaType.APPLICATION_ATOM_XML, "application/rss+xml" }) @Consumes({ MediaType.APPLICATION_ATOM_XML, "application/rss+xml" })
public Response callback() { public Response callback() {
if (!applicationSettingsService.get().isPubsubhubbub()) { if (!applicationSettingsService.get().isPubsubhubbub()) {
return Response.status(Status.FORBIDDEN).entity("pubsubhubbub is disabled").build(); return Response.status(Status.FORBIDDEN).entity("pubsubhubbub is disabled").build();
} }
try { try {
byte[] bytes = IOUtils.toByteArray(request.getInputStream()); byte[] bytes = IOUtils.toByteArray(request.getInputStream());
if (ArrayUtils.isEmpty(bytes)) {
return Response.status(Status.BAD_REQUEST).entity("empty body received").build();
}
FetchedFeed fetchedFeed = parser.parse(null, bytes); FetchedFeed fetchedFeed = parser.parse(null, bytes);
String topic = fetchedFeed.getFeed().getPushTopic(); String topic = fetchedFeed.getFeed().getPushTopic();
if (StringUtils.isNotBlank(topic)) { if (StringUtils.isBlank(topic)) {
log.debug("content callback received for {}", topic); return Response.status(Status.BAD_REQUEST).entity("empty topic received").build();
List<Feed> feeds = feedDAO.findByTopic(topic);
for (Feed feed : feeds) {
log.debug("pushing content to queue for {}", feed.getUrl());
taskGiver.add(feed);
}
metricsBean.pushReceived(feeds.size());
} }
log.debug("content callback received for {}", topic);
List<Feed> feeds = feedDAO.findByTopic(topic);
if (feeds.isEmpty()) {
return Response.status(Status.BAD_REQUEST).entity("no feeds found for that topic").build();
}
for (Feed feed : feeds) {
log.debug("pushing content to queue for {}", feed.getUrl());
taskGiver.add(feed);
}
metricsBean.pushReceived(feeds.size());
} catch (Exception e) { } catch (Exception e) {
log.error("Could not parse pubsub callback: " + e.getMessage()); log.error("Could not parse pubsub callback: " + e.getMessage());
} }