Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

adding CORS access header for Network.xml to overcome cross domain

Browse Source 
restriction (e.g. necessary to build a JavaScript YaCy
client).
This commit is contained in:
apfelmaennchen 2012-09-26 10:36:09 +02:00
parent 116f429e35
commit 7efe9eb37b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htroot/Network.java
View File

@ -42,6 +42,7 @@ import net.yacy.cora.protocol.ClientIdentification;
import net.yacy.cora.protocol.Domains; import net.yacy.cora.protocol.Domains;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
import net.yacy.cora.protocol.RequestHeader; import net.yacy.cora.protocol.RequestHeader;
import net.yacy.cora.protocol.ResponseHeader;
import net.yacy.kelondro.util.MapTools; import net.yacy.kelondro.util.MapTools;
import net.yacy.peers.NewsDB; import net.yacy.peers.NewsDB;
import net.yacy.peers.NewsPool; import net.yacy.peers.NewsPool;
@ -53,6 +54,7 @@ import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants; import net.yacy.search.SwitchboardConstants;
import net.yacy.server.serverObjects; import net.yacy.server.serverObjects;
import net.yacy.server.serverSwitch; import net.yacy.server.serverSwitch;
import net.yacy.server.servletProperties;
public class Network { public class Network {
@ -62,7 +64,9 @@ public class Network {
final Switchboard sb = (Switchboard) switchboard; final Switchboard sb = (Switchboard) switchboard;
final long start = System.currentTimeMillis(); final long start = System.currentTimeMillis();
final serverObjects prop = new serverObjects(); // final serverObjects prop = new serverObjects();
final servletProperties prop = new servletProperties();
prop.put("menu", post == null ? 2 : (post.get("menu", "").equals("embed")) ? 0 : (post.get("menu","").equals("simple")) ? 1 : 2); prop.put("menu", post == null ? 2 : (post.get("menu", "").equals("embed")) ? 0 : (post.get("menu","").equals("simple")) ? 1 : 2);
if (sb.peers.mySeed() != null) prop.put("menu_newpeer_peerhash", sb.peers.mySeed().hash); if (sb.peers.mySeed() != null) prop.put("menu_newpeer_peerhash", sb.peers.mySeed().hash);
@ -86,7 +90,7 @@ public class Network {
final int disconCount = sb.peers.sizeDisconnected(); final int disconCount = sb.peers.sizeDisconnected();
int potCount = sb.peers.sizePotential(); int potCount = sb.peers.sizePotential();
// final boolean complete = ((post == null) ? false : post.get("links", "false").equals("true")); // final boolean complete = ((post == null) ? false : post.get("links", "false").equals("true"));
final long otherppm = sb.peers.countActivePPM(); final long otherppm = sb.peers.countActivePPM();
final double otherqpm = sb.peers.countActiveQPM(); final double otherqpm = sb.peers.countActiveQPM();
long myppm = 0; long myppm = 0;
@ -477,6 +481,14 @@ public class Network {
prop.putNum("table_rt", System.currentTimeMillis() - start); prop.putNum("table_rt", System.currentTimeMillis() - start);
// Adding CORS Access header for Network.xml
final String path = requestHeader.get(HeaderFramework.CONNECTION_PROP_PATH);
if(path != null && path.endsWith(".xml")) {
final ResponseHeader outgoingHeader = new ResponseHeader(200);
outgoingHeader.put(HeaderFramework.CORS_ALLOW_ORIGIN, "*");
prop.setOutgoingHeader(outgoingHeader);
}
// return rewrite properties // return rewrite properties
return prop; return prop;
} }