commit e09b1777816933338ea6512c6659059b2ddbe4a7
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Wed Sep 25 23:12:40 2013 +0200
Split up the resouce servlet.
The resource servlet is now only responsible for handling web requests,
and all the hard work of filtering results and putting together responses
from previously stored JSON files is done by the new response builder.
This will make it easier in the future to switch to a database.
---
src/org/torproject/onionoo/ResourceServlet.java | 769 +----------------
src/org/torproject/onionoo/ResponseBuilder.java | 869 ++++++++++++++++++++
.../torproject/onionoo/ResourceServletTest.java | 7 +-
3 files changed, 903 insertions(+), 742 deletions(-)
diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java
index 99b4f25..0bdb928 100644
--- a/src/org/torproject/onionoo/ResourceServlet.java
+++ b/src/org/torproject/onionoo/ResourceServlet.java
@@ -5,20 +5,11 @@ package org.torproject.onionoo;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Scanner;
import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TimeZone;
-import java.util.TreeMap;
import java.util.regex.Pattern;
import javax.servlet.ServletConfig;
@@ -33,277 +24,32 @@ public class ResourceServlet extends HttpServlet {
private boolean maintenanceMode = false;
- private DocumentStore documentStore;
-
- private boolean checkSummaryStale = false;
-
public void init(ServletConfig config) throws ServletException {
super.init(config);
boolean maintenanceMode =
config.getInitParameter("maintenance") != null
&& config.getInitParameter("maintenance").equals("1");
File outDir = new File(config.getInitParameter("outDir"));
- this.checkSummaryStale = true;
- this.init(maintenanceMode, outDir);
+ this.init(maintenanceMode, outDir, true);
}
- protected void init(boolean maintenanceMode, File outDir) {
+ protected void init(boolean maintenanceMode, File outDir,
+ boolean checkSummaryStale) {
this.maintenanceMode = maintenanceMode;
- this.documentStore = new DocumentStore(outDir);
if (!maintenanceMode) {
- this.readSummaryFile();
- }
- }
-
- long summaryFileLastModified = -1L;
- boolean readSummaryFile = false;
- private String relaysPublishedString, bridgesPublishedString;
- private List<String> relaysByConsensusWeight = null;
- private Map<String, String> relayFingerprintSummaryLines = null,
- bridgeFingerprintSummaryLines = null;
- private Map<String, Set<String>> relaysByCountryCode = null,
- relaysByASNumber = null, relaysByFlag = null,
- relaysByContact = null;
- private SortedMap<Integer, Set<String>> relaysByFirstSeenDays = null,
- bridgesByFirstSeenDays = null, relaysByLastSeenDays = null,
- bridgesByLastSeenDays = null;
- private static final long SUMMARY_MAX_AGE = 6L * 60L * 60L * 1000L;
- private void readSummaryFile() {
- long summaryFileLastModified = -1L;
- UpdateStatus updateStatus = this.documentStore.retrieve(
- UpdateStatus.class, false);
- if (updateStatus != null && updateStatus.documentString != null) {
- String updateString = updateStatus.documentString;
- try {
- summaryFileLastModified = Long.parseLong(updateString.trim());
- } catch (NumberFormatException e) {
- /* Handle below. */
- }
- }
- if (summaryFileLastModified < 0L) {
- // TODO Does this actually solve anything? Should we instead
- // switch to a variant of the maintenance mode and re-check when
- // the next requests comes in that happens x seconds after this one?
- this.readSummaryFile = false;
- return;
- }
- if (this.checkSummaryStale &&
- summaryFileLastModified + SUMMARY_MAX_AGE
- < System.currentTimeMillis()) {
- // TODO Does this actually solve anything? Should we instead
- // switch to a variant of the maintenance mode and re-check when
- // the next requests comes in that happens x seconds after this one?
- this.readSummaryFile = false;
- return;
- }
- if (summaryFileLastModified > this.summaryFileLastModified) {
- List<String> relaysByConsensusWeight = new ArrayList<String>();
- Map<String, String>
- relayFingerprintSummaryLines = new HashMap<String, String>(),
- bridgeFingerprintSummaryLines = new HashMap<String, String>();
- Map<String, Set<String>>
- relaysByCountryCode = new HashMap<String, Set<String>>(),
- relaysByASNumber = new HashMap<String, Set<String>>(),
- relaysByFlag = new HashMap<String, Set<String>>(),
- relaysByContact = new HashMap<String, Set<String>>();
- SortedMap<Integer, Set<String>>
- relaysByFirstSeenDays = new TreeMap<Integer, Set<String>>(),
- bridgesByFirstSeenDays = new TreeMap<Integer, Set<String>>(),
- relaysByLastSeenDays = new TreeMap<Integer, Set<String>>(),
- bridgesByLastSeenDays = new TreeMap<Integer, Set<String>>();
- long relaysLastValidAfterMillis = -1L,
- bridgesLastPublishedMillis = -1L;
- Set<NodeStatus> currentRelays = new HashSet<NodeStatus>(),
- currentBridges = new HashSet<NodeStatus>();
- SortedSet<String> fingerprints = this.documentStore.list(
- NodeStatus.class, false);
- // TODO We should be able to learn if something goes wrong when
- // reading the summary file, rather than silently having an empty
- // list of fingerprints.
- for (String fingerprint : fingerprints) {
- NodeStatus node = this.documentStore.retrieve(NodeStatus.class,
- true, fingerprint);
- if (node.isRelay()) {
- relaysLastValidAfterMillis = Math.max(
- relaysLastValidAfterMillis, node.getLastSeenMillis());
- currentRelays.add(node);
- } else {
- bridgesLastPublishedMillis = Math.max(
- bridgesLastPublishedMillis, node.getLastSeenMillis());
- currentBridges.add(node);
- }
- }
- SimpleDateFormat dateTimeFormat = new SimpleDateFormat(
- "yyyy-MM-dd HH:mm:ss");
- dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
- this.relaysPublishedString = dateTimeFormat.format(
- relaysLastValidAfterMillis);
- this.bridgesPublishedString = dateTimeFormat.format(
- bridgesLastPublishedMillis);
- List<String> orderRelaysByConsensusWeight = new ArrayList<String>();
- for (NodeStatus entry : currentRelays) {
- String fingerprint = entry.getFingerprint().toUpperCase();
- String hashedFingerprint = entry.getHashedFingerprint().
- toUpperCase();
- entry.setRunning(entry.getLastSeenMillis() ==
- relaysLastValidAfterMillis);
- String line = this.formatRelaySummaryLine(entry);
- relayFingerprintSummaryLines.put(fingerprint, line);
- relayFingerprintSummaryLines.put(hashedFingerprint, line);
- long consensusWeight = entry.getConsensusWeight();
- orderRelaysByConsensusWeight.add(String.format("%020d %s",
- consensusWeight, fingerprint));
- orderRelaysByConsensusWeight.add(String.format("%020d %s",
- consensusWeight, hashedFingerprint));
- if (entry.getCountryCode() != null) {
- String countryCode = entry.getCountryCode();
- if (!relaysByCountryCode.containsKey(countryCode)) {
- relaysByCountryCode.put(countryCode, new HashSet<String>());
- }
- relaysByCountryCode.get(countryCode).add(fingerprint);
- relaysByCountryCode.get(countryCode).add(hashedFingerprint);
- }
- if (entry.getASNumber() != null) {
- String aSNumber = entry.getASNumber();
- if (!relaysByASNumber.containsKey(aSNumber)) {
- relaysByASNumber.put(aSNumber, new HashSet<String>());
- }
- relaysByASNumber.get(aSNumber).add(fingerprint);
- relaysByASNumber.get(aSNumber).add(hashedFingerprint);
- }
- for (String flag : entry.getRelayFlags()) {
- String flagLowerCase = flag.toLowerCase();
- if (!relaysByFlag.containsKey(flagLowerCase)) {
- relaysByFlag.put(flagLowerCase, new HashSet<String>());
- }
- relaysByFlag.get(flagLowerCase).add(fingerprint);
- relaysByFlag.get(flagLowerCase).add(hashedFingerprint);
- }
- int daysSinceFirstSeen = (int) ((summaryFileLastModified
- - entry.getFirstSeenMillis()) / 86400000L);
- if (!relaysByFirstSeenDays.containsKey(daysSinceFirstSeen)) {
- relaysByFirstSeenDays.put(daysSinceFirstSeen,
- new HashSet<String>());
- }
- relaysByFirstSeenDays.get(daysSinceFirstSeen).add(fingerprint);
- relaysByFirstSeenDays.get(daysSinceFirstSeen).add(
- hashedFingerprint);
- int daysSinceLastSeen = (int) ((summaryFileLastModified
- - entry.getLastSeenMillis()) / 86400000L);
- if (!relaysByLastSeenDays.containsKey(daysSinceLastSeen)) {
- relaysByLastSeenDays.put(daysSinceLastSeen,
- new HashSet<String>());
- }
- relaysByLastSeenDays.get(daysSinceLastSeen).add(fingerprint);
- relaysByLastSeenDays.get(daysSinceLastSeen).add(
- hashedFingerprint);
- String contact = entry.getContact();
- if (!relaysByContact.containsKey(contact)) {
- relaysByContact.put(contact, new HashSet<String>());
- }
- relaysByContact.get(contact).add(fingerprint);
- relaysByContact.get(contact).add(hashedFingerprint);
- }
- Collections.sort(orderRelaysByConsensusWeight);
- relaysByConsensusWeight = new ArrayList<String>();
- for (String relay : orderRelaysByConsensusWeight) {
- relaysByConsensusWeight.add(relay.split(" ")[1]);
- }
- for (NodeStatus entry : currentBridges) {
- String hashedFingerprint = entry.getFingerprint().toUpperCase();
- String hashedHashedFingerprint = entry.getHashedFingerprint().
- toUpperCase();
- entry.setRunning(entry.getRelayFlags().contains("Running") &&
- entry.getLastSeenMillis() == bridgesLastPublishedMillis);
- String line = this.formatBridgeSummaryLine(entry);
- bridgeFingerprintSummaryLines.put(hashedFingerprint, line);
- bridgeFingerprintSummaryLines.put(hashedHashedFingerprint, line);
- int daysSinceFirstSeen = (int) ((summaryFileLastModified
- - entry.getFirstSeenMillis()) / 86400000L);
- if (!bridgesByFirstSeenDays.containsKey(daysSinceFirstSeen)) {
- bridgesByFirstSeenDays.put(daysSinceFirstSeen,
- new HashSet<String>());
- }
- bridgesByFirstSeenDays.get(daysSinceFirstSeen).add(
- hashedFingerprint);
- bridgesByFirstSeenDays.get(daysSinceFirstSeen).add(
- hashedHashedFingerprint);
- int daysSinceLastSeen = (int) ((summaryFileLastModified
- - entry.getLastSeenMillis()) / 86400000L);
- if (!bridgesByLastSeenDays.containsKey(daysSinceLastSeen)) {
- bridgesByLastSeenDays.put(daysSinceLastSeen,
- new HashSet<String>());
- }
- bridgesByLastSeenDays.get(daysSinceLastSeen).add(
- hashedFingerprint);
- bridgesByLastSeenDays.get(daysSinceLastSeen).add(
- hashedHashedFingerprint);
- }
- this.relaysByConsensusWeight = relaysByConsensusWeight;
- this.relayFingerprintSummaryLines = relayFingerprintSummaryLines;
- this.bridgeFingerprintSummaryLines = bridgeFingerprintSummaryLines;
- this.relaysByCountryCode = relaysByCountryCode;
- this.relaysByASNumber = relaysByASNumber;
- this.relaysByFlag = relaysByFlag;
- this.relaysByContact = relaysByContact;
- this.relaysByFirstSeenDays = relaysByFirstSeenDays;
- this.relaysByLastSeenDays = relaysByLastSeenDays;
- this.bridgesByFirstSeenDays = bridgesByFirstSeenDays;
- this.bridgesByLastSeenDays = bridgesByLastSeenDays;
+ ResponseBuilder.initialize(new DocumentStore(outDir),
+ checkSummaryStale);
}
- this.summaryFileLastModified = summaryFileLastModified;
- this.readSummaryFile = true;
- }
-
- private String formatRelaySummaryLine(NodeStatus entry) {
- String nickname = !entry.getNickname().equals("Unnamed") ?
- entry.getNickname() : null;
- String fingerprint = entry.getFingerprint();
- String running = entry.getRunning() ? "true" : "false";
- List<String> addresses = new ArrayList<String>();
- addresses.add(entry.getAddress());
- for (String orAddress : entry.getOrAddresses()) {
- addresses.add(orAddress);
- }
- for (String exitAddress : entry.getExitAddresses()) {
- if (!addresses.contains(exitAddress)) {
- addresses.add(exitAddress);
- }
- }
- StringBuilder addressesBuilder = new StringBuilder();
- int written = 0;
- for (String address : addresses) {
- addressesBuilder.append((written++ > 0 ? "," : "") + "\""
- + address.toLowerCase() + "\"");
- }
- return String.format("{%s\"f\":\"%s\",\"a\":[%s],\"r\":%s}",
- (nickname == null ? "" : "\"n\":\"" + nickname + "\","),
- fingerprint, addressesBuilder.toString(), running);
- }
-
- private String formatBridgeSummaryLine(NodeStatus entry) {
- String nickname = !entry.getNickname().equals("Unnamed") ?
- entry.getNickname() : null;
- String hashedFingerprint = entry.getFingerprint();
- String running = entry.getRunning() ? "true" : "false";
- return String.format("{%s\"h\":\"%s\",\"r\":%s}",
- (nickname == null ? "" : "\"n\":\"" + nickname + "\","),
- hashedFingerprint, running);
}
public long getLastModified(HttpServletRequest request) {
if (this.maintenanceMode) {
return super.getLastModified(request);
} else {
- return this.getLastModified();
+ return ResponseBuilder.getLastModified();
}
}
- private long getLastModified() {
- this.readSummaryFile();
- return this.summaryFileLastModified;
- }
-
protected static class HttpServletRequestWrapper {
private HttpServletRequest request;
protected HttpServletRequestWrapper(HttpServletRequest request) {
@@ -359,12 +105,12 @@ public class ResourceServlet extends HttpServlet {
return;
}
- this.readSummaryFile();
- if (!this.readSummaryFile) {
+ if (!ResponseBuilder.update()) {
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
}
+ ResponseBuilder rb = new ResponseBuilder();
String uri = request.getRequestURI();
if (uri.startsWith("/onionoo/")) {
uri = uri.substring("/onionoo".length());
@@ -382,6 +128,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
+ rb.setResourceType(resourceType);
/* Extract parameters either from the old-style URI or from request
* parameters. */
@@ -406,10 +153,6 @@ public class ResourceServlet extends HttpServlet {
}
/* Filter relays and bridges matching the request. */
- Map<String, String> filteredRelays = new HashMap<String, String>(
- this.relayFingerprintSummaryLines);
- Map<String, String> filteredBridges = new HashMap<String, String>(
- this.bridgeFingerprintSummaryLines);
if (parameterMap.containsKey("type")) {
String typeParameterValue = parameterMap.get("type").toLowerCase();
boolean relaysRequested = true;
@@ -419,7 +162,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterByType(filteredRelays, filteredBridges, relaysRequested);
+ rb.setType(relaysRequested ? "relay" : "bridge");
}
if (parameterMap.containsKey("running")) {
String runningParameterValue =
@@ -431,8 +174,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterByRunning(filteredRelays, filteredBridges,
- runningRequested);
+ rb.setRunning(runningRequested ? "true" : "false");
}
if (parameterMap.containsKey("search")) {
String[] searchTerms = this.parseSearchParameters(
@@ -441,8 +183,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterBySearchTerms(filteredRelays, filteredBridges,
- searchTerms);
+ rb.setSearch(searchTerms);
}
if (parameterMap.containsKey("lookup")) {
String fingerprintParameter = this.parseFingerprintParameter(
@@ -452,8 +193,7 @@ public class ResourceServlet extends HttpServlet {
return;
}
String fingerprint = fingerprintParameter.toUpperCase();
- this.filterByFingerprint(filteredRelays, filteredBridges,
- fingerprint);
+ rb.setLookup(fingerprint);
}
if (parameterMap.containsKey("country")) {
String countryCodeParameter = this.parseCountryCodeParameter(
@@ -462,8 +202,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterByCountryCode(filteredRelays, filteredBridges,
- countryCodeParameter);
+ rb.setCountry(countryCodeParameter);
}
if (parameterMap.containsKey("as")) {
String aSNumberParameter = this.parseASNumberParameter(
@@ -472,8 +211,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterByASNumber(filteredRelays, filteredBridges,
- aSNumberParameter);
+ rb.setAs(aSNumberParameter);
}
if (parameterMap.containsKey("flag")) {
String flagParameter = this.parseFlagParameter(
@@ -482,7 +220,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterByFlag(filteredRelays, filteredBridges, flagParameter);
+ rb.setFlag(flagParameter);
}
if (parameterMap.containsKey("first_seen_days")) {
int[] days = this.parseDaysParameter(
@@ -491,10 +229,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterNodesByDays(filteredRelays, this.relaysByFirstSeenDays,
- days);
- this.filterNodesByDays(filteredBridges, this.bridgesByFirstSeenDays,
- days);
+ rb.setFirstSeenDays(days);
}
if (parameterMap.containsKey("last_seen_days")) {
int[] days = this.parseDaysParameter(
@@ -503,10 +238,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterNodesByDays(filteredRelays, this.relaysByLastSeenDays,
- days);
- this.filterNodesByDays(filteredBridges, this.bridgesByLastSeenDays,
- days);
+ rb.setLastSeenDays(days);
}
if (parameterMap.containsKey("contact")) {
String[] contactParts = this.parseContactParameter(
@@ -515,49 +247,21 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- this.filterByContact(filteredRelays, filteredBridges, contactParts);
+ rb.setContact(contactParts);
}
/* Re-order and limit results. */
- List<String> orderedRelays = new ArrayList<String>();
- List<String> orderedBridges = new ArrayList<String>();
if (parameterMap.containsKey("order")) {
String orderParameter = parameterMap.get("order").toLowerCase();
- boolean descending = false;
- if (orderParameter.startsWith("-")) {
- descending = true;
- orderParameter = orderParameter.substring(1);
+ String orderByField = orderParameter;
+ if (orderByField.startsWith("-")) {
+ orderByField = orderByField.substring(1);
}
- if (!orderParameter.equals("consensus_weight")) {
+ if (!orderByField.equals("consensus_weight")) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- List<String> orderBy = new ArrayList<String>(
- this.relaysByConsensusWeight);
- if (descending) {
- Collections.reverse(orderBy);
- }
- for (String relay : orderBy) {
- if (filteredRelays.containsKey(relay) &&
- !orderedRelays.contains(filteredRelays.get(relay))) {
- orderedRelays.add(filteredRelays.remove(relay));
- }
- }
- for (String relay : filteredRelays.keySet()) {
- if (!orderedRelays.contains(filteredRelays.get(relay))) {
- orderedRelays.add(filteredRelays.remove(relay));
- }
- }
- Set<String> uniqueBridges = new HashSet<String>(
- filteredBridges.values());
- orderedBridges.addAll(uniqueBridges);
- } else {
- Set<String> uniqueRelays = new HashSet<String>(
- filteredRelays.values());
- orderedRelays.addAll(uniqueRelays);
- Set<String> uniqueBridges = new HashSet<String>(
- filteredBridges.values());
- orderedBridges.addAll(uniqueBridges);
+ rb.setOrder(new String[] { orderParameter });
}
if (parameterMap.containsKey("offset")) {
String offsetParameter = parameterMap.get("offset");
@@ -565,21 +269,13 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- int offset = 0;
try {
- offset = Integer.parseInt(offsetParameter);
+ Integer.parseInt(offsetParameter);
} catch (NumberFormatException e) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- while (offset-- > 0 &&
- (!orderedRelays.isEmpty() || !orderedBridges.isEmpty())) {
- if (!orderedRelays.isEmpty()) {
- orderedRelays.remove(0);
- } else {
- orderedBridges.remove(0);
- }
- }
+ rb.setOffset(offsetParameter);
}
if (parameterMap.containsKey("limit")) {
String limitParameter = parameterMap.get("limit");
@@ -587,20 +283,13 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- int limit = -1;
try {
- limit = Integer.parseInt(limitParameter);
+ Integer.parseInt(limitParameter);
} catch (NumberFormatException e) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
- while (!orderedRelays.isEmpty() && limit < orderedRelays.size()) {
- orderedRelays.remove(orderedRelays.size() - 1);
- }
- limit -= orderedRelays.size();
- while (!orderedBridges.isEmpty() && limit < orderedBridges.size()) {
- orderedBridges.remove(orderedBridges.size() - 1);
- }
+ rb.setLimit(limitParameter);
}
/* Possibly include only a subset of fields in the response
@@ -612,6 +301,7 @@ public class ResourceServlet extends HttpServlet {
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
return;
}
+ rb.setFields(fields);
}
/* Set response headers and write the response. */
@@ -619,8 +309,7 @@ public class ResourceServlet extends HttpServlet {
response.setContentType("application/json");
response.setCharacterEncoding("utf-8");
PrintWriter pw = response.getWriter();
- this.writeRelays(orderedRelays, pw, resourceType, fields);
- this.writeBridges(orderedBridges, pw, resourceType, fields);
+ rb.buildResponse(pw);
pw.flush();
pw.close();
}
@@ -727,403 +416,5 @@ public class ResourceServlet extends HttpServlet {
}
return parameter.split(",");
}
-
- private void filterByType(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, boolean relaysRequested) {
- if (relaysRequested) {
- filteredBridges.clear();
- } else {
- filteredRelays.clear();
- }
- }
-
- private void filterByRunning(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, boolean runningRequested) {
- Set<String> removeRelays = new HashSet<String>();
- for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
- if (e.getValue().contains("\"r\":true") != runningRequested) {
- removeRelays.add(e.getKey());
- }
- }
- for (String fingerprint : removeRelays) {
- filteredRelays.remove(fingerprint);
- }
- Set<String> removeBridges = new HashSet<String>();
- for (Map.Entry<String, String> e : filteredBridges.entrySet()) {
- if (e.getValue().contains("\"r\":true") != runningRequested) {
- removeBridges.add(e.getKey());
- }
- }
- for (String fingerprint : removeBridges) {
- filteredBridges.remove(fingerprint);
- }
- }
-
- private void filterBySearchTerms(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, String[] searchTerms) {
- for (String searchTerm : searchTerms) {
- filterBySearchTerm(filteredRelays, filteredBridges, searchTerm);
- }
- }
-
- private void filterBySearchTerm(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, String searchTerm) {
- Set<String> removeRelays = new HashSet<String>();
- for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
- String fingerprint = e.getKey();
- String line = e.getValue();
- boolean lineMatches = false;
- String nickname = "unnamed";
- if (line.contains("\"n\":\"")) {
- nickname = line.substring(line.indexOf("\"n\":\"") + 5).
- split("\"")[0].toLowerCase();
- }
- if (searchTerm.startsWith("$")) {
- /* Search is for $-prefixed fingerprint. */
- if (fingerprint.startsWith(
- searchTerm.substring(1).toUpperCase())) {
- /* $-prefixed fingerprint matches. */
- lineMatches = true;
- }
- } else if (nickname.contains(searchTerm.toLowerCase())) {
- /* Nickname matches. */
- lineMatches = true;
- } else if (fingerprint.startsWith(searchTerm.toUpperCase())) {
- /* Non-$-prefixed fingerprint matches. */
- lineMatches = true;
- } else if (line.substring(line.indexOf("\"a\":[")).contains("\""
- + searchTerm.toLowerCase())) {
- /* Address matches. */
- lineMatches = true;
- }
- if (!lineMatches) {
- removeRelays.add(e.getKey());
- }
- }
- for (String fingerprint : removeRelays) {
- filteredRelays.remove(fingerprint);
- }
- Set<String> removeBridges = new HashSet<String>();
- for (Map.Entry<String, String> e : filteredBridges.entrySet()) {
- String hashedFingerprint = e.getKey();
- String line = e.getValue();
- boolean lineMatches = false;
- String nickname = "unnamed";
- if (line.contains("\"n\":\"")) {
- nickname = line.substring(line.indexOf("\"n\":\"") + 5).
- split("\"")[0].toLowerCase();
- }
- if (searchTerm.startsWith("$")) {
- /* Search is for $-prefixed hashed fingerprint. */
- if (hashedFingerprint.startsWith(
- searchTerm.substring(1).toUpperCase())) {
- /* $-prefixed hashed fingerprint matches. */
- lineMatches = true;
- }
- } else if (nickname.contains(searchTerm.toLowerCase())) {
- /* Nickname matches. */
- lineMatches = true;
- } else if (hashedFingerprint.startsWith(searchTerm.toUpperCase())) {
- /* Non-$-prefixed hashed fingerprint matches. */
- lineMatches = true;
- }
- if (!lineMatches) {
- removeBridges.add(e.getKey());
- }
- }
- for (String fingerprint : removeBridges) {
- filteredBridges.remove(fingerprint);
- }
- }
-
- private void filterByFingerprint(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, String fingerprint) {
- String relayLine = filteredRelays.get(fingerprint);
- filteredRelays.clear();
- if (relayLine != null) {
- filteredRelays.put(fingerprint, relayLine);
- }
- String bridgeLine = filteredBridges.get(fingerprint);
- filteredBridges.clear();
- if (bridgeLine != null) {
- filteredBridges.put(fingerprint, bridgeLine);
- }
- }
-
- private void filterByCountryCode(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, String countryCodeParameter) {
- String countryCode = countryCodeParameter.toLowerCase();
- if (!this.relaysByCountryCode.containsKey(countryCode)) {
- filteredRelays.clear();
- } else {
- Set<String> relaysWithCountryCode =
- this.relaysByCountryCode.get(countryCode);
- Set<String> removeRelays = new HashSet<String>();
- for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
- String fingerprint = e.getKey();
- if (!relaysWithCountryCode.contains(fingerprint)) {
- removeRelays.add(fingerprint);
- }
- }
- for (String fingerprint : removeRelays) {
- filteredRelays.remove(fingerprint);
- }
- }
- filteredBridges.clear();
- }
-
- private void filterByASNumber(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, String aSNumberParameter) {
- String aSNumber = aSNumberParameter.toUpperCase();
- if (!aSNumber.startsWith("AS")) {
- aSNumber = "AS" + aSNumber;
- }
- if (!this.relaysByASNumber.containsKey(aSNumber)) {
- filteredRelays.clear();
- } else {
- Set<String> relaysWithASNumber =
- this.relaysByASNumber.get(aSNumber);
- Set<String> removeRelays = new HashSet<String>();
- for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
- String fingerprint = e.getKey();
- if (!relaysWithASNumber.contains(fingerprint)) {
- removeRelays.add(fingerprint);
- }
- }
- for (String fingerprint : removeRelays) {
- filteredRelays.remove(fingerprint);
- }
- }
- filteredBridges.clear();
- }
-
- private void filterByFlag(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, String flagParameter) {
- String flag = flagParameter.toLowerCase();
- if (!this.relaysByFlag.containsKey(flag)) {
- filteredRelays.clear();
- } else {
- Set<String> relaysWithFlag = this.relaysByFlag.get(flag);
- Set<String> removeRelays = new HashSet<String>();
- for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
- String fingerprint = e.getKey();
- if (!relaysWithFlag.contains(fingerprint)) {
- removeRelays.add(fingerprint);
- }
- }
- for (String fingerprint : removeRelays) {
- filteredRelays.remove(fingerprint);
- }
- }
- filteredBridges.clear();
- }
-
- private void filterNodesByDays(Map<String, String> filteredNodes,
- SortedMap<Integer, Set<String>> nodesByDays, int[] days) {
- Set<String> removeNodes = new HashSet<String>();
- for (Set<String> nodes : nodesByDays.headMap(days[0]).values()) {
- removeNodes.addAll(nodes);
- }
- if (days[1] < Integer.MAX_VALUE) {
- for (Set<String> nodes :
- nodesByDays.tailMap(days[1] + 1).values()) {
- removeNodes.addAll(nodes);
- }
- }
- for (String fingerprint : removeNodes) {
- filteredNodes.remove(fingerprint);
- }
- }
-
- private void filterByContact(Map<String, String> filteredRelays,
- Map<String, String> filteredBridges, String[] contactParts) {
- Set<String> removeRelays = new HashSet<String>();
- for (Map.Entry<String, Set<String>> e :
- this.relaysByContact.entrySet()) {
- String contact = e.getKey();
- for (String contactPart : contactParts) {
- if (contact == null ||
- !contact.contains(contactPart.toLowerCase())) {
- removeRelays.addAll(e.getValue());
- break;
- }
- }
- }
- for (String fingerprint : removeRelays) {
- filteredRelays.remove(fingerprint);
- }
- filteredBridges.clear();
- }
-
- private void writeRelays(List<String> relays, PrintWriter pw,
- String resourceType, String[] fields) {
- pw.write("{\"relays_published\":\"" + this.relaysPublishedString
- + "\",\n\"relays\":[");
- int written = 0;
- for (String line : relays) {
- if (line == null) {
- /* TODO This is a workaround for a bug; line shouldn't be null. */
- continue;
- }
- String lines = this.getFromSummaryLine(line, resourceType, fields);
- if (lines.length() > 0) {
- pw.print((written++ > 0 ? ",\n" : "\n") + lines);
- }
- }
- pw.print("\n],\n");
- }
-
- private void writeBridges(List<String> bridges, PrintWriter pw,
- String resourceType, String[] fields) {
- pw.write("\"bridges_published\":\"" + this.bridgesPublishedString
- + "\",\n\"bridges\":[");
- int written = 0;
- for (String line : bridges) {
- if (line == null) {
- /* TODO This is a workaround for a bug; line shouldn't be null. */
- continue;
- }
- String lines = this.getFromSummaryLine(line, resourceType, fields);
- if (lines.length() > 0) {
- pw.print((written++ > 0 ? ",\n" : "\n") + lines);
- }
- }
- pw.print("\n]}\n");
- }
-
- private String getFromSummaryLine(String summaryLine,
- String resourceType, String[] fields) {
- if (resourceType.equals("summary")) {
- return this.writeSummaryLine(summaryLine);
- } else if (resourceType.equals("details")) {
- return this.writeDetailsLines(summaryLine, fields);
- } else if (resourceType.equals("bandwidth")) {
- return this.writeBandwidthLines(summaryLine);
- } else if (resourceType.equals("weights")) {
- return this.writeWeightsLines(summaryLine);
- } else {
- return "";
- }
- }
-
- private String writeSummaryLine(String summaryLine) {
- return (summaryLine.endsWith(",") ? summaryLine.substring(0,
- summaryLine.length() - 1) : summaryLine);
- }
-
- private String writeDetailsLines(String summaryLine, String[] fields) {
- String fingerprint = null;
- if (summaryLine.contains("\"f\":\"")) {
- fingerprint = summaryLine.substring(summaryLine.indexOf(
- "\"f\":\"") + "\"f\":\"".length());
- } else if (summaryLine.contains("\"h\":\"")) {
- fingerprint = summaryLine.substring(summaryLine.indexOf(
- "\"h\":\"") + "\"h\":\"".length());
- } else {
- return "";
- }
- fingerprint = fingerprint.substring(0, 40);
- DetailsDocument detailsDocument = this.documentStore.retrieve(
- DetailsDocument.class, false, fingerprint);
- if (detailsDocument != null &&
- detailsDocument.documentString != null) {
- StringBuilder sb = new StringBuilder();
- Scanner s = new Scanner(detailsDocument.documentString);
- sb.append("{");
- if (s.hasNextLine()) {
- /* Skip version line. */
- s.nextLine();
- }
- boolean includeLine = true;
- while (s.hasNextLine()) {
- String line = s.nextLine();
- if (line.equals("}")) {
- sb.append("}\n");
- break;
- } else if (line.startsWith("\"desc_published\":")) {
- continue;
- } else if (fields != null) {
- if (line.startsWith("\"")) {
- includeLine = false;
- for (String field : fields) {
- if (line.startsWith("\"" + field + "\":")) {
- sb.append(line + "\n");
- includeLine = true;
- }
- }
- } else if (includeLine) {
- sb.append(line + "\n");
- }
- } else {
- sb.append(line + "\n");
- }
- }
- s.close();
- String detailsLines = sb.toString();
- if (detailsLines.length() > 1) {
- detailsLines = detailsLines.substring(0,
- detailsLines.length() - 1);
- }
- if (detailsLines.endsWith(",\n}")) {
- detailsLines = detailsLines.substring(0,
- detailsLines.length() - 3) + "\n}";
- }
- return detailsLines;
- } else {
- // TODO We should probably log that we didn't find a details
- // document that we expected to exist.
- return "";
- }
- }
-
- private String writeBandwidthLines(String summaryLine) {
- String fingerprint = null;
- if (summaryLine.contains("\"f\":\"")) {
- fingerprint = summaryLine.substring(summaryLine.indexOf(
- "\"f\":\"") + "\"f\":\"".length());
- } else if (summaryLine.contains("\"h\":\"")) {
- fingerprint = summaryLine.substring(summaryLine.indexOf(
- "\"h\":\"") + "\"h\":\"".length());
- } else {
- return "";
- }
- fingerprint = fingerprint.substring(0, 40);
- BandwidthDocument bandwidthDocument = this.documentStore.retrieve(
- BandwidthDocument.class, false, fingerprint);
- if (bandwidthDocument != null &&
- bandwidthDocument.documentString != null) {
- String bandwidthLines = bandwidthDocument.documentString;
- bandwidthLines = bandwidthLines.substring(0,
- bandwidthLines.length() - 1);
- return bandwidthLines;
- } else {
- // TODO We should probably log that we didn't find a bandwidth
- // document that we expected to exist.
- return "";
- }
- }
-
- private String writeWeightsLines(String summaryLine) {
- String fingerprint = null;
- if (summaryLine.contains("\"f\":\"")) {
- fingerprint = summaryLine.substring(summaryLine.indexOf(
- "\"f\":\"") + "\"f\":\"".length());
- } else {
- return "";
- }
- fingerprint = fingerprint.substring(0, 40);
- WeightsDocument weightsDocument = this.documentStore.retrieve(
- WeightsDocument.class, false, fingerprint);
- if (weightsDocument != null &&
- weightsDocument.documentString != null) {
- String weightsLines = weightsDocument.documentString;
- weightsLines = weightsLines.substring(0, weightsLines.length() - 1);
- return weightsLines;
- } else {
- // TODO We should probably log that we didn't find a weights
- // document that we expected to exist.
- return "";
- }
- }
}
diff --git a/src/org/torproject/onionoo/ResponseBuilder.java b/src/org/torproject/onionoo/ResponseBuilder.java
new file mode 100644
index 0000000..3c1898b
--- /dev/null
+++ b/src/org/torproject/onionoo/ResponseBuilder.java
@@ -0,0 +1,869 @@
+/* Copyright 2011--2013 The Tor Project
+ * See LICENSE for licensing information */
+package org.torproject.onionoo;
+
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TimeZone;
+import java.util.TreeMap;
+
+public class ResponseBuilder {
+
+ private static long summaryFileLastModified = -1L;
+ private static DocumentStore documentStore;
+ private static boolean checkSummaryStale = false;
+ private static boolean successfullyReadSummaryFile = false;
+ private static String relaysPublishedString, bridgesPublishedString;
+ private static List<String> relaysByConsensusWeight = null;
+ private static Map<String, String> relayFingerprintSummaryLines = null,
+ bridgeFingerprintSummaryLines = null;
+ private static Map<String, Set<String>> relaysByCountryCode = null,
+ relaysByASNumber = null, relaysByFlag = null,
+ relaysByContact = null;
+ private static SortedMap<Integer, Set<String>>
+ relaysByFirstSeenDays = null, bridgesByFirstSeenDays = null,
+ relaysByLastSeenDays = null, bridgesByLastSeenDays = null;
+ private static final long SUMMARY_MAX_AGE = 6L * 60L * 60L * 1000L;
+
+ public static void initialize(DocumentStore documentStoreParam,
+ boolean checkSummaryStaleParam) {
+ documentStore = documentStoreParam;
+ checkSummaryStale = checkSummaryStaleParam;
+ readSummaryFile();
+ }
+
+ public static boolean update() {
+ readSummaryFile();
+ return successfullyReadSummaryFile;
+ }
+
+ private static void readSummaryFile() {
+ long newSummaryFileLastModified = -1L;
+ UpdateStatus updateStatus = documentStore.retrieve(UpdateStatus.class,
+ false);
+ if (updateStatus != null && updateStatus.documentString != null) {
+ String updateString = updateStatus.documentString;
+ try {
+ newSummaryFileLastModified = Long.parseLong(updateString.trim());
+ } catch (NumberFormatException e) {
+ /* Handle below. */
+ }
+ }
+ if (newSummaryFileLastModified < 0L) {
+ // TODO Does this actually solve anything? Should we instead
+ // switch to a variant of the maintenance mode and re-check when
+ // the next requests comes in that happens x seconds after this one?
+ successfullyReadSummaryFile = false;
+ return;
+ }
+ if (checkSummaryStale && newSummaryFileLastModified + SUMMARY_MAX_AGE
+ < System.currentTimeMillis()) {
+ // TODO Does this actually solve anything? Should we instead
+ // switch to a variant of the maintenance mode and re-check when
+ // the next requests comes in that happens x seconds after this one?
+ successfullyReadSummaryFile = false;
+ return;
+ }
+ if (newSummaryFileLastModified > summaryFileLastModified) {
+ List<String> newRelaysByConsensusWeight = new ArrayList<String>();
+ Map<String, String>
+ newRelayFingerprintSummaryLines = new HashMap<String, String>(),
+ newBridgeFingerprintSummaryLines =
+ new HashMap<String, String>();
+ Map<String, Set<String>>
+ newRelaysByCountryCode = new HashMap<String, Set<String>>(),
+ newRelaysByASNumber = new HashMap<String, Set<String>>(),
+ newRelaysByFlag = new HashMap<String, Set<String>>(),
+ newRelaysByContact = new HashMap<String, Set<String>>();
+ SortedMap<Integer, Set<String>>
+ newRelaysByFirstSeenDays = new TreeMap<Integer, Set<String>>(),
+ newBridgesByFirstSeenDays = new TreeMap<Integer, Set<String>>(),
+ newRelaysByLastSeenDays = new TreeMap<Integer, Set<String>>(),
+ newBridgesByLastSeenDays = new TreeMap<Integer, Set<String>>();
+ long relaysLastValidAfterMillis = -1L,
+ bridgesLastPublishedMillis = -1L;
+ String newRelaysPublishedString, newBridgesPublishedString;
+ Set<NodeStatus> currentRelays = new HashSet<NodeStatus>(),
+ currentBridges = new HashSet<NodeStatus>();
+ SortedSet<String> fingerprints = documentStore.list(
+ NodeStatus.class, false);
+ // TODO We should be able to learn if something goes wrong when
+ // reading the summary file, rather than silently having an empty
+ // list of fingerprints.
+ for (String fingerprint : fingerprints) {
+ NodeStatus node = documentStore.retrieve(NodeStatus.class, true,
+ fingerprint);
+ if (node.isRelay()) {
+ relaysLastValidAfterMillis = Math.max(
+ relaysLastValidAfterMillis, node.getLastSeenMillis());
+ currentRelays.add(node);
+ } else {
+ bridgesLastPublishedMillis = Math.max(
+ bridgesLastPublishedMillis, node.getLastSeenMillis());
+ currentBridges.add(node);
+ }
+ }
+ SimpleDateFormat dateTimeFormat = new SimpleDateFormat(
+ "yyyy-MM-dd HH:mm:ss");
+ dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ newRelaysPublishedString = dateTimeFormat.format(
+ relaysLastValidAfterMillis);
+ newBridgesPublishedString = dateTimeFormat.format(
+ bridgesLastPublishedMillis);
+ List<String> orderRelaysByConsensusWeight = new ArrayList<String>();
+ for (NodeStatus entry : currentRelays) {
+ String fingerprint = entry.getFingerprint().toUpperCase();
+ String hashedFingerprint = entry.getHashedFingerprint().
+ toUpperCase();
+ entry.setRunning(entry.getLastSeenMillis() ==
+ relaysLastValidAfterMillis);
+ String line = formatRelaySummaryLine(entry);
+ newRelayFingerprintSummaryLines.put(fingerprint, line);
+ newRelayFingerprintSummaryLines.put(hashedFingerprint, line);
+ long consensusWeight = entry.getConsensusWeight();
+ orderRelaysByConsensusWeight.add(String.format("%020d %s",
+ consensusWeight, fingerprint));
+ orderRelaysByConsensusWeight.add(String.format("%020d %s",
+ consensusWeight, hashedFingerprint));
+ if (entry.getCountryCode() != null) {
+ String countryCode = entry.getCountryCode();
+ if (!newRelaysByCountryCode.containsKey(countryCode)) {
+ newRelaysByCountryCode.put(countryCode,
+ new HashSet<String>());
+ }
+ newRelaysByCountryCode.get(countryCode).add(fingerprint);
+ newRelaysByCountryCode.get(countryCode).add(hashedFingerprint);
+ }
+ if (entry.getASNumber() != null) {
+ String aSNumber = entry.getASNumber();
+ if (!newRelaysByASNumber.containsKey(aSNumber)) {
+ newRelaysByASNumber.put(aSNumber, new HashSet<String>());
+ }
+ newRelaysByASNumber.get(aSNumber).add(fingerprint);
+ newRelaysByASNumber.get(aSNumber).add(hashedFingerprint);
+ }
+ for (String flag : entry.getRelayFlags()) {
+ String flagLowerCase = flag.toLowerCase();
+ if (!newRelaysByFlag.containsKey(flagLowerCase)) {
+ newRelaysByFlag.put(flagLowerCase, new HashSet<String>());
+ }
+ newRelaysByFlag.get(flagLowerCase).add(fingerprint);
+ newRelaysByFlag.get(flagLowerCase).add(hashedFingerprint);
+ }
+ int daysSinceFirstSeen = (int) ((newSummaryFileLastModified
+ - entry.getFirstSeenMillis()) / 86400000L);
+ if (!newRelaysByFirstSeenDays.containsKey(daysSinceFirstSeen)) {
+ newRelaysByFirstSeenDays.put(daysSinceFirstSeen,
+ new HashSet<String>());
+ }
+ newRelaysByFirstSeenDays.get(daysSinceFirstSeen).add(fingerprint);
+ newRelaysByFirstSeenDays.get(daysSinceFirstSeen).add(
+ hashedFingerprint);
+ int daysSinceLastSeen = (int) ((newSummaryFileLastModified
+ - entry.getLastSeenMillis()) / 86400000L);
+ if (!newRelaysByLastSeenDays.containsKey(daysSinceLastSeen)) {
+ newRelaysByLastSeenDays.put(daysSinceLastSeen,
+ new HashSet<String>());
+ }
+ newRelaysByLastSeenDays.get(daysSinceLastSeen).add(fingerprint);
+ newRelaysByLastSeenDays.get(daysSinceLastSeen).add(
+ hashedFingerprint);
+ String contact = entry.getContact();
+ if (!newRelaysByContact.containsKey(contact)) {
+ newRelaysByContact.put(contact, new HashSet<String>());
+ }
+ newRelaysByContact.get(contact).add(fingerprint);
+ newRelaysByContact.get(contact).add(hashedFingerprint);
+ }
+ Collections.sort(orderRelaysByConsensusWeight);
+ newRelaysByConsensusWeight = new ArrayList<String>();
+ for (String relay : orderRelaysByConsensusWeight) {
+ newRelaysByConsensusWeight.add(relay.split(" ")[1]);
+ }
+ for (NodeStatus entry : currentBridges) {
+ String hashedFingerprint = entry.getFingerprint().toUpperCase();
+ String hashedHashedFingerprint = entry.getHashedFingerprint().
+ toUpperCase();
+ entry.setRunning(entry.getRelayFlags().contains("Running") &&
+ entry.getLastSeenMillis() == bridgesLastPublishedMillis);
+ String line = formatBridgeSummaryLine(entry);
+ newBridgeFingerprintSummaryLines.put(hashedFingerprint, line);
+ newBridgeFingerprintSummaryLines.put(hashedHashedFingerprint,
+ line);
+ int daysSinceFirstSeen = (int) ((newSummaryFileLastModified
+ - entry.getFirstSeenMillis()) / 86400000L);
+ if (!newBridgesByFirstSeenDays.containsKey(daysSinceFirstSeen)) {
+ newBridgesByFirstSeenDays.put(daysSinceFirstSeen,
+ new HashSet<String>());
+ }
+ newBridgesByFirstSeenDays.get(daysSinceFirstSeen).add(
+ hashedFingerprint);
+ newBridgesByFirstSeenDays.get(daysSinceFirstSeen).add(
+ hashedHashedFingerprint);
+ int daysSinceLastSeen = (int) ((newSummaryFileLastModified
+ - entry.getLastSeenMillis()) / 86400000L);
+ if (!newBridgesByLastSeenDays.containsKey(daysSinceLastSeen)) {
+ newBridgesByLastSeenDays.put(daysSinceLastSeen,
+ new HashSet<String>());
+ }
+ newBridgesByLastSeenDays.get(daysSinceLastSeen).add(
+ hashedFingerprint);
+ newBridgesByLastSeenDays.get(daysSinceLastSeen).add(
+ hashedHashedFingerprint);
+ }
+ relaysByConsensusWeight = newRelaysByConsensusWeight;
+ relayFingerprintSummaryLines = newRelayFingerprintSummaryLines;
+ bridgeFingerprintSummaryLines = newBridgeFingerprintSummaryLines;
+ relaysByCountryCode = newRelaysByCountryCode;
+ relaysByASNumber = newRelaysByASNumber;
+ relaysByFlag = newRelaysByFlag;
+ relaysByContact = newRelaysByContact;
+ relaysByFirstSeenDays = newRelaysByFirstSeenDays;
+ relaysByLastSeenDays = newRelaysByLastSeenDays;
+ bridgesByFirstSeenDays = newBridgesByFirstSeenDays;
+ bridgesByLastSeenDays = newBridgesByLastSeenDays;
+ relaysPublishedString = newRelaysPublishedString;
+ bridgesPublishedString = newBridgesPublishedString;
+ }
+ summaryFileLastModified = newSummaryFileLastModified;
+ successfullyReadSummaryFile = true;
+ }
+
+ private static String formatRelaySummaryLine(NodeStatus entry) {
+ String nickname = !entry.getNickname().equals("Unnamed") ?
+ entry.getNickname() : null;
+ String fingerprint = entry.getFingerprint();
+ String running = entry.getRunning() ? "true" : "false";
+ List<String> addresses = new ArrayList<String>();
+ addresses.add(entry.getAddress());
+ for (String orAddress : entry.getOrAddresses()) {
+ addresses.add(orAddress);
+ }
+ for (String exitAddress : entry.getExitAddresses()) {
+ if (!addresses.contains(exitAddress)) {
+ addresses.add(exitAddress);
+ }
+ }
+ StringBuilder addressesBuilder = new StringBuilder();
+ int written = 0;
+ for (String address : addresses) {
+ addressesBuilder.append((written++ > 0 ? "," : "") + "\""
+ + address.toLowerCase() + "\"");
+ }
+ return String.format("{%s\"f\":\"%s\",\"a\":[%s],\"r\":%s}",
+ (nickname == null ? "" : "\"n\":\"" + nickname + "\","),
+ fingerprint, addressesBuilder.toString(), running);
+ }
+
+ private static String formatBridgeSummaryLine(NodeStatus entry) {
+ String nickname = !entry.getNickname().equals("Unnamed") ?
+ entry.getNickname() : null;
+ String hashedFingerprint = entry.getFingerprint();
+ String running = entry.getRunning() ? "true" : "false";
+ return String.format("{%s\"h\":\"%s\",\"r\":%s}",
+ (nickname == null ? "" : "\"n\":\"" + nickname + "\","),
+ hashedFingerprint, running);
+ }
+
+ public static long getLastModified() {
+ readSummaryFile();
+ return summaryFileLastModified;
+ }
+
+ private String resourceType, type, running, search[], lookup, country,
+ as, flag, contact[], fields[], order[], offset, limit;
+ private int[] firstSeenDays, lastSeenDays;
+
+ public void setResourceType(String resourceType) {
+ this.resourceType = resourceType;
+ }
+ public void setType(String type) {
+ this.type = type;
+ }
+ public void setRunning(String running) {
+ this.running = running;
+ }
+ public void setSearch(String[] search) {
+ this.search = search;
+ }
+ public void setLookup(String lookup) {
+ this.lookup = lookup;
+ }
+ public void setCountry(String country) {
+ this.country = country;
+ }
+ public void setAs(String as) {
+ this.as = as;
+ }
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+ public void setFirstSeenDays(int[] firstSeenDays) {
+ this.firstSeenDays = firstSeenDays;
+ }
+ public void setLastSeenDays(int[] lastSeenDays) {
+ this.lastSeenDays = lastSeenDays;
+ }
+ public void setContact(String[] contact) {
+ this.contact = contact;
+ }
+ public void setFields(String[] fields) {
+ this.fields = fields;
+ }
+ public void setOrder(String[] order) {
+ this.order = order;
+ }
+ public void setOffset(String offset) {
+ this.offset = offset;
+ }
+ public void setLimit(String limit) {
+ this.limit = limit;
+ }
+
+ public void buildResponse(PrintWriter pw) {
+
+ /* Filter relays and bridges matching the request. */
+ Map<String, String> filteredRelays = new HashMap<String, String>(
+ relayFingerprintSummaryLines);
+ Map<String, String> filteredBridges = new HashMap<String, String>(
+ bridgeFingerprintSummaryLines);
+ System.out.println(filteredRelays.size() + " relays left, "
+ + filteredBridges.size() + " bridges left.");
+ filterByType(filteredRelays, filteredBridges);
+ filterByRunning(filteredRelays, filteredBridges);
+ filterBySearchTerms(filteredRelays, filteredBridges);
+ filterByFingerprint(filteredRelays, filteredBridges);
+ filterByCountryCode(filteredRelays, filteredBridges);
+ filterByASNumber(filteredRelays, filteredBridges);
+ filterByFlag(filteredRelays, filteredBridges);
+ filterNodesByFirstSeenDays(filteredRelays, filteredBridges);
+ filterNodesByLastSeenDays(filteredRelays, filteredBridges);
+ filterByContact(filteredRelays, filteredBridges);
+ System.out.println(filteredRelays.size() + " relays left, "
+ + filteredBridges.size() + " bridges left.");
+
+ /* Re-order and limit results. */
+ List<String> orderedRelays = new ArrayList<String>();
+ List<String> orderedBridges = new ArrayList<String>();
+ order(filteredRelays, filteredBridges, orderedRelays, orderedBridges);
+ offset(orderedRelays, orderedBridges);
+ limit(orderedRelays, orderedBridges);
+
+ /* Write the response. */
+ writeRelays(orderedRelays, pw);
+ writeBridges(orderedBridges, pw);
+ }
+
+ private void filterByType(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.type == null) {
+ return;
+ } else if (this.type.equals("relay")) {
+ filteredBridges.clear();
+ } else {
+ filteredRelays.clear();
+ }
+ }
+
+ private void filterByRunning(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.running == null) {
+ return;
+ }
+ boolean runningRequested = this.running.equals("true");
+ Set<String> removeRelays = new HashSet<String>();
+ for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
+ if (e.getValue().contains("\"r\":true") != runningRequested) {
+ removeRelays.add(e.getKey());
+ }
+ }
+ for (String fingerprint : removeRelays) {
+ filteredRelays.remove(fingerprint);
+ }
+ Set<String> removeBridges = new HashSet<String>();
+ for (Map.Entry<String, String> e : filteredBridges.entrySet()) {
+ if (e.getValue().contains("\"r\":true") != runningRequested) {
+ removeBridges.add(e.getKey());
+ }
+ }
+ for (String fingerprint : removeBridges) {
+ filteredBridges.remove(fingerprint);
+ }
+ }
+
+ private void filterBySearchTerms(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.search == null) {
+ return;
+ }
+ for (String searchTerm : this.search) {
+ filterBySearchTerm(filteredRelays, filteredBridges, searchTerm);
+ }
+ }
+
+ private void filterBySearchTerm(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges, String searchTerm) {
+ Set<String> removeRelays = new HashSet<String>();
+ for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
+ String fingerprint = e.getKey();
+ String line = e.getValue();
+ boolean lineMatches = false;
+ String nickname = "unnamed";
+ if (line.contains("\"n\":\"")) {
+ nickname = line.substring(line.indexOf("\"n\":\"") + 5).
+ split("\"")[0].toLowerCase();
+ }
+ if (searchTerm.startsWith("$")) {
+ /* Search is for $-prefixed fingerprint. */
+ if (fingerprint.startsWith(
+ searchTerm.substring(1).toUpperCase())) {
+ /* $-prefixed fingerprint matches. */
+ lineMatches = true;
+ }
+ } else if (nickname.contains(searchTerm.toLowerCase())) {
+ /* Nickname matches. */
+ lineMatches = true;
+ } else if (fingerprint.startsWith(searchTerm.toUpperCase())) {
+ /* Non-$-prefixed fingerprint matches. */
+ lineMatches = true;
+ } else if (line.substring(line.indexOf("\"a\":[")).contains("\""
+ + searchTerm.toLowerCase())) {
+ /* Address matches. */
+ lineMatches = true;
+ }
+ if (!lineMatches) {
+ removeRelays.add(e.getKey());
+ }
+ }
+ for (String fingerprint : removeRelays) {
+ filteredRelays.remove(fingerprint);
+ }
+ Set<String> removeBridges = new HashSet<String>();
+ for (Map.Entry<String, String> e : filteredBridges.entrySet()) {
+ String hashedFingerprint = e.getKey();
+ String line = e.getValue();
+ boolean lineMatches = false;
+ String nickname = "unnamed";
+ if (line.contains("\"n\":\"")) {
+ nickname = line.substring(line.indexOf("\"n\":\"") + 5).
+ split("\"")[0].toLowerCase();
+ }
+ if (searchTerm.startsWith("$")) {
+ /* Search is for $-prefixed hashed fingerprint. */
+ if (hashedFingerprint.startsWith(
+ searchTerm.substring(1).toUpperCase())) {
+ /* $-prefixed hashed fingerprint matches. */
+ lineMatches = true;
+ }
+ } else if (nickname.contains(searchTerm.toLowerCase())) {
+ /* Nickname matches. */
+ lineMatches = true;
+ } else if (hashedFingerprint.startsWith(searchTerm.toUpperCase())) {
+ /* Non-$-prefixed hashed fingerprint matches. */
+ lineMatches = true;
+ }
+ if (!lineMatches) {
+ removeBridges.add(e.getKey());
+ }
+ }
+ for (String fingerprint : removeBridges) {
+ filteredBridges.remove(fingerprint);
+ }
+ }
+
+ private void filterByFingerprint(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.lookup == null) {
+ return;
+ }
+ String fingerprint = this.lookup;
+ String relayLine = filteredRelays.get(fingerprint);
+ filteredRelays.clear();
+ if (relayLine != null) {
+ filteredRelays.put(fingerprint, relayLine);
+ }
+ String bridgeLine = filteredBridges.get(fingerprint);
+ filteredBridges.clear();
+ if (bridgeLine != null) {
+ filteredBridges.put(fingerprint, bridgeLine);
+ }
+ }
+
+ private void filterByCountryCode(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.country == null) {
+ return;
+ }
+ String countryCode = this.country.toLowerCase();
+ if (!relaysByCountryCode.containsKey(countryCode)) {
+ filteredRelays.clear();
+ } else {
+ Set<String> relaysWithCountryCode =
+ relaysByCountryCode.get(countryCode);
+ Set<String> removeRelays = new HashSet<String>();
+ for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
+ String fingerprint = e.getKey();
+ if (!relaysWithCountryCode.contains(fingerprint)) {
+ removeRelays.add(fingerprint);
+ }
+ }
+ for (String fingerprint : removeRelays) {
+ filteredRelays.remove(fingerprint);
+ }
+ }
+ filteredBridges.clear();
+ }
+
+ private void filterByASNumber(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.as == null) {
+ return;
+ }
+ String aSNumber = this.as.toUpperCase();
+ if (!aSNumber.startsWith("AS")) {
+ aSNumber = "AS" + aSNumber;
+ }
+ if (!relaysByASNumber.containsKey(aSNumber)) {
+ filteredRelays.clear();
+ } else {
+ Set<String> relaysWithASNumber =
+ relaysByASNumber.get(aSNumber);
+ Set<String> removeRelays = new HashSet<String>();
+ for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
+ String fingerprint = e.getKey();
+ if (!relaysWithASNumber.contains(fingerprint)) {
+ removeRelays.add(fingerprint);
+ }
+ }
+ for (String fingerprint : removeRelays) {
+ filteredRelays.remove(fingerprint);
+ }
+ }
+ filteredBridges.clear();
+ }
+
+ private void filterByFlag(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.flag == null) {
+ return;
+ }
+ String flag = this.flag.toLowerCase();
+ if (!relaysByFlag.containsKey(flag)) {
+ filteredRelays.clear();
+ } else {
+ Set<String> relaysWithFlag = relaysByFlag.get(flag);
+ Set<String> removeRelays = new HashSet<String>();
+ for (Map.Entry<String, String> e : filteredRelays.entrySet()) {
+ String fingerprint = e.getKey();
+ if (!relaysWithFlag.contains(fingerprint)) {
+ removeRelays.add(fingerprint);
+ }
+ }
+ for (String fingerprint : removeRelays) {
+ filteredRelays.remove(fingerprint);
+ }
+ }
+ filteredBridges.clear();
+ }
+
+ private void filterNodesByFirstSeenDays(
+ Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.firstSeenDays == null) {
+ return;
+ }
+ filterNodesByDays(filteredRelays, relaysByFirstSeenDays,
+ this.firstSeenDays);
+ filterNodesByDays(filteredBridges, bridgesByFirstSeenDays,
+ this.firstSeenDays);
+ }
+
+ private void filterNodesByLastSeenDays(
+ Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.lastSeenDays == null) {
+ return;
+ }
+ filterNodesByDays(filteredRelays, relaysByLastSeenDays,
+ this.lastSeenDays);
+ filterNodesByDays(filteredBridges, bridgesByLastSeenDays,
+ this.lastSeenDays);
+ }
+
+ private void filterNodesByDays(Map<String, String> filteredNodes,
+ SortedMap<Integer, Set<String>> nodesByDays, int[] days) {
+ Set<String> removeNodes = new HashSet<String>();
+ for (Set<String> nodes : nodesByDays.headMap(days[0]).values()) {
+ removeNodes.addAll(nodes);
+ }
+ if (days[1] < Integer.MAX_VALUE) {
+ for (Set<String> nodes :
+ nodesByDays.tailMap(days[1] + 1).values()) {
+ removeNodes.addAll(nodes);
+ }
+ }
+ for (String fingerprint : removeNodes) {
+ filteredNodes.remove(fingerprint);
+ }
+ }
+
+ private void filterByContact(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges) {
+ if (this.contact == null) {
+ return;
+ }
+ Set<String> removeRelays = new HashSet<String>();
+ for (Map.Entry<String, Set<String>> e : relaysByContact.entrySet()) {
+ String contact = e.getKey();
+ for (String contactPart : this.contact) {
+ if (contact == null ||
+ !contact.contains(contactPart.toLowerCase())) {
+ removeRelays.addAll(e.getValue());
+ break;
+ }
+ }
+ }
+ for (String fingerprint : removeRelays) {
+ filteredRelays.remove(fingerprint);
+ }
+ filteredBridges.clear();
+ }
+
+ private void order(Map<String, String> filteredRelays,
+ Map<String, String> filteredBridges, List<String> orderedRelays,
+ List<String> orderedBridges) {
+ if (this.order != null && this.order.length == 1) {
+ List<String> orderBy = new ArrayList<String>(
+ relaysByConsensusWeight);
+ if (this.order[0].startsWith("-")) {
+ Collections.reverse(orderBy);
+ }
+ for (String relay : orderBy) {
+ if (filteredRelays.containsKey(relay) &&
+ !orderedRelays.contains(filteredRelays.get(relay))) {
+ orderedRelays.add(filteredRelays.remove(relay));
+ }
+ }
+ for (String relay : filteredRelays.keySet()) {
+ if (!orderedRelays.contains(filteredRelays.get(relay))) {
+ orderedRelays.add(filteredRelays.remove(relay));
+ }
+ }
+ Set<String> uniqueBridges = new HashSet<String>(
+ filteredBridges.values());
+ orderedBridges.addAll(uniqueBridges);
+ } else {
+ Set<String> uniqueRelays = new HashSet<String>(
+ filteredRelays.values());
+ orderedRelays.addAll(uniqueRelays);
+ Set<String> uniqueBridges = new HashSet<String>(
+ filteredBridges.values());
+ orderedBridges.addAll(uniqueBridges);
+ }
+ }
+
+ private void offset(List<String> orderedRelays,
+ List<String> orderedBridges) {
+ if (offset == null) {
+ return;
+ }
+ int offsetValue = Integer.parseInt(offset);
+ while (offsetValue-- > 0 &&
+ (!orderedRelays.isEmpty() || !orderedBridges.isEmpty())) {
+ if (!orderedRelays.isEmpty()) {
+ orderedRelays.remove(0);
+ } else {
+ orderedBridges.remove(0);
+ }
+ }
+ }
+
+ private void limit(List<String> orderedRelays,
+ List<String> orderedBridges) {
+ if (limit == null) {
+ return;
+ }
+ int limitValue = Integer.parseInt(limit);
+ while (!orderedRelays.isEmpty() &&
+ limitValue < orderedRelays.size()) {
+ orderedRelays.remove(orderedRelays.size() - 1);
+ }
+ limitValue -= orderedRelays.size();
+ while (!orderedBridges.isEmpty() &&
+ limitValue < orderedBridges.size()) {
+ orderedBridges.remove(orderedBridges.size() - 1);
+ }
+ }
+
+ private void writeRelays(List<String> relays, PrintWriter pw) {
+ pw.write("{\"relays_published\":\"" + relaysPublishedString
+ + "\",\n\"relays\":[");
+ int written = 0;
+ for (String line : relays) {
+ String lines = this.getFromSummaryLine(line);
+ if (lines.length() > 0) {
+ pw.print((written++ > 0 ? ",\n" : "\n") + lines);
+ }
+ }
+ pw.print("\n],\n");
+ }
+
+ private void writeBridges(List<String> bridges, PrintWriter pw) {
+ pw.write("\"bridges_published\":\"" + bridgesPublishedString
+ + "\",\n\"bridges\":[");
+ int written = 0;
+ for (String line : bridges) {
+ String lines = this.getFromSummaryLine(line);
+ if (lines.length() > 0) {
+ pw.print((written++ > 0 ? ",\n" : "\n") + lines);
+ }
+ }
+ pw.print("\n]}\n");
+ }
+
+ private String getFromSummaryLine(String summaryLine) {
+ if (this.resourceType == null) {
+ return "";
+ } else if (this.resourceType.equals("summary")) {
+ return this.writeSummaryLine(summaryLine);
+ } else if (this.resourceType.equals("details")) {
+ return this.writeDetailsLines(summaryLine);
+ } else if (this.resourceType.equals("bandwidth")) {
+ return this.writeBandwidthLines(summaryLine);
+ } else if (this.resourceType.equals("weights")) {
+ return this.writeWeightsLines(summaryLine);
+ } else {
+ return "";
+ }
+ }
+
+ private String writeSummaryLine(String summaryLine) {
+ return (summaryLine.endsWith(",") ? summaryLine.substring(0,
+ summaryLine.length() - 1) : summaryLine);
+ }
+
+ private String writeDetailsLines(String summaryLine) {
+ String fingerprint = null;
+ if (summaryLine.contains("\"f\":\"")) {
+ fingerprint = summaryLine.substring(summaryLine.indexOf(
+ "\"f\":\"") + "\"f\":\"".length());
+ } else if (summaryLine.contains("\"h\":\"")) {
+ fingerprint = summaryLine.substring(summaryLine.indexOf(
+ "\"h\":\"") + "\"h\":\"".length());
+ } else {
+ return "";
+ }
+ fingerprint = fingerprint.substring(0, 40);
+ DetailsDocument detailsDocument = documentStore.retrieve(
+ DetailsDocument.class, false, fingerprint);
+ if (detailsDocument != null &&
+ detailsDocument.documentString != null) {
+ StringBuilder sb = new StringBuilder();
+ Scanner s = new Scanner(detailsDocument.documentString);
+ sb.append("{");
+ if (s.hasNextLine()) {
+ /* Skip version line. */
+ s.nextLine();
+ }
+ boolean includeLine = true;
+ while (s.hasNextLine()) {
+ String line = s.nextLine();
+ if (line.equals("}")) {
+ sb.append("}\n");
+ break;
+ } else if (line.startsWith("\"desc_published\":")) {
+ continue;
+ } else if (this.fields != null) {
+ if (line.startsWith("\"")) {
+ includeLine = false;
+ for (String field : this.fields) {
+ if (line.startsWith("\"" + field + "\":")) {
+ sb.append(line + "\n");
+ includeLine = true;
+ }
+ }
+ } else if (includeLine) {
+ sb.append(line + "\n");
+ }
+ } else {
+ sb.append(line + "\n");
+ }
+ }
+ s.close();
+ String detailsLines = sb.toString();
+ if (detailsLines.length() > 1) {
+ detailsLines = detailsLines.substring(0,
+ detailsLines.length() - 1);
+ }
+ if (detailsLines.endsWith(",\n}")) {
+ detailsLines = detailsLines.substring(0,
+ detailsLines.length() - 3) + "\n}";
+ }
+ return detailsLines;
+ } else {
+ // TODO We should probably log that we didn't find a details
+ // document that we expected to exist.
+ return "";
+ }
+ }
+
+ private String writeBandwidthLines(String summaryLine) {
+ String fingerprint = null;
+ if (summaryLine.contains("\"f\":\"")) {
+ fingerprint = summaryLine.substring(summaryLine.indexOf(
+ "\"f\":\"") + "\"f\":\"".length());
+ } else if (summaryLine.contains("\"h\":\"")) {
+ fingerprint = summaryLine.substring(summaryLine.indexOf(
+ "\"h\":\"") + "\"h\":\"".length());
+ } else {
+ return "";
+ }
+ fingerprint = fingerprint.substring(0, 40);
+ BandwidthDocument bandwidthDocument = documentStore.retrieve(
+ BandwidthDocument.class, false, fingerprint);
+ if (bandwidthDocument != null &&
+ bandwidthDocument.documentString != null) {
+ String bandwidthLines = bandwidthDocument.documentString;
+ bandwidthLines = bandwidthLines.substring(0,
+ bandwidthLines.length() - 1);
+ return bandwidthLines;
+ } else {
+ // TODO We should probably log that we didn't find a bandwidth
+ // document that we expected to exist.
+ return "";
+ }
+ }
+
+ private String writeWeightsLines(String summaryLine) {
+ String fingerprint = null;
+ if (summaryLine.contains("\"f\":\"")) {
+ fingerprint = summaryLine.substring(summaryLine.indexOf(
+ "\"f\":\"") + "\"f\":\"".length());
+ } else {
+ return "";
+ }
+ fingerprint = fingerprint.substring(0, 40);
+ WeightsDocument weightsDocument = documentStore.retrieve(
+ WeightsDocument.class, false, fingerprint);
+ if (weightsDocument != null &&
+ weightsDocument.documentString != null) {
+ String weightsLines = weightsDocument.documentString;
+ weightsLines = weightsLines.substring(0, weightsLines.length() - 1);
+ return weightsLines;
+ } else {
+ // TODO We should probably log that we didn't find a weights
+ // document that we expected to exist.
+ return "";
+ }
+ }
+}
diff --git a/test/org/torproject/onionoo/ResourceServletTest.java b/test/org/torproject/onionoo/ResourceServletTest.java
index 9ef12d8..e61b12d 100644
--- a/test/org/torproject/onionoo/ResourceServletTest.java
+++ b/test/org/torproject/onionoo/ResourceServletTest.java
@@ -40,7 +40,8 @@ public class ResourceServletTest {
relays = new TreeMap<String, String>(),
bridges = new TreeMap<String, String>();
- private long lastModified = 1366806142000L; // 2013-04-24 12:22:22
+ // 2013-04-24 12:22:22
+ private static long lastModified = 1366806142000L;
private boolean maintenanceMode = false;
@@ -174,13 +175,13 @@ public class ResourceServletTest {
bw.close();
File updateFile = new File(this.tempOutDir, "update");
bw = new BufferedWriter(new FileWriter(updateFile));
- bw.write(String.valueOf(this.lastModified));
+ bw.write(String.valueOf(lastModified++));
bw.close();
}
private void makeRequest() throws IOException {
ResourceServlet rs = new ResourceServlet();
- rs.init(maintenanceMode, this.tempOutDir);
+ rs.init(maintenanceMode, this.tempOutDir, false);
rs.doGet(this.request, this.response);
}
