tor-commits July 2012

tor-commits@lists.torproject.org

14 participants
949 discussions

[metrics-web/master] Cache JSON-formatted graph data for performance reasons.
by karsten＠torproject.org 31 Jul '12

31 Jul '12

commit c433f5c77e0168aa2c8cbde1cea1de37327c88fc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 31 12:32:40 2012 +0200 Cache JSON-formatted graph data for performance reasons. Previously, we were only caching the .csv contents generated by R, but we were converting the .csv to .json in each request. Turns out we can save over a second per request here for large .csv files by caching the .json contents. Let's do it. --- src/org/torproject/ernie/web/CsvServlet.java | 10 ++- src/org/torproject/ernie/web/GraphDataServlet.java | 62 +++++++++++----- src/org/torproject/ernie/web/RObject.java | 11 ++- src/org/torproject/ernie/web/RObjectGenerator.java | 74 +++++--------------- 4 files changed, 76 insertions(+), 81 deletions(-) diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java index 5e170e3..6fdcaac 100644 --- a/src/org/torproject/ernie/web/CsvServlet.java +++ b/src/org/torproject/ernie/web/CsvServlet.java @@ -2,7 +2,10 @@ * See LICENSE for licensing information */ package org.torproject.ernie.web; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStreamReader; import java.util.SortedSet; import java.util.logging.Logger; @@ -75,16 +78,17 @@ public class CsvServlet extends HttpServlet { /* Request CSV file from R object generator, which asks Rserve to * generate it. */ - String csvFileContent = this.rObjectGenerator.generateCsv( + RObject csvFile = this.rObjectGenerator.generateCsv( requestedCsvFile, true); - /* Make sure that we have a graph to return. */ - if (csvFileContent == null) { + /* Make sure that we have a .csv file to return. */ + if (csvFile == null) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); return; } /* Write CSV file to response. */ + String csvFileContent = new String(csvFile.getBytes()); response.setContentType("text/csv"); response.setHeader("Content-Length", String.valueOf( csvFileContent.length())); diff --git a/src/org/torproject/ernie/web/GraphDataServlet.java b/src/org/torproject/ernie/web/GraphDataServlet.java index 209aefe..5b79c1b 100644 --- a/src/org/torproject/ernie/web/GraphDataServlet.java +++ b/src/org/torproject/ernie/web/GraphDataServlet.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.StringReader; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.HashMap; import java.util.Map; import java.util.SortedMap; import java.util.SortedSet; @@ -112,16 +113,49 @@ public class GraphDataServlet extends HttpServlet { /* Request CSV file from R object generator, which may ask Rserve to * generate it. */ - String csvFileContent = this.rObjectGenerator.generateCsv( - requestedCsvFile, true); + RObject csvFile = this.rObjectGenerator.generateCsv(requestedCsvFile, + true); /* Make sure that we have a CSV to convert into JSON. */ - if (csvFileContent == null) { + if (csvFile == null) { response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); return; } - /* Convert CSV to JSON format. */ + /* Look up if we converted this CSV to JSON format before. If not, + * convert it now. */ + String jsonString; + if (!this.lastConvertedCsvFile.containsKey(requestedJsonFile) || + this.lastConvertedCsvFile.get(requestedJsonFile) < + csvFile.getLastModified()) { + jsonString = this.convertCsvToJson(requestedJsonFile, + new String(csvFile.getBytes())); + this.lastConvertedCsvFile.put(requestedJsonFile, + csvFile.getLastModified()); + this.convertedCsvFiles.put(requestedJsonFile, jsonString); + } else { + jsonString = this.convertedCsvFiles.get(requestedJsonFile); + } + + /* Make sure we have a JSON string to return. */ + if (jsonString == null) { + response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + return; + } + + /* Write JSON string to response. */ + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + response.getWriter().print(jsonString); + } + + private Map<String, Long> lastConvertedCsvFile = + new HashMap<String, Long>(); + private Map<String, String> convertedCsvFiles = + new HashMap<String, String>(); + private String convertCsvToJson(String requestedJsonFile, + String csvFileContent) { String jsonString = null; try { BufferedReader br = new BufferedReader(new StringReader( @@ -148,17 +182,14 @@ public class GraphDataServlet extends HttpServlet { } } if (columns == null || dateCol < 0 || valueCols.isEmpty()) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - return; + return null; } SortedMap<String, SortedSet<String>> graphs = new TreeMap<String, SortedSet<String>>(); while ((line = br.readLine()) != null) { String[] elements = line.split(","); if (elements.length != columns.length) { - response.sendError( - HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - return; + return null; } String date = elements[dateCol]; String variable = ""; @@ -225,18 +256,11 @@ public class GraphDataServlet extends HttpServlet { br.close(); jsonString = "[" + sb.toString().substring(1) + "\n]"; } catch (IOException e) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - return; + return null; } catch (ParseException e) { - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - return; + return null; } - - /* Write JSON file to response. */ - response.setHeader("Access-Control-Allow-Origin", "*"); - response.setContentType("application/json"); - response.setCharacterEncoding("utf-8"); - response.getWriter().print(jsonString); + return jsonString; } } diff --git a/src/org/torproject/ernie/web/RObject.java b/src/org/torproject/ernie/web/RObject.java index 4ee5cdc..25dac52 100644 --- a/src/org/torproject/ernie/web/RObject.java +++ b/src/org/torproject/ernie/web/RObject.java @@ -5,14 +5,19 @@ package org.torproject.ernie.web; public class RObject { private byte[] bytes; private String fileName; - public RObject(byte[] bytes, String fileName) { + private long lastModified; + public RObject(byte[] bytes, String fileName, long lastModified) { this.bytes = bytes; this.fileName = fileName; + this.lastModified = lastModified; } public String getFileName() { - return fileName; + return this.fileName; } public byte[] getBytes() { - return bytes; + return this.bytes; + } + public long getLastModified() { + return this.lastModified; } } diff --git a/src/org/torproject/ernie/web/RObjectGenerator.java b/src/org/torproject/ernie/web/RObjectGenerator.java index 1b56f31..aea9389 100644 --- a/src/org/torproject/ernie/web/RObjectGenerator.java +++ b/src/org/torproject/ernie/web/RObjectGenerator.java @@ -173,69 +173,27 @@ public class RObjectGenerator implements ServletContextListener { String imageFilename = imageFilenameBuilder.toString(); rQueryBuilder.append("path = '%s')"); String rQuery = rQueryBuilder.toString(); - byte[] graphBytes = this.generateGraph(rQuery, imageFilename, - checkCache); - if (graphBytes != null) { - return new RObject(graphBytes, imageFilename); - } else { - return null; - } - } - - /* Generate a graph using the given R query that has a placeholder for - * the absolute path to the image to be created. */ - private byte[] generateGraph(String rQuery, String imageFilename, - boolean checkCache) { - - /* See if we need to generate this graph. */ File imageFile = new File(this.cachedGraphsDirectory + "/" + imageFilename); - byte[] imageBytes = this.generateRObject(rQuery, imageFile, + return this.generateRObject(rQuery, imageFile, imageFilename, checkCache); - - /* Return the graph bytes. */ - return imageBytes; } public SortedSet<String> getAvailableCsvFiles() { return this.availableCsvFiles; } - public String generateCsv(String requestedCsvFile, boolean checkCache) { + public RObject generateCsv(String requestedCsvFile, + boolean checkCache) { /* Prepare filename and R query string. */ String rQuery = "export_" + requestedCsvFile.replaceAll("-", "_") + "(path = '%s')"; String csvFilename = requestedCsvFile + ".csv"; - return this.generateCsv(rQuery, csvFilename, checkCache); - } - - /* Generate a comma-separated value file using the given R query that - * has a placeholder for the absolute path to the file to be created. */ - private String generateCsv(String rQuery, String csvFilename, - boolean checkCache) { /* See if we need to generate this .csv file. */ File csvFile = new File(this.cachedGraphsDirectory + "/" + csvFilename); - byte[] csvBytes = this.generateRObject(rQuery, csvFile, checkCache); - - /* Read the text file from disk and write it to a string. */ - String result = null; - try { - StringBuilder sb = new StringBuilder(); - BufferedReader br = new BufferedReader(new InputStreamReader( - new ByteArrayInputStream(csvBytes))); - String line = null; - while ((line = br.readLine()) != null) { - sb.append(line + "\n"); - } - result = sb.toString(); - } catch (IOException e) { - return null; - } - - /* Return the csv file content. */ - return result; + return this.generateRObject(rQuery, csvFile, csvFilename, checkCache); } public List<Map<String, String>> generateTable(String tableName, @@ -295,7 +253,7 @@ public class RObjectGenerator implements ServletContextListener { File tableFile = new File(this.cachedGraphsDirectory + "/" + tableFilename); byte[] tableBytes = this.generateRObject(rQuery, tableFile, - checkCache); + tableFilename, checkCache).getBytes(); /* Write the table content to a map. */ List<Map<String, String>> result = null; @@ -329,15 +287,15 @@ public class RObjectGenerator implements ServletContextListener { /* Generate an R object in a separate worker thread, or wait for an * already running worker thread to finish and get its result. */ - private byte[] generateRObject(String rQuery, File rObjectFile, - boolean checkCache) { + private RObject generateRObject(String rQuery, File rObjectFile, + String fileName, boolean checkCache) { RObjectGeneratorWorker worker = null; synchronized (this.rObjectGeneratorThreads) { if (this.rObjectGeneratorThreads.containsKey(rQuery)) { worker = this.rObjectGeneratorThreads.get(rQuery); } else { worker = new RObjectGeneratorWorker(rQuery, rObjectFile, - checkCache); + fileName, checkCache); this.rObjectGeneratorThreads.put(rQuery, worker); worker.start(); } @@ -352,7 +310,7 @@ public class RObjectGenerator implements ServletContextListener { this.rObjectGeneratorThreads.remove(rQuery); } } - return worker.getRObjectBytes(); + return worker.getRObject(); } private Map<String, RObjectGeneratorWorker> rObjectGeneratorThreads = @@ -362,13 +320,15 @@ public class RObjectGenerator implements ServletContextListener { private String rQuery; private File rObjectFile; + private String fileName; private boolean checkCache; - private byte[] result = null; + private RObject result = null; public RObjectGeneratorWorker(String rQuery, File rObjectFile, - boolean checkCache) { + String fileName, boolean checkCache) { this.rQuery = rQuery; this.rObjectFile = rObjectFile; + this.fileName = fileName; this.checkCache = checkCache; } @@ -401,6 +361,7 @@ public class RObjectGenerator implements ServletContextListener { } /* Read the R object from disk and write it to a byte array. */ + long lastModified = this.rObjectFile.lastModified(); try { BufferedInputStream bis = new BufferedInputStream( new FileInputStream(this.rObjectFile), 1024); @@ -411,14 +372,15 @@ public class RObjectGenerator implements ServletContextListener { baos.write(buffer, 0, length); } bis.close(); - this.result = baos.toByteArray(); + this.result = new RObject(baos.toByteArray(), this.fileName, + lastModified); } catch (IOException e) { return; } } - public byte[] getRObjectBytes() { - return result; + public RObject getRObject() { + return this.result; } } }

1 0

[tor/release-0.2.3] bump to 0.2.3.19-rc-dev
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit ab4c6b6543b98389f252bdb21f8c59f57b7a4973 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 31 05:43:41 2012 -0400 bump to 0.2.3.19-rc-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 344cf28..816d29e 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.19-rc) +AM_INIT_AUTOMAKE(tor, 0.2.3.19-rc-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 26442af..bd191d4 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.19-rc" +!define VERSION "0.2.3.19-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index e410dde..37d3631 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.19-rc" +#define VERSION "0.2.3.19-rc-dev"

1 0

[tor/release-0.2.3] fold in changes so far
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 13482abaf0033c72c4a66d3b60eb9036fc69750c Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 31 05:38:41 2012 -0400 fold in changes so far --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ changes/bug6274 | 3 --- changes/bug6274_2 | 3 --- changes/bug6377 | 4 ---- changes/bug6387 | 3 --- changes/bug6397 | 4 ---- changes/bug6436 | 3 --- changes/cov709056 | 4 ---- changes/port_doc | 3 --- changes/smartlist_foreach | 8 -------- 10 files changed, 36 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d2a5fc..7998df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +Changes in version 0.2.3.20-rc - 2012-08-?? + o Major bugfixes: + - When disabling guards for having too high a proportion of failed + circuits, make sure to look at each guard. Fixes bug 6397; bugfix + on 0.2.3.17-beta. + + o Minor features: + - Terminate active server managed proxies if Tor stops being a + relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha. + - Provide a better error message about possible OSX Asciidoc failure + reasons. Fix for bug 6436. + - Try to make the warning when giving an obsolete SOCKSListenAddress + a little more useful. + + o Minor bugfixes: + - Check return value of fputs() when writing authority certificate + file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha. + - Ignore ServerTransportPlugin lines when Tor is not configured as + a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha. + + o Testing: + - Make it possible to set the TestingTorNetwork configuration + option using AlternateDirAuthority and AlternateBridgeAuthority + as an alternative to setting DirServer. Addresses ticket 6377. + + o Documentation: + - Clarify the documentation for the Alternate*Authority options. + Fixes bug 6387. + + o Code simplification and refactoring: + - Do not use SMARTLIST_FOREACH for any loop whose body exceeds + 10 lines. Also, don't nest them. Doing so in the past has + led to hard-to-debug code. The new style is to use the + SMARTLIST_FOREACH_{BEGIN,END} pair. Addresses issue 6400. + + Changes in version 0.2.3.19-rc - 2012-07-06 Tor 0.2.3.19-rc is the second release candidate for the Tor 0.2.3.x series. It fixes the compile on Windows, reverts to a GeoIP database diff --git a/changes/bug6274 b/changes/bug6274 deleted file mode 100644 index ad1abcd..0000000 --- a/changes/bug6274 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Ignore ServerTransportPlugin lines when Tor is not configured as - a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6274_2 b/changes/bug6274_2 deleted file mode 100644 index 89576f9..0000000 --- a/changes/bug6274_2 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Terminate active server managed proxies if Tor stops being a - relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6377 b/changes/bug6377 deleted file mode 100644 index a3a3672..0000000 --- a/changes/bug6377 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Make it possible to set the TestingTorNetwork configuration - option using AlternateDirAuthority and AlternateBridgeAuthority - as an alternative to setting DirServer. diff --git a/changes/bug6387 b/changes/bug6387 deleted file mode 100644 index 73fc4f7..0000000 --- a/changes/bug6387 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation: - - Clarify the documentation for the Alternate*Authority options. - Fixes bug 6387. diff --git a/changes/bug6397 b/changes/bug6397 deleted file mode 100644 index 23d8359..0000000 --- a/changes/bug6397 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - When disabling guards for having too high a proportion of failed - circuits, make sure to look at each guard. Fix for bug 6397; bugfix - on 0.2.3.17-beta. diff --git a/changes/bug6436 b/changes/bug6436 deleted file mode 100644 index 2c163df..0000000 --- a/changes/bug6436 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Provide a better error message about possible OSX Asciidoc failure - reasons. Fix for bug 6436. diff --git a/changes/cov709056 b/changes/cov709056 deleted file mode 100644 index 64a75ad..0000000 --- a/changes/cov709056 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Check return value of fputs() when writing authority certificate - file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha. - diff --git a/changes/port_doc b/changes/port_doc deleted file mode 100644 index 0e8662f..0000000 --- a/changes/port_doc +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features (usability): - - Try to make the warning when giving an obsolete SOCKSListenAddress - a littel more useful. diff --git a/changes/smartlist_foreach b/changes/smartlist_foreach deleted file mode 100644 index 2fd3a1a..0000000 --- a/changes/smartlist_foreach +++ /dev/null @@ -1,8 +0,0 @@ - o Code simplification and refactoring: - - Do not use SMARTLIST_FOREACH for any loop whose body exceeds - 10 lines. Doing so in the past has led to hard-to-debug code. - The new style is to use the SMARTLIST_FOREACH_{BEGIN,END} pair. - Issue 6400. - - Do not nest SMARTLIST_FOREACH blocks within one another. Any - nested block ought to be using SMARTLIST_FOREACH_{BEGIN,END}. - Issue 6400.

1 0

[tor/release-0.2.3] Clarify how to build asciidoc files using homebrew on Mac OS X
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 5b853612fbc928e9477b06095838e76f37bce6fc Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Fri Jul 20 14:29:20 2012 +0100 Clarify how to build asciidoc files using homebrew on Mac OS X --- doc/asciidoc-helper.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index 33e1360..dd420f7 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -54,7 +54,9 @@ You need a working asciidoc installed to be able to build the manpage. a2x is installed, but for some reason it isn't working. Sometimes This happens because required docbook support files are missing. Please install docbook-xsl, docbook-xml, and libxml2-utils (Debian) or -similar. +similar. If you use homebrew on Mac OS X, install the docbook formula +and add "export XML_CATALOG_FILES=/usr/local/etc/xml/catalog" to your +.bashrc Alternatively, to build without manpages, use the --disable-asciidoc argument when calling configure.

1 0

[tor/release-0.2.3] changes file for bug 6436.
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 6cf8e38eca78bfb5d4fd38733deb5b358ac4fdea Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 09:50:19 2012 -0400 changes file for bug 6436. --- changes/bug6436 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug6436 b/changes/bug6436 new file mode 100644 index 0000000..2c163df --- /dev/null +++ b/changes/bug6436 @@ -0,0 +1,3 @@ + o Minor features: + - Provide a better error message about possible OSX Asciidoc failure + reasons. Fix for bug 6436.

1 0

[tor/release-0.2.3] Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 692005b38d3607f53d9fb605a6b4584553417ad9 Merge: 6cf8e38 a1d060a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 23 12:35:23 2012 -0400 Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3 changes/bug6274 | 3 +++ changes/bug6274_2 | 3 +++ src/or/config.c | 9 ++++++++- 3 files changed, 14 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.3] Merge branch 'maint-0.2.3' into release-0.2.3
by arma＠torproject.org 31 Jul '12

31 Jul '12

1 0

[tor/release-0.2.3] trivial grammar fix
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 1004489354685e7fe27df7fe7fdb9cc94f2d7d2d Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jul 31 05:10:05 2012 -0400 trivial grammar fix --- src/or/dns.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dns.c b/src/or/dns.c index 02447ec..da11668 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -567,7 +567,7 @@ send_resolved_hostname_cell(edge_connection_t *conn, const char *hostname) // log_notice(LD_EXIT, "Sent"); } -/** See if we have a cache entry for exitconn-\>address. if so, +/** See if we have a cache entry for exitconn-\>address. If so, * if resolve valid, put it into exitconn-\>addr and return 1. * If resolve failed, free exitconn and return -1. *

1 0

[tor/release-0.2.3] Improve Alternate*Authority docs. Bug 6387.
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit 9ad5b2593004c55d4223d59a150898b48d04737a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:21:20 2012 -0400 Improve Alternate*Authority docs. Bug 6387. --- changes/bug6387 | 3 +++ doc/tor.1.txt | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug6387 b/changes/bug6387 new file mode 100644 index 0000000..73fc4f7 --- /dev/null +++ b/changes/bug6387 @@ -0,0 +1,3 @@ + o Documentation: + - Clarify the documentation for the Alternate*Authority options. + Fixes bug 6387. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a4a0ed7..78c3487 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -319,11 +319,14 @@ GENERAL OPTIONS **AlternateHSAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + **AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__:: - As DirServer, but replaces less of the default directory authorities. Using + These options behave as DirServer, but they replace fewer of the + default directory authorities. Using AlternateDirAuthority replaces the default Tor directory authorities, but - leaves the hidden service authorities and bridge authorities in place. - Similarly, Using AlternateHSAuthority replaces the default hidden service - authorities, but not the directory or bridge authorities. + leaves the default hidden service authorities and bridge authorities in + place. Similarly, AlternateHSAuthority replaces the default hidden + service authorities, but not the directory or bridge authorities; and + AlternateBridgeAuthority replaces the default bridge authority, + but leaves the directory and hidden service authorities alone. **DisableAllSwap** **0**|**1**:: If set to 1, Tor will attempt to lock all current and future memory pages,

1 0

[tor/release-0.2.3] Coverity 709056: Check return value on fputs in tor-gencert
by arma＠torproject.org 31 Jul '12

31 Jul '12

commit d32f5081e1c41324a3464c30c487c6ef57a333d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:38:39 2012 -0400 Coverity 709056: Check return value on fputs in tor-gencert --- changes/cov709056 | 4 ++++ src/tools/tor-gencert.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/cov709056 b/changes/cov709056 new file mode 100644 index 0000000..64a75ad --- /dev/null +++ b/changes/cov709056 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Check return value of fputs() when writing authority certificate + file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha. + diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index a8ffc07..38b2101 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -497,7 +497,12 @@ generate_certificate(void) return 1; } - fputs(buf, f); + if (fputs(buf, f) < 0) { + log_err(LD_GENERAL, "Couldn't write to %s: %s", + certificate_file, strerror(errno)); + fclose(f); + return 1; + } fclose(f); return 0; }

1 0

← Newer
1
2
3
4
5
6
7
8
...
95
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2012