fix for channel authorization

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7803 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Jun 26, 2011 · 9ebc75d · 9ebc75d
1 parent 267290a
commit 9ebc75d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/htroot/api/feed.java b/htroot/api/feed.java
@@ -5,14 +5,13 @@
 import net.yacy.cora.document.RSSFeed;
 import net.yacy.cora.document.RSSMessage;
 import net.yacy.cora.protocol.RequestHeader;
-
 import de.anomic.search.Switchboard;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.yacy.yacyChannel;
 
 public class feed {
- 
+
     public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) {
         final Switchboard sb = (Switchboard) env;
 
@@ -32,17 +31,21 @@ public static serverObjects respond(final RequestHeader header, final serverObje
 
         int messageCount = 0;
         int messageMaxCount = Math.min(post.getInt("count", 100), 1000);
- 
-        channelIteration: for (final String channel: channels) {
+
+        channelIteration: for (final String channelName: channels) {
             // prevent that unauthorized access to this servlet get results from private data
-            if ((!authorized) && (yacyChannel.privateChannels.contains(channel))) continue channelIteration; // allow only public channels if not authorized
 
-            if ("TEST".equals(channel)) {
+            final yacyChannel channel = yacyChannel.valueOf(channelName);
+            if (channel == null) continue channelIteration;
+
+            if (!authorized && yacyChannel.privateChannels.contains(channel)) continue channelIteration; // allow only public channels if not authorized
+
+            if ("TEST".equals(channelName)) {
                 // for interface testing return at least one single result
                 prop.putXML("channel_title", "YaCy News Testchannel");
                 prop.putXML("channel_description", "");
                 prop.put("channel_pubDate", (new Date()).toString());
-                prop.putXML("item_" + messageCount + "_title", channel + ": " + "YaCy Test Entry " + (new Date()).toString());
+                prop.putXML("item_" + messageCount + "_title", channelName + ": " + "YaCy Test Entry " + (new Date()).toString());
                 prop.putXML("item_" + messageCount + "_description", "abcdefg");
                 prop.putXML("item_" + messageCount + "_link", "http://yacy.net");
                 prop.put("item_" + messageCount + "_pubDate", (new Date()).toString());
@@ -51,7 +54,7 @@ public static serverObjects respond(final RequestHeader header, final serverObje
                 messageMaxCount--;
                 continue channelIteration;
             }
-            
+
             // read the channel
             final RSSFeed feed = yacyChannel.channels(channel);
             if (feed == null || feed.isEmpty()) continue channelIteration;
@@ -67,7 +70,7 @@ public static serverObjects respond(final RequestHeader header, final serverObje
                 if (message == null) continue;
 
                 // create RSS entry
-                prop.putXML("item_" + messageCount + "_title", channel + ": " + message.getTitle());
+                prop.putXML("item_" + messageCount + "_title", channelName + ": " + message.getTitle());
                 prop.putXML("item_" + messageCount + "_description", message.getDescription());
                 prop.putXML("item_" + messageCount + "_link", message.getLink());
                 prop.put("item_" + messageCount + "_pubDate", message.getPubDate());
@@ -82,5 +85,5 @@ public static serverObjects respond(final RequestHeader header, final serverObje
         // return rewrite properties
         return prop;
     }
- 
+
 }
diff --git a/source/de/anomic/yacy/yacyChannel.java b/source/de/anomic/yacy/yacyChannel.java
@@ -57,12 +57,6 @@ public enum yacyChannel {
      * the following static channels object is used to organize a storage array for RSS feeds
      */
     private static final ConcurrentMap<yacyChannel, RSSFeed> channels = new ConcurrentHashMap<yacyChannel, RSSFeed>();
-    public static RSSFeed channels(final String channelName) {
-        for (final yacyChannel channel : yacyChannel.values()) {
-            if (channel.name().equals(channelName)) return channels(channel);
-        }
-        return null;
-    }
 
     public static RSSFeed channels(final yacyChannel channel) {
         RSSFeed feed = channels.get(channel);