summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | Merge branch 'fix/10333-index-by-0L_r2' into ↵Isis Lovecruft2013-12-11
| |\ \ | | | | | | | | | | | | fix/9462-refactor-netstatus-parsers_r9462C_r2
| | * | Add two unittests for PortList.__getitem__ to debug #10333.fix/10333-index-by-0L_r2Isis Lovecruft2013-12-11
| | | |
| | * | Make PortList.__getitem__ unittest more explicit.Isis Lovecruft2013-12-11
| | | |
| | * | Fix two unittests for PortList.__getitem__().Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | | | | * FIXES two unittests which erroneously passed before the previous commit which fixed #10333, and then erroneously failed after the fix. They should now correctly test indexing the portlist.
| * | | Merge branch 'fix/10333-index-by-0L_r2' into ↵Isis Lovecruft2013-12-11
| |\ \ \ | | |/ / | | | | | | | | fix/9462-refactor-netstatus-parsers_r9462C_r2
| | * | Fix an error where `PortList`s could not be indexed by strings.Isis Lovecruft2013-12-11
| |/ / | | | | | | | | | | | | | | | The `long` in #10333 should index the PortList as a string, not an integer. * FIXES #10333
| * | Fix lengths of base64 fields in unittests for parseRLine().Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | In real `@type bridge-networkstatus` documents, the base64 fields are 27 characters in length, not 29 characters.
| * | Update unittest parameter docstrings for parseRLine() tests.Isis Lovecruft2013-12-11
| | |
| * | Remove trailing '='s from unittests for networkstatus.parseRLine().Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Because of the bug fixed in the last commit, two unittests in `test_parse_networkstatus.ParseNetworkStatusRLineTests` now FAIL. They are: ø test_invalidDescriptorDigest_missingBase64padding ø test_invalidIPAddress
| * | Add base64 padding to networkstatus 'descDigest' field.Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The trailing '='s in the "descriptor digest" field of an `@type-bridge-networkstatus` descriptor are removed before placing them in the descriptor. Therefore, before un-base64-encoding this field, we must re-add the trailing '='s character padding back in, the same as we already to for the "identity digest" field on that same descriptor line. * FIXES a bug in function `bridgedb.parse.networkstatus.parseRLine()` which resulted in the "descriptor digest" field (and all fields after it on the 'r'-line) being set to `None`, due to a base64 decoding error from missing '=' character padding.
| * | Fix typo in inline comment in bridgedb.parse.networkstatus.parseRLine().Isis Lovecruft2013-12-11
| | |
| * | Add more parser logging to Bridges.parseStatusFile().Isis Lovecruft2013-12-11
| | | | | | | | | | | | * FIXES part of #9377
| * | Condense two log calls into one in Bridges.parseExtraInfo().Isis Lovecruft2013-12-11
| | |
| * | Move Bridges.getConfigLine() documentation into function docstring.Isis Lovecruft2013-12-11
| | |
| * | Change `PortList` to `addr.PortList` in bridgedb.Bridges module.Isis Lovecruft2013-12-11
| | |
| * | Fix an iter-over-null-value bug in Dist.IPBasedDistributor class.Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | In the initialisor of Dist.IPBasedDistributor, the `ipCatagories` and `answerParameters` both default to `None` and then they are immediately iterated over.
| * | Do not catch general Exceptions in isValidRouterNickname.Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | General exceptions here are never raised, and all exceptions which are raised are handled by the calling function, parseRLine().
| * | Refactor networkstatus.parseALine() raise/return more sane values.Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were some cases raised within the unittests where, when the IP address had failed to parse, `networkstatus.parseALine()` would return an `addr.PortList` and `None` (for the IP). Having a PortList without an IP address is useless, so instead we should deal with parsing the IP first, and checking its validity. Then, if we have the IP, we should parse and check the ports, then create the PortList. * CHANGE logic of the bridgedb.parse.networkstatus.parseALine() function so that all of the parsing takes place in one `try:` block, and the `except`s catch any and all raised errors, logging messages and reseting variables to None as appropriate. * ADD a FutureWarning if we ever see a networkstatus document with a valid IPc4 address as one of its `ORAddress`es, because this means that tor/torspec and the descriptors have changed format. * CHANGE networkstatus.parseALine() to only return a PortList if an IP address was successfully parsed.
| * | Catch all parser exceptions in parse.networkstatus.parseRLine().Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than raising exceptions during parsing, we should try to log appropriate messages. If the error had a known cause, i.e. one that is due to a badly formatted descriptor, then we should make note of the relevant information from the bad descriptor, and reset any affected variables to None. If the error is possibly do to a newly implemented change in the descriptor format in tor, we should likewise log the event, generate a loud warning about a possible descriptor format change, and continue as before. In networkstatus documents and [bridge-]server-descriptors, it is possible that the `ORAddress` lines may soon change (#9729): 1. to allow more than one ORAddress line, and 2. to allow extra IPv4 addresses in the ORAddress lines. Additionally, remove exception and handlers which are never raised in parseRLine(). 1. The catch for `IndexError`s in networkstatus.parseRLine() is removed: At the beginning of `parseRLine()`, a `NetworkstatusParsingError` is raised if there are less than eight fields in the descriptor, so there is no way that an `IndexError` would ever get raised. Coverage branch reports also show that this `except:` block is never touched. 2. Remove the `InvalidNetworkstatusDescriptorDigest` exception class: …as well as all corresponding code for raising and handling it. The way it was used, there is no possible way that these lines will get executed, because the descriptor digest will either be a str or None. If None, then an error is raised earlier for having too few fields in the 'r'-line. If a str, then `binascii.a2b_base64() will always produce some kind of string, and its exceptions are handled separate. Therefore, there is no way for the descriptor digest to be 0, None, or False. In `bridgedb.parse.networkstatus.parseRLine()` function: * CHANGE to catch and handle all `InvalidNetworkstatusRouterIdentity`, and `NetworkstatusParsingErrors`, exceptions raised during parsing. * REMOVE unnecessary `except IndexError` block. * REMOVE `InvalidNetworkstatusDescriptorDigest` exception class. * CHANGE logging of caught exceptions to use `exc`, not `exc.message`. The later has been deprecated since Python2.6.
| * | Remove line that duplicated setting the flags in parseSLine().Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The lines following this one (i.e. ``stable = 'Stable' in flags``) ensure that if a particular flags isn't present in the flags, then the variable is false; there is no need to set each variable twice. * REMOVE duplicate variable instantiation/setting from bridgedb.parse.networkstatus.parseSLine() function.
| * | Fix a log message in networkstatus.parseSLine() function.Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | Before, it was only printing whatever was originally found in the networkstatus line, *not* which flags we had successfully parsed. Since we only actually care that we are correctly able to parse relevant flags, that is what the log message should contain.
| * | Remove unused exception ParseORAddressError from bridgedb.Bridges.Isis Lovecruft2013-12-11
| | |
| * | Move constant ALPHANUMERIC into function isValidRouterNickname().Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | It isn't used anywhere else, and it would be silly to import it from here, so there is no reason to have it at the module level.
| * | Remove one EOL whitespace in networkstatus module docstring.Isis Lovecruft2013-12-11
| | |
| * | Document the `fingerprint` parameter in networkstatus.parseALine().Isis Lovecruft2013-12-11
| | |
| * | Add class variable docs to ParseNetworkstatusRLineTests unittests.Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | * ADD documentation on default variables and how the unittest setup methods are used.
| * | Add unittests for bridgedb.parse.networkstatus.parseSLine().Isis Lovecruft2013-12-11
| | |
| * | Add unittests for bridgedb.parse.networkstatus.parseALine().Isis Lovecruft2013-12-11
| | |
| * | Refactor unittests for bridgedb.parse.networkstatus.parseRLine().Isis Lovecruft2013-12-11
| | |
| * | Change parameter `x` → `port` in addr.PortList.__getitem__().Isis Lovecruft2013-12-11
| | |
| * | Remove an unexecuted `except` branch from addr.PortList.add().Isis Lovecruft2013-12-11
| | |
| * | Don't add duplicate ports to an addr.PortList.Isis Lovecruft2013-12-11
| | |
| * | Stop parsing immediately if there is an invalid port in an addr.PortList.Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | | | | | | | This ensures that an addr.InvalidPort exception is raised when an invalid port is discovered, without continuing to parse the rest of the ports. The end result, i.e. when/if an exception is raised, stays exactly the same. This just operates more efficiently when there is a bad port number.
| * | Return the port if it passes addr.PortList._sanitycheck().Isis Lovecruft2013-12-11
| | | | | | | | | | | | This ensures that the return value has truthiness.
| * | Refactor addr.isValidIP() to give the reason for invalidity.Isis Lovecruft2013-12-11
| | |
| * | Remove `return` statement which is never executed in parse.addr._isIPv().Isis Lovecruft2013-12-11
| | |
| * | Do not check IP validity in parse.addr.isIPv4() and parse.addr.isIPv6().Isis Lovecruft2013-12-11
| | | | | | | | | | | | | | | We only want to know if it is IPv4 or IPv6, *not* if it conforms to all kinds of crazy routing RFCs.
| * | Numerous docstring improvements to bridgedb.parse.addr module.Isis Lovecruft2013-12-11
| | |
| * | Remove except handler which never gets executed in bridgedb.parse.addr.Isis Lovecruft2013-12-11
| | |
| * | Add __future__ imports to bridgedb.parse.addr.Isis Lovecruft2013-12-11
| | |
| * | Add glossary definitions to bridgedb.parse.addr module docstring.Isis Lovecruft2013-12-11
| | |
| * | Add unittests for bridgedb.parse.addr module.Isis Lovecruft2013-12-11
|/ /
* | Merge branch 'hotfix/9937-desc-gen_base64-padding-descDigest' into developIsis Lovecruft2013-12-11
|\ \
| * | Strip '='s from "descDigest" field in gen_bridge_descriptors.hotfix/9937-desc-gen_base64-padding-descDigestIsis Lovecruft2013-12-11
| | |
| * | Don't strip() crazy amount of trailing '='s in gen_bridge_descriptors.Isis Lovecruft2013-12-11
|/ / | | | | | | | | Base64 padding will only ever result in a maximum of two trailing '='s characters, not a gazillion.
* | Add Main.load() call back in, removed in 31b12521Isis Lovecruft2013-12-10
| |
* | Fix log in Main.load() that printed binary ID key digest.Isis Lovecruft2013-12-10
| |
* | Fix a log string concatenation in Main.load().Isis Lovecruft2013-12-10
| |
* | Merge branch 'feature/sphinx-docs' into developIsis Lovecruft2013-12-07
|\ \
| * | Remove the TODO header in doc builds for index.rst.feature/sphinx-docsIsis Lovecruft2013-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sphinx.ext.todo seem not to be working… It is supposed to work, I believe, by putting the following into a docstring: class Foo(object): """A foo. .. todo:: Do something about bar. """ And then the `.. todolist::` directive in Sphinx will find all such `.. todo::` directives in your code, and put them in a list (the way I was doing it, these would be on the index.html page) with links to where the `.. todo::` is in the source code. However, this seems to *only* work in docstrings proper in Python, the following do *not* get picked up by the `.. todolist::` Sphinx directive: * Normal Python inline comments, i.e.: # .. todo:: There is this thing we should do. * Sphinx attribute inline comments, i.e.: #: .. todo:: There is also another thing we should do. Because all of the TODOs in BridgeDB are currently within normal Python inline comments, the `.. todolist::` on the index page doesn't include anything, and thus there is an awkward looking, giant, blank header with nothing underneath it. Thus, I'm taking out the header, but leaving in the `.. todolist::` directive (so that we *can* use `.. todo::` in a proper docstring in the future and it will be automatically included in the documentation here).
generated by cgit v1.2.1 (git 2.18.0) at 2024-02-08 07:44:45 +0000