Check whether current hidden service dir is the same as other hidden service dir

meejah / txtorcon

Twisted-based asynchronous Tor control protocol implementation. Includes unit-tests, examples, state-tracking code and configuration abstraction.

http://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/

MIT License

250 stars 72 forks source link

Check whether current hidden service dir is the same as other hidden service dir #103

Closed sambuddhabasu closed 9 years ago

sambuddhabasu commented 9 years ago

In case that the current hidden service dir is the same as the dir of any other hidden services, then change the current hidden service dir.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling e423ad6290f87ec83f6545bf070344754006ef60 on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling e423ad6290f87ec83f6545bf070344754006ef60 on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

meejah commented 9 years ago

I wonder if we can just simplify this to a single "if", like: "if hsdir not in map(lambda hs: hs.dir, self.config.hiddenservices)" or similar...?

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling ef2adc644723b2e811d7b906786443a30a90f9ce on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling ef2adc644723b2e811d7b906786443a30a90f9ce on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling ef2adc644723b2e811d7b906786443a30a90f9ce on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

meejah commented 9 years ago

As I hinted at in IRC, I think you want to add an assert like so to the test_multiple_listen() test:

            self.assertEqual(len(self.config.hiddenservices), 1)

(e.g. inside the inner check() function) and then fix that problem, by checking in listen() to see if we've already added our HiddenService object or not before changing the config.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling 38d48515d3baa3fcac7f238850eb8c50d483fc8b on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling 65090c29ef5396828957beb2db830529d12c6f04 on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

sambuddhabasu commented 9 years ago

Yes that works, updating the pull request. Thanks

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling 1867aa5047b88b64ec14e108c588bc7031a671e3 on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling 1867aa5047b88b64ec14e108c588bc7031a671e3 on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.

coveralls commented 9 years ago

Coverage increased (+0.0%) to 99.92% when pulling 944c107cc1d64f2ddebf4ff2d7c6847b95d72939 on sammyshj:fixendpointlisten into ccbfa243498dc2c498e090178b3255115c46216a on meejah:master.