From e01da0645d5ace6ec26dee802aeed2509c4fccaf Mon Sep 17 00:00:00 2001 From: Athou Date: Tue, 30 Apr 2013 22:05:38 +0200 Subject: [PATCH] prevent subscription to our own feeds --- .../backend/services/FeedSubscriptionService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java index 57ea80d5..00ba09ed 100644 --- a/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java +++ b/src/main/java/com/commafeed/backend/services/FeedSubscriptionService.java @@ -31,12 +31,21 @@ public class FeedSubscriptionService { @Inject FeedSubscriptionDAO feedSubscriptionDAO; - - @Inject FeedRefreshTaskGiver taskGiver; + + @Inject + ApplicationSettingsService applicationSettingsService; + + @Inject + FeedRefreshTaskGiver taskGiver; public Feed subscribe(User user, String url, String title, FeedCategory category) { + if (url.startsWith(applicationSettingsService.get().getPublicUrl())) { + throw new RuntimeException( + "Could not subscribe to a feed from this CommaFeed instance"); + } + Feed feed = feedService.findOrCreate(url); FeedSubscription sub = feedSubscriptionDAO.findByFeed(user, feed);