boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

removed non-working realm setting in http client (auth for localhost was

Browse Source 
added in previous commit)
pull/1/head
Michael Peter Christen 11 years ago
parent 9d52b337f3
commit 2939b47986
6 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
htroot/CrawlStartScanner_p.java
Unescape View File

@ -215,7 +215,6 @@ public class CrawlStartScanner_p
WorkTables.execAPICall( WorkTables.execAPICall(
Domains.LOCALHOST, Domains.LOCALHOST,
(int) sb.getConfigLong("port", 8090), (int) sb.getConfigLong("port", 8090),
sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, ""),
path, path,
pk); pk);
} }
@ -261,7 +260,6 @@ public class CrawlStartScanner_p
WorkTables.execAPICall( WorkTables.execAPICall(
Domains.LOCALHOST, Domains.LOCALHOST,
(int) sb.getConfigLong("port", 8090), (int) sb.getConfigLong("port", 8090),
sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, ""),
path, path,
u.hash()); u.hash());
} }

2
htroot/Table_API_p.java
Unescape View File

@ -206,7 +206,7 @@ public class Table_API_p {
} }
// now call the api URLs and store the result status // now call the api URLs and store the result status
final Map<String, Integer> l = sb.tables.execAPICalls(Domains.LOCALHOST, (int) sb.getConfigLong("port", 8090), sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, ""), pks); final Map<String, Integer> l = sb.tables.execAPICalls(Domains.LOCALHOST, (int) sb.getConfigLong("port", 8090), pks);
// construct result table // construct result table
prop.put("showexec", l.isEmpty() ? 0 : 1); prop.put("showexec", l.isEmpty() ? 0 : 1);

16
source/net/yacy/cora/protocol/http/HTTPClient.java
Unescape View File

@ -49,7 +49,6 @@ import net.yacy.cora.protocol.ClientIdentification;
import net.yacy.cora.protocol.ConnectionInfo; import net.yacy.cora.protocol.ConnectionInfo;
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.search.Switchboard; import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants; import net.yacy.search.SwitchboardConstants;
@ -112,7 +111,6 @@ public class HTTPClient {
private HttpUriRequest currentRequest = null; private HttpUriRequest currentRequest = null;
private long upbytes = 0L; private long upbytes = 0L;
private String host = null; private String host = null;
private String realm = null;
public HTTPClient(final ClientIdentification.Agent agent) { public HTTPClient(final ClientIdentification.Agent agent) {
@ -304,15 +302,6 @@ public class HTTPClient {
reqConfBuilder.setRelativeRedirectsAllowed(redirecting); reqConfBuilder.setRelativeRedirectsAllowed(redirecting);
} }
/**
* This method sets the authorization realm for the request
*
* @param realm
*/
public void setRealm(final String realm) {
this.realm = realm;
}
/** /**
* This method GETs a page from the server. * This method GETs a page from the server.
* *
@ -708,10 +697,7 @@ public class HTTPClient {
httpUriRequest.setHeader(entry.getKey(),entry.getValue()); httpUriRequest.setHeader(entry.getKey(),entry.getValue());
} }
} }
if (this.host != null) if (this.host != null) httpUriRequest.setHeader(HTTP.TARGET_HOST, this.host);
httpUriRequest.setHeader(HTTP.TARGET_HOST, this.host);
if (this.realm != null)
httpUriRequest.setHeader(RequestHeader.AUTHORIZATION, "Basic " + this.realm);
httpUriRequest.setHeader("Connection", "close"); // don't keep alive, prevent CLOSE_WAIT state httpUriRequest.setHeader("Connection", "close"); // don't keep alive, prevent CLOSE_WAIT state
} }

10
source/net/yacy/data/WorkTables.java
Unescape View File

@ -218,10 +218,9 @@ public class WorkTables extends Tables {
* @param realm authentification realm * @param realm authentification realm
* @return a map of the called urls and the http status code of the api call or -1 if any other IOException occurred * @return a map of the called urls and the http status code of the api call or -1 if any other IOException occurred
*/ */
public Map<String, Integer> execAPICalls(String host, int port, String realm, Collection<String> pks) { public Map<String, Integer> execAPICalls(String host, int port, Collection<String> pks) {
// now call the api URLs and store the result status // now call the api URLs and store the result status
final HTTPClient client = new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent); final HTTPClient client = new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent);
client.setRealm(realm);
client.setTimout(120000); client.setTimout(120000);
Tables.Row row; Tables.Row row;
String url; String url;
@ -250,10 +249,9 @@ public class WorkTables extends Tables {
return l; return l;
} }
public static int execAPICall(String host, int port, String realm, String path, byte[] pk) { public static int execAPICall(String host, int port, String path, byte[] pk) {
// now call the api URLs and store the result status // now call the api URLs and store the result status
final HTTPClient client = new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent); final HTTPClient client = new HTTPClient(ClientIdentification.yacyInternetCrawlerAgent);
client.setRealm(realm);
client.setTimout(120000); client.setTimout(120000);
String url = "http://" + host + ":" + port + path; String url = "http://" + host + ":" + port + path;
if (pk != null) url += "&" + WorkTables.TABLE_API_COL_APICALL_PK + "=" + UTF8.String(pk); if (pk != null) url += "&" + WorkTables.TABLE_API_COL_APICALL_PK + "=" + UTF8.String(pk);
@ -274,10 +272,10 @@ public class WorkTables extends Tables {
* @param realm authentification realm * @param realm authentification realm
* @return the http status code of the api call or -1 if any other IOException occurred * @return the http status code of the api call or -1 if any other IOException occurred
*/ */
public int execAPICall(String pk, String host, int port, String realm) { public int execAPICall(String pk, String host, int port) {
ArrayList<String> pks = new ArrayList<String>(); ArrayList<String> pks = new ArrayList<String>();
pks.add(pk); pks.add(pk);
Map<String, Integer> m = execAPICalls(host, port, realm, pks); Map<String, Integer> m = execAPICalls(host, port, pks);
if (m.isEmpty()) return -1; if (m.isEmpty()) return -1;
return m.values().iterator().next().intValue(); return m.values().iterator().next().intValue();
} }

4
source/net/yacy/data/ymark/YMarkCrawlStart.java
Unescape View File

@ -110,8 +110,8 @@ public class YMarkCrawlStart extends HashMap<String,String>{
} }
} }
public int exec(final String host, final int port, final String realm) { public int exec(final String host, final int port) {
return this.worktables.execAPICall(this.apicall_pk, host, port, realm); return this.worktables.execAPICall(this.apicall_pk, host, port);
} }
private void load() { private void load() {

2
source/net/yacy/search/Switchboard.java
Unescape View File

@ -2457,7 +2457,7 @@ public final class Switchboard extends serverSwitch {
startupAction = false; startupAction = false;
// execute api calls // execute api calls
final Map<String, Integer> callResult = this.tables.execAPICalls("localhost", (int) getConfigLong("port", 8090), getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, ""), pks); final Map<String, Integer> callResult = this.tables.execAPICalls("localhost", (int) getConfigLong("port", 8090), pks);
for ( final Map.Entry<String, Integer> call : callResult.entrySet() ) { for ( final Map.Entry<String, Integer> call : callResult.entrySet() ) {
this.log.info("Scheduler executed api call, response " + call.getValue() + ": " + call.getKey()); this.log.info("Scheduler executed api call, response " + call.getValue() + ": " + call.getKey());
} }

Write Preview
Loading…
Cancel
Save