From ff3793983bab720a35d1c13c3a6ba536d3c11e16 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Thu, 5 Sep 2013 17:41:39 +0100 Subject: [PATCH] Tue Mar 13 20:26:54 GMT 2012 david-sarah@jacaranda.org * Update more links from http: to https: in documentation and comments. --- docs/architecture.rst | 4 ++-- docs/backdoors.rst | 6 +++--- docs/configuration.rst | 2 +- docs/frontends/FTP-and-SFTP.rst | 18 +++++++++--------- docs/frontends/download-status.rst | 2 +- docs/frontends/drop-upload.rst | 16 ++++++++-------- docs/frontends/webapi.rst | 10 +++++----- docs/historical/historical_known_issues.txt | 6 +++--- docs/known_issues.rst | 6 +++--- docs/man/tahoe.1 | 8 ++++---- relnotes.txt | 2 +- setup.cfg | 4 ++-- src/allmydata/frontends/sftpd.py | 7 ++++--- src/allmydata/test/test_runner.py | 8 +++----- src/allmydata/web/status.py | 1 + src/allmydata/windows/fixups.py | 10 +++++----- 16 files changed, 55 insertions(+), 55 deletions(-) diff --git a/docs/architecture.rst b/docs/architecture.rst index 3a9e08fb..9e016e04 100644 --- a/docs/architecture.rst +++ b/docs/architecture.rst @@ -44,7 +44,7 @@ copies files from the local disk onto the decentralized filesystem. We later provide read-only access to those files, allowing users to recover them. There are several other applications built on top of the Tahoe-LAFS filesystem (see the `RelatedProjects -`_ page of the +`_ page of the wiki for a list). @@ -158,7 +158,7 @@ that doesn't match the capability you used to refer to that file. The filesystem layer (described below) adds human-meaningful names atop the key-value layer. -.. _`Zooko's Triangle`: http://en.wikipedia.org/wiki/Zooko%27s_triangle +.. _`Zooko's Triangle`: https://en.wikipedia.org/wiki/Zooko%27s_triangle Server Selection diff --git a/docs/backdoors.rst b/docs/backdoors.rst index 4b9c2edd..6c4ce3fc 100644 --- a/docs/backdoors.rst +++ b/docs/backdoors.rst @@ -11,7 +11,7 @@ to encrypted data. (login required; username/password pairs available at `bugmenot`_). -.. _recently reported: http://www.nytimes.com/2010/09/27/us/27wiretap.html +.. _recently reported: https://www.nytimes.com/2010/09/27/us/27wiretap.html .. _bugmenot: http://www.bugmenot.com/view/nytimes.com Commentary by the `Electronic Frontier Foundation`_, `Peter Suderman / @@ -31,8 +31,8 @@ exploitable by other parties (a notable example being the Greek cellphone eavesdropping scandal in 2004/5). RFCs `1984`_ and `2804`_ elaborate on the security case against such backdoors. -.. _1984: http://tools.ietf.org/html/rfc1984 -.. _2804: http://tools.ietf.org/html/rfc2804 +.. _1984: https://tools.ietf.org/html/rfc1984 +.. _2804: https://tools.ietf.org/html/rfc2804 Note that since Tahoe-LAFS is open-source software, forks by people other than the current core developers are possible. In that event, we would try to diff --git a/docs/configuration.rst b/docs/configuration.rst index b4a22fea..aeb4e3f5 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -44,7 +44,7 @@ The item descriptions below use the following types: a Twisted listening-port specification string, like "``tcp:80``" or "``tcp:3456:interface=127.0.0.1``". For a full description of the format, see `the Twisted strports documentation - `_. + `_. Please note, if interface= is not specified, Tahoe-LAFS will attempt to bind the port specified on all interfaces. diff --git a/docs/frontends/FTP-and-SFTP.rst b/docs/frontends/FTP-and-SFTP.rst index a5864e81..2fa812ce 100644 --- a/docs/frontends/FTP-and-SFTP.rst +++ b/docs/frontends/FTP-and-SFTP.rst @@ -190,7 +190,7 @@ isn't very useful except for testing. For further information on SFTP compatibility and known issues with various clients and with the sshfs filesystem, see -``_. +``_. Dependencies ============ @@ -237,25 +237,25 @@ Known Issues ============ Mutable files are not supported by the FTP frontend (`ticket #680 -`_). Currently, a directory +`_). Currently, a directory containing mutable files cannot even be listed over FTP. The FTP frontend sometimes fails to report errors, for example if an upload fails because it does meet the "servers of happiness" threshold (`ticket -#1081 `_). Upload errors +#1081 `_). Upload errors also may not be reported when writing files using SFTP via sshfs (`ticket -#1059 `_). +#1059 `_). Non-ASCII filenames are not supported by FTP (`ticket #682 -`_). They can be used with +`_). They can be used with SFTP only if the client encodes filenames as UTF-8 (`ticket #1089 -`_). +`_). The gateway node may hang or consume 100% CPU if the client tries to rekey. -(`ticket #1297 `_). This -is due to `a bug in Twisted `_ +(`ticket #1297 `_). This +is due to `a bug in Twisted `_ which was fixed in Twisted 11.0 (released 3-April-2011). For options to disable rekeying in various clients in order to work around this issue, and for other known issues in SFTP, see -``_. +``_. diff --git a/docs/frontends/download-status.rst b/docs/frontends/download-status.rst index 7aa45673..4de60f54 100644 --- a/docs/frontends/download-status.rst +++ b/docs/frontends/download-status.rst @@ -21,7 +21,7 @@ document is to explain what it all means. It was written by Brian Warner, who wrote the v1.8.0 downloader code and the code which generates this status report about the v1.8.0 downloader's behavior. Brian posted it to the trac: -http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1169#comment:1 +https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1169#comment:1 Then Zooko lightly edited it while copying it into the docs/ directory. diff --git a/docs/frontends/drop-upload.rst b/docs/frontends/drop-upload.rst index 02746882..41c10fd0 100644 --- a/docs/frontends/drop-upload.rst +++ b/docs/frontends/drop-upload.rst @@ -132,11 +132,11 @@ Unicode names are supported, but the local name of a file must be encoded correctly in order for it to be uploaded. The expected encoding is that printed by ``python -c "import sys; print sys.getfilesystemencoding()"``. -.. _`#1105`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1105 -.. _`#1430`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1430 -.. _`#1431`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1431 -.. _`#1432`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1432 -.. _`#1433`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1433 -.. _`#1449`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1449 -.. _`#1458`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1458 -.. _`#1459`: http://tahoe-lafs.org/trac/tahoe-lafs/ticket/1459 +.. _`#1105`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1105 +.. _`#1430`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1430 +.. _`#1431`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1431 +.. _`#1432`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1432 +.. _`#1433`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1433 +.. _`#1449`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1449 +.. _`#1458`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1458 +.. _`#1459`: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/1459 diff --git a/docs/frontends/webapi.rst b/docs/frontends/webapi.rst index 47ab7542..aab45dcc 100644 --- a/docs/frontends/webapi.rst +++ b/docs/frontends/webapi.rst @@ -52,7 +52,7 @@ This string is actually a Twisted "strports" specification, meaning you can get more control over the interface to which the server binds by supplying additional arguments. For more details, see the documentation on `twisted.application.strports -`_. +`_. Writing "tcp:3456:interface=127.0.0.1" into the web.port line does the same but binds to the loopback interface, ensuring that only the programs on the @@ -74,7 +74,7 @@ with it (such as read or modify the contents). This identifier is called a "read-cap" or "write-cap", depending upon whether it enables read-only or read-write access. These "caps" are also referred to as URIs (which may be confusing because they are not currently `RFC3986 -`_-compliant URIs). +`_-compliant URIs). The Tahoe web-based API is "REST-ful", meaning it implements the concepts of "REpresentational State Transfer": the original scheme by which the World @@ -2058,7 +2058,7 @@ the ``logs/twistd.log`` file. HTTP does not provide a mechanism to specify the character set used to encode non-ASCII names in URLs - (`RFC3986#2.1 `_). + (`RFC3986#2.1 `_). We prefer the convention that the ``filename=`` argument shall be a URL-escaped UTF-8 encoded Unicode string. For example, suppose we want to provoke the server into using a filename of @@ -2086,14 +2086,14 @@ the ``logs/twistd.log`` file. (note, the last four bytes of that line, not including the newline, are 0xC3 0xA9 0x65 0x22) - `RFC2231#4 `_ + `RFC2231#4 `_ (dated 1997): suggests that the following might work, and `some developers have reported `_ that it is supported by Firefox (but not IE7):: #2: Content-Disposition: attachment; filename*=utf-8''fianc%C3%A9e - My reading of `RFC2616#19.5.1 `_ + My reading of `RFC2616#19.5.1 `_ (which defines Content-Disposition) says that the filename= parameter is defined to be wrapped in quotes (presumably to allow spaces without breaking the parsing of subsequent parameters), which would give us:: diff --git a/docs/historical/historical_known_issues.txt b/docs/historical/historical_known_issues.txt index 3756d6ce..d43ba243 100644 --- a/docs/historical/historical_known_issues.txt +++ b/docs/historical/historical_known_issues.txt @@ -3,11 +3,11 @@ Below is a list of known issues in older releases of Tahoe-LAFS, and how to manage them. The current version of this file can be found at -http://tahoe-lafs.org/source/tahoe/trunk/docs/historical/historical_known_issues.txt +https://tahoe-lafs.org/source/tahoe/trunk/docs/historical/historical_known_issues.txt Issues in newer releases of Tahoe-LAFS can be found at: -http://tahoe-lafs.org/source/tahoe/trunk/docs/known_issues.rst +https://tahoe-lafs.org/source/tahoe/trunk/docs/known_issues.rst == issues in Tahoe v1.8.2, released 30-Jan-2011 == @@ -177,7 +177,7 @@ mutable files, you may be able to avoid the potential for "rollback" failure. A future version of Tahoe will include a fix for this issue. Here is -[http://tahoe-lafs.org/pipermail/tahoe-dev/2008-May/000630.html the +[https://tahoe-lafs.org/pipermail/tahoe-dev/2008-May/000630.html the mailing list discussion] about how that future version will work. diff --git a/docs/known_issues.rst b/docs/known_issues.rst index 86a5176e..f9ee8942 100644 --- a/docs/known_issues.rst +++ b/docs/known_issues.rst @@ -147,9 +147,9 @@ Opera also has a similar facility that is disabled by default. A previous version of this file stated that Firefox had abandoned their phishing filter; this was incorrect. -.. _a brief description of their filter's operation: http://blogs.msdn.com/ie/archive/2005/09/09/463204.aspx -.. _"safe browsing API": http://code.google.com/apis/safebrowsing/ -.. _specification: http://code.google.com/p/google-safe-browsing/wiki/Protocolv2Spec +.. _a brief description of their filter's operation: https://blogs.msdn.com/ie/archive/2005/09/09/463204.aspx +.. _"safe browsing API": https://code.google.com/apis/safebrowsing/ +.. _specification: https://code.google.com/p/google-safe-browsing/wiki/Protocolv2Spec .. _Firefox bugzilla ticket #368255: https://bugzilla.mozilla.org/show_bug.cgi?id=368255 diff --git a/docs/man/tahoe.1 b/docs/man/tahoe.1 index 15c611af..957c256f 100644 --- a/docs/man/tahoe.1 +++ b/docs/man/tahoe.1 @@ -277,14 +277,14 @@ and dozens of others. This manpage was originally written by bertagaz. .SH REPORTING BUGS .PP -Please see . +Please see . .PP For known security issues see -. +. .PP -Tahoe-LAFS home page: +Tahoe-LAFS home page: .PP -tahoe-dev mailing list: +tahoe-dev mailing list: .SH COPYRIGHT .PP 2006\[en]2011 \@ AllMyData, Inc. diff --git a/relnotes.txt b/relnotes.txt index df61865e..4e03a513 100644 --- a/relnotes.txt +++ b/relnotes.txt @@ -147,5 +147,5 @@ Rainhill, Merseyside, UK [9] https://tahoe-lafs.org/trac/tahoe-lafs/browser/CREDITS [10] https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Dev [11] http://atlasnetworks.us/ -[12] http://leastauthority.com/ +[12] https://leastauthority.com/ [13] https://tahoe-lafs.org/hacktahoelafs/ diff --git a/setup.cfg b/setup.cfg index 64210af2..88cebb15 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,7 +13,7 @@ zip_ok=False # tahoe-deps/ and ../tahoe-deps/ before it resorts to downloading them from # PyPI. -# http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-deps.tar.gz contains a +# https://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-deps.tar.gz contains a # bundle of these dependencies (as Python source distributions or "sdists"). So # it you want to avoid the build-time download (say, if you're on an airplane, # or a desert island), just grab a copy and unpack it in your tahoe darcs tree. @@ -34,7 +34,7 @@ find_links=misc/dependencies tahoe-deps ../tahoe-deps # Other sites that we might want to list: # http://sourceforge.net/project/showfiles.php?group_id=78018&package_id=79063 # http://pypi.python.org/pypi/pywin32 -# (See http://tahoe-lafs.org/trac/tahoe-lafs/ticket/142 .) +# (See ticket #142.) [aliases] build = darcsver --count-all-patches develop --prefix=support make_executable build diff --git a/src/allmydata/frontends/sftpd.py b/src/allmydata/frontends/sftpd.py index 887786e7..f148384d 100644 --- a/src/allmydata/frontends/sftpd.py +++ b/src/allmydata/frontends/sftpd.py @@ -150,9 +150,10 @@ def _lsLine(name, attrs): # We don't know how many links there really are to this object. st_nlink = 1 - # Based on . - # We can't call the version in Twisted because we might have a version earlier than - # (released in Twisted 8.2). + # Based on . + # We previously could not call the version in Twisted because we needed the change + # (released in Twisted v8.2). + # Since we now depend on Twisted v10.1, consider calling Twisted's version. mode = st_mode perms = array.array('c', '-'*10) diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index 51b4b04f..6dd8b634 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -128,8 +128,7 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, RunBinTahoeMixin): self._check_right_code(lines[1]) d.addCallback(_cb) return d - # The timeout was exceeded on FreeStorm's CentOS: - # http://tahoe-lafs.org/buildbot/builders/FreeStorm%20CentOS5-i386/builds/503/steps/test/logs/stdio + # The timeout was exceeded on FreeStorm's CentOS5-i386. test_import_in_repl.timeout = 480 def test_path(self): @@ -467,11 +466,10 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin, d.addCallback(_after_stopping) d.addBoth(self._remove, HOTLINE_FILE) return d + # This test has hit a 240-second timeout on our feisty2.5 buildslave, and a 480-second timeout + # on Francois's Lenny-armv5tel buildslave. test_introducer.timeout = 960 - # This test hit the 120-second timeout on "Francois Lenny-armv5tel", then it hit a 240-second timeout on our feisty2.5 buildslave: http://allmydata.org/buildbot/builders/feisty2.5/builds/2381/steps/test/logs/test.log - # Then it hit the 480 second timeout on Francois's machine: http://tahoe-lafs.org/buildbot/builders/FranXois%20lenny-armv5tel/builds/449/steps/test/logs/stdio - def test_client_no_noise(self): self.skip_if_cannot_daemonize() diff --git a/src/allmydata/web/status.py b/src/allmydata/web/status.py index ed28e5d6..3c71c8be 100644 --- a/src/allmydata/web/status.py +++ b/src/allmydata/web/status.py @@ -975,6 +975,7 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): started = self.update_status.get_started() total = self.update_status.timings.get("total") per_server = self.update_status.timings.get("per_server") + # We'd like to use an https: URL here, but the site has a domain/cert mismatch. base = "http://chart.apis.google.com/chart?" pieces = ["cht=bhs"] pieces.append("chco=ffffff,4d89f9,c6d9fd") # colors diff --git a/src/allmydata/windows/fixups.py b/src/allmydata/windows/fixups.py index 719abd2d..eaf5d5eb 100644 --- a/src/allmydata/windows/fixups.py +++ b/src/allmydata/windows/fixups.py @@ -14,7 +14,7 @@ def initialize(): from allmydata.util import log from allmydata.util.encodingutil import canonical_encoding - # + # SetErrorMode = WINFUNCTYPE(UINT, UINT)(("SetErrorMode", windll.kernel32)) SEM_FAILCRITICALERRORS = 0x0001 SEM_NOOPENFILEERRORBOX = 0x8000 @@ -36,18 +36,18 @@ def initialize(): # Make Unicode console output work independently of the current code page. # This also fixes . - # Credit to Michael Kaplan + # Credit to Michael Kaplan # and TZOmegaTZIOY # . try: - # + # # HANDLE WINAPI GetStdHandle(DWORD nStdHandle); # returns INVALID_HANDLE_VALUE, NULL, or a valid handle # - # + # # DWORD WINAPI GetFileType(DWORD hFile); # - # + # # BOOL WINAPI GetConsoleMode(HANDLE hConsole, LPDWORD lpMode); GetStdHandle = WINFUNCTYPE(HANDLE, DWORD)(("GetStdHandle", windll.kernel32)) -- 2.45.2