March 2016 - tor-commits - lists.torproject.org

[tordnsel/master] remove internal Control.DeepSeq
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit d210b013e36b46d1c16927aa22e45c7fe05bd7f5 Author: David Kaloper <david(a)numm.org> Date: Tue Oct 29 05:09:36 2013 +0100 remove internal Control.DeepSeq --- src/TorDNSEL/DNS/Internals.hs | 61 ++++++++++++++++++----------------------- src/TorDNSEL/DeepSeq.hs | 39 -------------------------- src/TorDNSEL/Socks/Internals.hs | 8 ++---- src/TorDNSEL/Util.hsc | 14 +--------- tordnsel.cabal | 3 +- 5 files changed, 31 insertions(+), 94 deletions(-) diff --git a/src/TorDNSEL/DNS/Internals.hs b/src/TorDNSEL/DNS/Internals.hs index 54d1c08..735d7a8 100644 --- a/src/TorDNSEL/DNS/Internals.hs +++ b/src/TorDNSEL/DNS/Internals.hs @@ -63,6 +63,7 @@ import qualified Control.Exception as E import Control.Monad (when, unless, replicateM, liftM2, liftM3, forM) import qualified Control.Monad.State as S import Control.Monad.Trans (lift) +import Control.DeepSeq import Data.Bits ((.|.), (.&.), xor, shiftL, shiftR, testBit, setBit) import Data.List (foldl') import qualified Data.ByteString as B @@ -81,7 +82,6 @@ import Data.Binary.Get (runGet, getWord16be, getByteString, bytesRead, lookAhead, skip, isEmpty) import Data.Binary.Put (runPut, putWord16be, putByteString, PutM) -import TorDNSEL.DeepSeq import TorDNSEL.Util -------------------------------------------------------------------------------- @@ -295,11 +295,11 @@ data Message = Message msgAdditional :: {-# UNPACK #-} ![ResourceRecord] } deriving (Eq, Show) -instance DeepSeq Message where - deepSeq (Message a b c d e f g h i j k l m n) = - deepSeq a . deepSeq b . deepSeq c . deepSeq d . deepSeq e . deepSeq f . - deepSeq g . deepSeq h . deepSeq i . deepSeq j . deepSeq k . deepSeq l . - deepSeq m $ deepSeq n +instance NFData Message where + rnf !msg = msgQuestion msg `deepseq` + msgAnswers msg `deepseq` + msgAuthority msg `deepseq` + msgAdditional msg `deepseq` () instance BinaryPacket Message where getPacket pkt = do @@ -365,8 +365,8 @@ data Question = Question qClass :: {-# UNPACK #-} !Class } deriving (Eq, Show) -instance DeepSeq Question where - deepSeq (Question a b c) = deepSeq a . deepSeq b $ deepSeq c +instance NFData Question where + rnf !q = rnf (qName q) instance BinaryPacket Question where getPacket pkt = liftM3 Question (getPacket pkt) get get @@ -436,6 +436,14 @@ data ResourceRecord rrData :: {-# UNPACK #-} !ByteString } deriving (Eq, Show) +instance NFData ResourceRecord where + rnf !rr = rrName rr `deepseq` + case rr of + A{} -> aAddr rr `deepseq` () + NS{} -> nsDName rr `deepseq` () + SOA{} -> soaMName rr `deepseq` soaRName rr `deepseq` () + _ -> () + instance BinaryPacket ResourceRecord where getPacket pkt = do name <- getPacket pkt @@ -493,21 +501,12 @@ instance BinaryPacket ResourceRecord where putByteString rData incrOffset (10 + B.length rData) -instance DeepSeq ResourceRecord where - deepSeq (A a b c) = deepSeq a . deepSeq b $ deepSeq c - deepSeq (NS a b c) = deepSeq a . deepSeq b $ deepSeq c - deepSeq (SOA a b c d e f g h i) = - deepSeq a . deepSeq b . deepSeq c . deepSeq d . deepSeq e . - deepSeq f . deepSeq g . deepSeq h $ deepSeq i - deepSeq (UnsupportedResourceRecord a b c d e) = - deepSeq a . deepSeq b . deepSeq c . deepSeq d $ deepSeq e - -- | A domain name. newtype DomainName = DomainName [Label] deriving (Eq, Show) -instance DeepSeq DomainName where - deepSeq (DomainName ls) = deepSeq ls +instance NFData DomainName where + rnf (DomainName ls) = rnf ls instance BinaryPacket DomainName where -- Read a DomainName as a sequence of 'Label's ending with either a null label @@ -545,6 +544,8 @@ instance BinaryPacket DomainName where newtype Label = Label { unLabel :: ByteString } deriving (Eq, Ord, Show) +instance NFData Label where + instance Binary Label where get = do len <- getWord8 @@ -554,9 +555,6 @@ instance Binary Label where putWord8 . fromIntegral . B.length $ label putByteString label -instance DeepSeq Label where - deepSeq (Label bs) = deepSeq bs - -- | A response code set by the name server. data RCode = NoError -- ^ No error condition. @@ -570,7 +568,7 @@ data RCode -- operation for policy reasons. deriving (Eq, Show) -instance DeepSeq RCode where deepSeq = seq +instance NFData RCode where -- | Specifies the kind of query in a message set by the originator. data OpCode @@ -579,7 +577,7 @@ data OpCode | ServerStatusRequest -- ^ A server status request. deriving (Eq, Show) -instance DeepSeq OpCode where deepSeq = seq +instance NFData OpCode where -- | The TYPE or QTYPE values that appear in resource records or questions, -- respectively. @@ -591,6 +589,8 @@ data Type | UnsupportedType {-# UNPACK #-} !Word16 -- ^ Any other type. deriving (Eq, Show) +instance NFData Type where + instance Binary Type where get = do t <- get @@ -607,13 +607,6 @@ instance Binary Type where put TAny = putWord16be 255 put (UnsupportedType t) = put t -instance DeepSeq Type where - deepSeq TA = id - deepSeq TNS = id - deepSeq TAny = id - deepSeq TSOA = id - deepSeq (UnsupportedType t) = deepSeq t - -- | The CLASS or QCLASS values that appear in resource records or questions, -- respectively. data Class @@ -622,6 +615,8 @@ data Class deriving (Eq, Show) -- XXX support * +instance NFData Class where + instance Binary Class where get = do c <- get @@ -631,7 +626,3 @@ instance Binary Class where put IN = putWord16be 1 put (UnsupportedClass c) = put c - -instance DeepSeq Class where - deepSeq IN = id - deepSeq (UnsupportedClass c) = deepSeq c diff --git a/src/TorDNSEL/DeepSeq.hs b/src/TorDNSEL/DeepSeq.hs deleted file mode 100644 index 8e28314..0000000 --- a/src/TorDNSEL/DeepSeq.hs +++ /dev/null @@ -1,39 +0,0 @@ ------------------------------------------------------------------------------ --- | --- Module : TorDNSEL.DeepSeq --- License : Public domain (see LICENSE) --- --- Maintainer : tup.tuple(a)googlemail.com --- Stability : alpha --- Portability : portable --- --- Deep strict evaluation. --- ------------------------------------------------------------------------------ - -module TorDNSEL.DeepSeq ( - DeepSeq(..) - , ($!!) - ) where - -import Data.ByteString (ByteString) -import Data.List (foldl') -import Data.Word (Word16, Word32) - --- | Deep strict evaluation. This is mainly used here to force any exceptional --- values contained in a data structure to show themselves. -class DeepSeq a where - deepSeq :: a -> b -> b - -infixr 0 `deepSeq`, $!! - -instance DeepSeq Bool where deepSeq = seq -instance DeepSeq Word16 where deepSeq = seq -instance DeepSeq Word32 where deepSeq = seq -instance DeepSeq ByteString where deepSeq = seq -instance DeepSeq a => DeepSeq [a] where - deepSeq = flip . foldl' . flip $ deepSeq - --- | Strict application, defined in terms of 'deepSeq'. -($!!) :: DeepSeq a => (a -> b) -> a -> b -f $!! x = x `deepSeq` f x diff --git a/src/TorDNSEL/Socks/Internals.hs b/src/TorDNSEL/Socks/Internals.hs index e556bf9..d6c91f7 100644 --- a/src/TorDNSEL/Socks/Internals.hs +++ b/src/TorDNSEL/Socks/Internals.hs @@ -49,11 +49,12 @@ import Data.Typeable (Typeable) import Network.Socket (HostAddress) import System.IO (Handle, BufferMode(NoBuffering), hClose, hSetBuffering) +import Control.DeepSeq + import Data.Binary (Binary(..), getWord8, putWord8) import Data.Binary.Get (runGet) import Data.Binary.Put (runPut, putWord32be, putByteString) -import TorDNSEL.DeepSeq import TorDNSEL.Util -------------------------------------------------------------------------------- @@ -97,8 +98,7 @@ data Response = Response , soRespPort :: {-# UNPACK #-} !Port -- ^ The destination port. } -instance DeepSeq Response where - deepSeq (Response a b c) = deepSeq a . deepSeq b $ deepSeq c +instance NFData Response where -- | A Socks4 result code. data Result @@ -118,8 +118,6 @@ instance Show Result where show IdentdMismatch = "Request rejected because the client program and \ \identd report different user-ids" -instance DeepSeq Result where deepSeq = seq - -------------------------------------------------------------------------------- -- Serialization diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index a2357d8..76c6525 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -132,22 +132,13 @@ import Network.Socket import System.Directory (doesFileExist, removeFile) import System.Environment (getProgName) import System.Exit (exitWith, ExitCode) -import System.IO (hPutStr) +import System.IO (Handle, hPutStr) import System.IO.Error (isEOFError) import System.Posix.Files (setFileMode) import System.Posix.Types (FileMode) import Text.Printf (printf) - -import GHC.Handle - (wantReadableHandle, fillReadBuffer, readCharFromBuffer, ioe_EOF) -import GHC.IOBase - ( Handle, Handle__(..), Buffer(..), readIORef, writeIORef - , BufferMode(NoBuffering) ) - import Data.Binary (Binary(..)) -import TorDNSEL.DeepSeq - #include <netinet/in.h> -------------------------------------------------------------------------------- @@ -613,9 +604,6 @@ instance Binary Port where get = Port `fmap` get put = put . unPort -instance DeepSeq Port where - deepSeq = seq . unPort - -- | Parse a port, returning the result or 'throwError' in the monad if parsing -- fails. parsePort :: MonadError ShowS m => ByteString -> m Port diff --git a/tordnsel.cabal b/tordnsel.cabal index c27fa2b..23fa628 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -13,7 +13,7 @@ Maintainer: tup.tuple(a)googlemail.com, lunar(a)debian.org, andrew(a)torproject.o Build-Type: Simple Build-Depends: base>=2.0, network>=2.0, mtl>=1.0, unix>=1.0, stm>=2.0, time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, - containers>=0.1 + containers>=0.1, deepseq >= 1.3 Tested-With: GHC==6.6, GHC==6.8, GHC==6.10, GHC==6.12 Data-Files: config/tordnsel.conf.sample, contrib/cacti-input.pl, contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 @@ -25,7 +25,6 @@ Other-Modules: TorDNSEL.Config, TorDNSEL.Control.Concurrent.Link, TorDNSEL.Control.Concurrent.Link.Internals, TorDNSEL.Control.Concurrent.Util, - TorDNSEL.DeepSeq, TorDNSEL.Directory, TorDNSEL.Directory.Internals, TorDNSEL.DistinctQueue,

1 0

[translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 04 Mar '16

04 Mar '16

commit 57592b13377d2db50ab5d8bc599ced6431b704df Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:17:02 2016 +0000 Update translations for torbutton-abouttbupdatedtd_completed --- el/abouttbupdate.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/el/abouttbupdate.dtd b/el/abouttbupdate.dtd new file mode 100644 index 0000000..2462974 --- /dev/null +++ b/el/abouttbupdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Αναβάθμιση του Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Ο Tor Browser αναβαθμίστηκε."> +<!ENTITY aboutTBUpdate.linkPrefix "Για τις πιο πρόσφατες πληροφορίες για αυτή την έκδοση,"> +<!ENTITY aboutTBUpdate.linkLabel "επισκεφθείτε την ιστοσελίδα μας"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Αλλαγές:">

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 04 Mar '16

04 Mar '16

commit 12b843ba4ae87682687a803f2c2282f5567ddffb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:16:58 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- el/abouttbupdate.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/el/abouttbupdate.dtd b/el/abouttbupdate.dtd index 565f3cf..2462974 100644 --- a/el/abouttbupdate.dtd +++ b/el/abouttbupdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "Για τις πιο πρόοσφατες πληροφορίες για αυτή την έκδοση,"> +<!ENTITY aboutTBUpdate.title "Αναβάθμιση του Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Ο Tor Browser αναβαθμίστηκε."> +<!ENTITY aboutTBUpdate.linkPrefix "Για τις πιο πρόσφατες πληροφορίες για αυτή την έκδοση,"> <!ENTITY aboutTBUpdate.linkLabel "επισκεφθείτε την ιστοσελίδα μας"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Αλλαγές:">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 04 Mar '16

04 Mar '16

commit 87b56f61fd557e9cc1277ba5db52d3caa6ea508c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:15:52 2016 +0000 Update translations for abouttor-homepage_completed --- el/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd index 25be8b3..9e39dcc 100644 --- a/el/aboutTor.dtd +++ b/el/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Σχετικά με το Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ΟΜΩΣ, αυτός ο browser είναι παλιά έκδοση."> +<!ENTITY aboutTor.outOfDateTorOn.label "ΠΡΟΣΟΧΗ: αυτός ο browser είναι ξεπερασμένος."> <!ENTITY aboutTor.outOfDateTorOff.label "ΕΠΙΣΗΣ, αυτός ο browser είναι παλιά έκδοση."> <!ENTITY aboutTor.outOfDate2.label "Πατήστε το κρεμμύδι και μετά επιλέξτε "Έλεγχος για Αναβάθμιση του Tor Browser". "> <!ENTITY aboutTor.check.label "Δοκιμή Ρυθμίσεων του Δικτύου Tor"> -<!ENTITY aboutTor.success.label "Συγχαρητήρια!"> -<!ENTITY aboutTor.success2.label "Αυτός ο browser είναι ρυθμισμένος να χρησιμοποιεί το Tor."> +<!ENTITY aboutTor.success.label "Καλωσήλθες στον Tor Browser"> +<!ENTITY aboutTor.success2.label "Συνδεθήκαμε στο δίκτυο Tor."> <!ENTITY aboutTor.success3.label "Είστε πλέον ελεύθερος να πλογηθείτε ανώνυμα στο Διαδίκτυο."> <!ENTITY aboutTor.failure.label "Κάτι πήγε στραβά!"> <!ENTITY aboutTor.failure2.label "Το Tor δεν λειτουργεί σε αυτόν τον browser.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 04 Mar '16

04 Mar '16

commit 8138d6c7ba49d1a565e7604a7074bf794da941b8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:15:48 2016 +0000 Update translations for abouttor-homepage --- el/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd index c0dae05..9e39dcc 100644 --- a/el/aboutTor.dtd +++ b/el/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Σχετικά με το Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "ΠΡΟΣΟΧΗ: αυτός ο browser είναι ξεπερασμένος."> <!ENTITY aboutTor.outOfDateTorOff.label "ΕΠΙΣΗΣ, αυτός ο browser είναι παλιά έκδοση."> <!ENTITY aboutTor.outOfDate2.label "Πατήστε το κρεμμύδι και μετά επιλέξτε "Έλεγχος για Αναβάθμιση του Tor Browser". "> <!ENTITY aboutTor.check.label "Δοκιμή Ρυθμίσεων του Δικτύου Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Καλωσήλθες στον Tor Browser"> +<!ENTITY aboutTor.success2.label "Συνδεθήκαμε στο δίκτυο Tor."> <!ENTITY aboutTor.success3.label "Είστε πλέον ελεύθερος να πλογηθείτε ανώνυμα στο Διαδίκτυο."> <!ENTITY aboutTor.failure.label "Κάτι πήγε στραβά!"> <!ENTITY aboutTor.failure2.label "Το Tor δεν λειτουργεί σε αυτόν τον browser.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 04 Mar '16

04 Mar '16

commit ced7f322780547e00b43f2a67ff4e018b2c8273d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:15:39 2016 +0000 Update translations for tor-launcher-network-settings --- el/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/network-settings.dtd b/el/network-settings.dtd index d776892..5b71f94 100644 --- a/el/network-settings.dtd +++ b/el/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Ρύθμιση "> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Θέλω να συνδεθώ απ'ευθείας στο δίκτυο Tor."> <!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> <!ENTITY torSettings.connect "Σύνδεση">

1 0

[tordnsel/master] remove compatibility shim for Control.Exception
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit 45e962d5fd0100fe3a603b7c450d4ac624be42ae Author: David Kaloper <david(a)numm.org> Date: Thu Aug 8 03:16:14 2013 +0200 remove compatibility shim for Control.Exception --- src/TorDNSEL/Compat/Exception.hs | 26 ----------------------- src/TorDNSEL/Config/Internals.hs | 2 +- src/TorDNSEL/Control/Concurrent/Future.hs | 2 +- src/TorDNSEL/Control/Concurrent/Link/Internals.hs | 2 +- src/TorDNSEL/Control/Concurrent/Util.hs | 2 +- src/TorDNSEL/DNS/Internals.hs | 2 +- src/TorDNSEL/DNS/Server/Internals.hs | 2 +- src/TorDNSEL/Directory/Internals.hs | 2 +- src/TorDNSEL/ExitTest/Initiator/Internals.hs | 2 +- src/TorDNSEL/ExitTest/Server/Internals.hs | 2 +- src/TorDNSEL/Log/Internals.hsc | 2 +- src/TorDNSEL/Main.hsc | 2 +- src/TorDNSEL/NetworkState/Internals.hs | 2 +- src/TorDNSEL/NetworkState/Storage/Internals.hs | 2 +- src/TorDNSEL/Socks/Internals.hs | 2 +- src/TorDNSEL/Statistics/Internals.hs | 2 +- src/TorDNSEL/TorControl/Internals.hs | 2 +- src/TorDNSEL/Util.hsc | 2 +- 18 files changed, 17 insertions(+), 43 deletions(-) diff --git a/src/TorDNSEL/Compat/Exception.hs b/src/TorDNSEL/Compat/Exception.hs deleted file mode 100644 index b206513..0000000 --- a/src/TorDNSEL/Compat/Exception.hs +++ /dev/null @@ -1,26 +0,0 @@ -{-# LANGUAGE CPP #-} - ------------------------------------------------------------------------------ --- | --- Module : TorDNSEL.Compat.Exception --- Copyright : (c) tup 2007 --- License : Public domain (see LICENSE) --- --- Maintainer : tup.tuple(a)googlemail.com --- Stability : alpha --- Portability : non-portable (pattern guards, bang patterns, concurrency, --- STM, FFI) --- --- Ensure compatibility between several GHC versions on exception handling. --- ------------------------------------------------------------------------------ - -module TorDNSEL.Compat.Exception ( - module Exception - ) where - -#if __GLASGOW_HASKELL__ == 610 -import Control.OldException as Exception -#else -import Control.Exception as Exception -#endif diff --git a/src/TorDNSEL/Config/Internals.hs b/src/TorDNSEL/Config/Internals.hs index 54366f3..5458813 100644 --- a/src/TorDNSEL/Config/Internals.hs +++ b/src/TorDNSEL/Config/Internals.hs @@ -49,7 +49,7 @@ import Prelude hiding (log) import Control.Arrow ((***), second) import Control.Concurrent.Chan import Control.Concurrent.MVar -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (liftM, liftM2, ap) import Control.Monad.Error (MonadError(..)) import Control.Monad.Fix (fix) diff --git a/src/TorDNSEL/Control/Concurrent/Future.hs b/src/TorDNSEL/Control/Concurrent/Future.hs index 8f3c77e..4b5c6ac 100644 --- a/src/TorDNSEL/Control/Concurrent/Future.hs +++ b/src/TorDNSEL/Control/Concurrent/Future.hs @@ -18,7 +18,7 @@ module TorDNSEL.Control.Concurrent.Future ( ) where import Control.Concurrent.MVar (MVar, newEmptyMVar, putMVar, withMVar) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import TorDNSEL.Control.Concurrent.Link diff --git a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs index 8f8988e..8107481 100644 --- a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs +++ b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs @@ -28,7 +28,7 @@ module TorDNSEL.Control.Concurrent.Link.Internals where import qualified Control.Concurrent as C import Control.Concurrent.MVar (MVar, newMVar, withMVar, modifyMVar, modifyMVar_) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (unless) import qualified Data.Foldable as F import qualified Data.Map as M diff --git a/src/TorDNSEL/Control/Concurrent/Util.hs b/src/TorDNSEL/Control/Concurrent/Util.hs index cad89f4..1defc31 100644 --- a/src/TorDNSEL/Control/Concurrent/Util.hs +++ b/src/TorDNSEL/Control/Concurrent/Util.hs @@ -12,7 +12,7 @@ ----------------------------------------------------------------------------- module TorDNSEL.Control.Concurrent.Util where -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Concurrent.MVar (newEmptyMVar, takeMVar, putMVar, tryPutMVar) import Data.Dynamic (Dynamic) import Data.Maybe (isJust) diff --git a/src/TorDNSEL/DNS/Internals.hs b/src/TorDNSEL/DNS/Internals.hs index 23f1595..54d1c08 100644 --- a/src/TorDNSEL/DNS/Internals.hs +++ b/src/TorDNSEL/DNS/Internals.hs @@ -59,7 +59,7 @@ module TorDNSEL.DNS.Internals ( , Class(..) ) where -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (when, unless, replicateM, liftM2, liftM3, forM) import qualified Control.Monad.State as S import Control.Monad.Trans (lift) diff --git a/src/TorDNSEL/DNS/Server/Internals.hs b/src/TorDNSEL/DNS/Server/Internals.hs index 008af72..622de9b 100644 --- a/src/TorDNSEL/DNS/Server/Internals.hs +++ b/src/TorDNSEL/DNS/Server/Internals.hs @@ -21,7 +21,7 @@ module TorDNSEL.DNS.Server.Internals where import Prelude hiding (log) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (when, guard, liftM2, liftM3) import Data.Bits ((.|.), shiftL) import qualified Data.ByteString.Char8 as B diff --git a/src/TorDNSEL/Directory/Internals.hs b/src/TorDNSEL/Directory/Internals.hs index ace1f68..7dc1eb2 100644 --- a/src/TorDNSEL/Directory/Internals.hs +++ b/src/TorDNSEL/Directory/Internals.hs @@ -51,7 +51,7 @@ module TorDNSEL.Directory.Internals ( ) where import Control.Concurrent.MVar (newMVar, withMVar) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (when, unless, liftM) import Control.Monad.Error (MonadError(throwError)) import Data.Char diff --git a/src/TorDNSEL/ExitTest/Initiator/Internals.hs b/src/TorDNSEL/ExitTest/Initiator/Internals.hs index 9acd2c3..a63e25f 100644 --- a/src/TorDNSEL/ExitTest/Initiator/Internals.hs +++ b/src/TorDNSEL/ExitTest/Initiator/Internals.hs @@ -62,7 +62,7 @@ import Prelude hiding (log) import Control.Arrow (first, second) import Control.Concurrent (threadDelay) import Control.Concurrent.Chan (Chan, newChan, writeChan, readChan) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (replicateM_, guard, when) import qualified Data.ByteString.Char8 as B import Data.Dynamic (fromDynamic) diff --git a/src/TorDNSEL/ExitTest/Server/Internals.hs b/src/TorDNSEL/ExitTest/Server/Internals.hs index 560221a..b6aa705 100644 --- a/src/TorDNSEL/ExitTest/Server/Internals.hs +++ b/src/TorDNSEL/ExitTest/Server/Internals.hs @@ -24,7 +24,7 @@ module TorDNSEL.ExitTest.Server.Internals where import Prelude hiding (log) import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan, isEmptyChan) import Control.Concurrent.QSemN (QSemN, newQSemN, waitQSemN, signalQSemN) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (when, forM, foldM) import Control.Monad.Fix (fix) import Control.Monad.Trans (lift) diff --git a/src/TorDNSEL/Log/Internals.hsc b/src/TorDNSEL/Log/Internals.hsc index 5e7854e..7d7a2d8 100644 --- a/src/TorDNSEL/Log/Internals.hsc +++ b/src/TorDNSEL/Log/Internals.hsc @@ -25,7 +25,7 @@ module TorDNSEL.Log.Internals where import Prelude hiding (log) import Control.Concurrent.Chan (Chan, newChan, writeChan, readChan) import Control.Concurrent.MVar (MVar, newMVar, readMVar, swapMVar) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (when, liftM2) import Control.Monad.Fix (fix) import Control.Monad.Trans (MonadIO, liftIO) diff --git a/src/TorDNSEL/Main.hsc b/src/TorDNSEL/Main.hsc index 5a76519..3037ee7 100644 --- a/src/TorDNSEL/Main.hsc +++ b/src/TorDNSEL/Main.hsc @@ -64,7 +64,7 @@ module TorDNSEL.Main ( import Prelude hiding (log) import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (when, liftM, forM, forM_) import Control.Monad.Fix (fix) import Control.Monad.State (StateT, runStateT, liftIO, get, put) diff --git a/src/TorDNSEL/NetworkState/Internals.hs b/src/TorDNSEL/NetworkState/Internals.hs index 933b7eb..32b4a42 100644 --- a/src/TorDNSEL/NetworkState/Internals.hs +++ b/src/TorDNSEL/NetworkState/Internals.hs @@ -64,7 +64,7 @@ import Control.Monad.State import Control.Concurrent (threadDelay) import Control.Concurrent.Chan (newChan, readChan, writeChan) import Control.Concurrent.MVar (MVar, newMVar, readMVar, swapMVar) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import qualified Data.ByteString.Char8 as B import Data.ByteString.Char8 (ByteString) import Data.List (foldl') diff --git a/src/TorDNSEL/NetworkState/Storage/Internals.hs b/src/TorDNSEL/NetworkState/Storage/Internals.hs index e0d610c..fd9a04b 100644 --- a/src/TorDNSEL/NetworkState/Storage/Internals.hs +++ b/src/TorDNSEL/NetworkState/Storage/Internals.hs @@ -22,7 +22,7 @@ module TorDNSEL.NetworkState.Storage.Internals where import Prelude hiding (log) import Control.Arrow (second) import Control.Concurrent.Chan (newChan, readChan, writeChan) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (liftM2, when, forM) import Control.Monad.Error (MonadError(throwError)) import Control.Monad.Fix (fix) diff --git a/src/TorDNSEL/Socks/Internals.hs b/src/TorDNSEL/Socks/Internals.hs index 719e367..e556bf9 100644 --- a/src/TorDNSEL/Socks/Internals.hs +++ b/src/TorDNSEL/Socks/Internals.hs @@ -40,7 +40,7 @@ module TorDNSEL.Socks.Internals ( , showSocksError ) where -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Lazy as L import Data.ByteString (ByteString) diff --git a/src/TorDNSEL/Statistics/Internals.hs b/src/TorDNSEL/Statistics/Internals.hs index 3dcd510..e24c745 100644 --- a/src/TorDNSEL/Statistics/Internals.hs +++ b/src/TorDNSEL/Statistics/Internals.hs @@ -23,7 +23,7 @@ import Prelude hiding (log) import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan) import Control.Concurrent.MVar (MVar, newMVar, modifyMVar_, readMVar) import Control.Concurrent.QSem (QSem, newQSem, waitQSem, signalQSem) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad.Fix (fix) import qualified Data.ByteString.Char8 as B import Data.Maybe (isJust, isNothing) diff --git a/src/TorDNSEL/TorControl/Internals.hs b/src/TorDNSEL/TorControl/Internals.hs index 015bd76..dba1e85 100644 --- a/src/TorDNSEL/TorControl/Internals.hs +++ b/src/TorDNSEL/TorControl/Internals.hs @@ -145,7 +145,7 @@ import Control.Arrow (first, second) import Control.Concurrent.Chan (newChan, readChan, writeChan) import Control.Concurrent.MVar (MVar, newMVar, newEmptyMVar, takeMVar, tryPutMVar, withMVar, modifyMVar_) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad (when, unless, liftM, mzero, mplus) import Control.Monad.Error (MonadError(..)) import Control.Monad.Fix (fix) diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index bb81b43..a2357d8 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -101,7 +101,7 @@ module TorDNSEL.Util ( ) where import Control.Arrow ((&&&), first, second) -import qualified TorDNSEL.Compat.Exception as E +import qualified Control.Exception as E import Control.Monad.Error (Error(..), MonadError(..), MonadTrans(..), MonadIO(..)) import qualified Control.Monad.State as State

1 0

[stem/master] ExitPolicy support for accept6 and reject6 rules
by atagar＠torproject.org 04 Mar '16

04 Mar '16

commit 12c2a7ec541fb11c5e00a0c67a47176f40606076 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Mar 4 08:39:53 2016 -0800 ExitPolicy support for accept6 and reject6 rules Thanks to teor for explaining these! Adding support for these exit policy rule types... https://trac.torproject.org/projects/tor/ticket/16103#comment:5 --- docs/change_log.rst | 1 + stem/exit_policy.py | 37 +++++++++++++++++++++++++++---------- test/unit/exit_policy/rule.py | 19 +++++++++++++++++++ 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 57667e1..8a92788 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -47,6 +47,7 @@ The following are only available within Stem's `git repository * Dramatic, `300x performance improvement <https://github.com/DonnchaC/stem/pull/1>`_ for reading from the control port with python 3 * Added `stem.manual <api/manual.html>`_, which provides information available about Tor from `its manual <https://www.torproject.org/docs/tor-manual.html.en>`_ (:trac:`8251`) * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) + * :class:`~stem.exit_policy.ExitPolicy` support for *accept6* and *reject6* rules (:trac:`16103`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) * Added :func:`~stem.control.Controller.is_set` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the :class:`~stem.control.Controller` diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 293095b..0f80032 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -632,7 +632,12 @@ class ExitPolicyRule(object): This should be treated as an immutable object. + .. versionchanged:: 1.5.0 + Support for 'accept6/reject6' entries and our **is_ipv6_only** attribute. + :var bool is_accept: indicates if exiting is allowed or disallowed + :var bool is_ipv6_only: indicates if this is an accept6 or reject6 rule, only + matching ipv6 addresses :var str address: address that this rule is for @@ -645,17 +650,18 @@ class ExitPolicyRule(object): """ def __init__(self, rule): - # policy ::= "accept" exitpattern | "reject" exitpattern + # policy ::= "accept[6]" exitpattern | "reject[6]" exitpattern # exitpattern ::= addrspec ":" portspec - if rule.startswith('accept'): - self.is_accept = True - elif rule.startswith('reject'): - self.is_accept = False - else: - raise ValueError("An exit policy must start with either 'accept' or 'reject': %s" % rule) + self.is_accept = rule.startswith('accept') + self.is_ipv6_only = rule.startswith('accept6') or rule.startswith('reject6') - exitpattern = rule[6:] + if rule.startswith('accept6') or rule.startswith('reject6'): + exitpattern = rule[7:] + elif rule.startswith('accept') or rule.startswith('reject'): + exitpattern = rule[6:] + else: + raise ValueError("An exit policy must start with either 'accept[6]' or 'reject[6]': %s" % rule) if not exitpattern.startswith(' '): raise ValueError('An exit policy should have a space separating its accept/reject from the exit pattern: %s' % rule) @@ -738,6 +744,9 @@ class ExitPolicyRule(object): # validate our input and check if the argument doesn't match our address type if address is not None: + if self.is_ipv6_only and stem.util.connection.is_valid_ipv4_address(address): + return False # accept6/reject6 don't match ipv4 + address_type = self.get_address_type() if stem.util.connection.is_valid_ipv4_address(address): @@ -868,7 +877,10 @@ class ExitPolicyRule(object): to re-create this rule. """ - label = 'accept ' if self.is_accept else 'reject ' + if self.is_ipv6_only: + label = 'accept6 ' if self.is_accept else 'reject6 ' + else: + label = 'accept ' if self.is_accept else 'reject ' if self.is_address_wildcard(): label += '*:' @@ -906,7 +918,7 @@ class ExitPolicyRule(object): if self._hash is None: my_hash = 0 - for attr in ('is_accept', 'address', 'min_port', 'max_port'): + for attr in ('is_accept', 'is_ipv6_only', 'address', 'min_port', 'max_port'): my_hash *= 1024 attr_value = getattr(self, attr) @@ -951,6 +963,10 @@ class ExitPolicyRule(object): # ip4mask ::= an IPv4 mask in dotted-quad format # num_ip4_bits ::= an integer between 0 and 32 + if self.is_ipv6_only: + rule_start = 'accept6' if self.is_accept else 'reject6' + raise ValueError("'%s' rules should have an IPv6 address, not IPv4 (%s)" % (rule_start, self.address)) + self._address_type = _address_type_to_int(AddressType.IPv4) if addr_extra is None: @@ -1054,6 +1070,7 @@ class MicroExitPolicyRule(ExitPolicyRule): def __init__(self, is_accept, min_port, max_port): self.is_accept = is_accept + self.is_ipv6_only = False self.address = None # wildcard address self.min_port = min_port self.max_port = max_port diff --git a/test/unit/exit_policy/rule.py b/test/unit/exit_policy/rule.py index ecd96a8..9ff0181 100644 --- a/test/unit/exit_policy/rule.py +++ b/test/unit/exit_policy/rule.py @@ -42,6 +42,8 @@ class TestExitPolicyRule(unittest.TestCase): test_inputs = ( 'accept *:*', 'reject *:*', + 'accept6 *:*', + 'reject6 *:*', 'accept *:80', 'accept *:80-443', 'accept 127.0.0.1:80', @@ -83,6 +85,10 @@ class TestExitPolicyRule(unittest.TestCase): 'reject [0000:0000:0000:0000:0000:0000:0000:0000]/64:80': (False, False), 'reject [0000:0000:0000:0000:0000:0000:0000:0000]/128:80': (False, False), + 'reject6 *:*': (True, True), + 'reject6 *:80': (True, False), + 'reject6 [0000:0000:0000:0000:0000:0000:0000:0000]/128:80': (False, False), + 'accept 192.168.0.1:0-65535': (False, True), 'accept 192.168.0.1:1-65535': (False, True), 'accept 192.168.0.1:2-65535': (False, False), @@ -352,3 +358,16 @@ class TestExitPolicyRule(unittest.TestCase): for match_args, expected_result in matches.items(): self.assertEqual(expected_result, rule.is_match(*match_args)) + + def test_ipv6_only_entries(self): + # accept6/reject6 shouldn't allow ipv4 addresses + + self.assertRaises(ValueError, ExitPolicyRule, 'accept6 192.168.0.1:*') + self.assertRaises(ValueError, ExitPolicyRule, 'reject6 192.168.0.1:*') + + # wildcards match all ipv6 but *not* ipv4 + + rule = ExitPolicyRule('accept6 *:*') + self.assertTrue(rule.is_ipv6_only) + self.assertTrue(rule.is_match('FE80:0000:0000:0000:0202:B3FF:FE1E:8329', 443)) + self.assertFalse(rule.is_match('192.168.0.1', 443))

1 0

[stem/master] Skip accept/reject6 rules with IPv4 addresses
by atagar＠torproject.org 04 Mar '16

04 Mar '16

commit 400a8c2cbac31e9d9b1c605d5b4135bf9633cc06 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Mar 4 08:58:13 2016 -0800 Skip accept/reject6 rules with IPv4 addresses Damn. These are invalid and tor should outright reject them but according to the manual they're just skipped... Using an IPv4 address with accept6 or reject6 is ignored and generates a warning. That was a mistake but oh well. It's minor. --- stem/exit_policy.py | 15 +++++++++++++-- test/unit/exit_policy/rule.py | 9 ++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 0f80032..587ef14 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -683,6 +683,14 @@ class ExitPolicyRule(object): self._mask = None + # Malformed exit policies are rejected, but there's an exception where it's + # just skipped: when an accept6/reject6 rule has an IPv4 address... + # + # "Using an IPv4 address with accept6 or reject6 is ignored and generates + # a warning." + + self._skip_rule = False + addrspec, portspec = exitpattern.rsplit(':', 1) self._apply_addrspec(rule, addrspec) self._apply_portspec(rule, portspec) @@ -741,6 +749,9 @@ class ExitPolicyRule(object): :raises: **ValueError** if provided with a malformed address or port """ + if self._skip_rule: + return False + # validate our input and check if the argument doesn't match our address type if address is not None: @@ -964,8 +975,7 @@ class ExitPolicyRule(object): # num_ip4_bits ::= an integer between 0 and 32 if self.is_ipv6_only: - rule_start = 'accept6' if self.is_accept else 'reject6' - raise ValueError("'%s' rules should have an IPv6 address, not IPv4 (%s)" % (rule_start, self.address)) + self._skip_rule = True self._address_type = _address_type_to_int(AddressType.IPv4) @@ -1075,6 +1085,7 @@ class MicroExitPolicyRule(ExitPolicyRule): self.min_port = min_port self.max_port = max_port self._hash = None + self._skip_rule = False def is_address_wildcard(self): return True diff --git a/test/unit/exit_policy/rule.py b/test/unit/exit_policy/rule.py index 9ff0181..780f7cb 100644 --- a/test/unit/exit_policy/rule.py +++ b/test/unit/exit_policy/rule.py @@ -360,10 +360,13 @@ class TestExitPolicyRule(unittest.TestCase): self.assertEqual(expected_result, rule.is_match(*match_args)) def test_ipv6_only_entries(self): - # accept6/reject6 shouldn't allow ipv4 addresses + # accept6/reject6 shouldn't match anything when given an ipv4 addresses - self.assertRaises(ValueError, ExitPolicyRule, 'accept6 192.168.0.1:*') - self.assertRaises(ValueError, ExitPolicyRule, 'reject6 192.168.0.1:*') + rule = ExitPolicyRule('accept6 192.168.0.1/0:*') + self.assertTrue(rule._skip_rule) + self.assertFalse(rule.is_match('192.168.0.1')) + self.assertFalse(rule.is_match('FE80:0000:0000:0000:0202:B3FF:FE1E:8329')) + self.assertFalse(rule.is_match()) # wildcards match all ipv6 but *not* ipv4

1 0

[stem/master] Expand *4 and *6 exit poicy wildcards
by atagar＠torproject.org 04 Mar '16

04 Mar '16

commit 200dd8ad376257ee9e1ee4713254d6f4ba1c9f17 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Mar 4 09:30:29 2016 -0800 Expand *4 and *6 exit poicy wildcards Like accept6 and reject6, we have a couple new wildcards to specify all IPv4 or IPv6 addresses. This is akin to being a '/0' so simply translating 'em into that. :P --- docs/change_log.rst | 1 + stem/exit_policy.py | 34 ++++++++++++++-------------------- test/unit/exit_policy/rule.py | 28 +++++++++++++++++++++++++--- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 8a92788..b01602a 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -48,6 +48,7 @@ The following are only available within Stem's `git repository * Added `stem.manual <api/manual.html>`_, which provides information available about Tor from `its manual <https://www.torproject.org/docs/tor-manual.html.en>`_ (:trac:`8251`) * :func:`~stem.connection.connect` and :func:`~stem.control.Controller.from_port` now connect to both port 9051 (relay's default) and 9151 (Tor Browser's default) (:trac:`16075`) * :class:`~stem.exit_policy.ExitPolicy` support for *accept6* and *reject6* rules (:trac:`16103`) + * :class:`~stem.exit_policy.ExitPolicy` support for *\*4* and *\*6* wildcards (:trac:`16103`) * Added `support for NETWORK_LIVENESS events <api/response.html#stem.response.events.NetworkLivenessEvent>`_ (:spec:`44aac63`) * Added :func:`~stem.control.Controller.is_set` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.is_user_traffic_allowed` to the :class:`~stem.control.Controller` diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 587ef14..f71a638 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -153,12 +153,6 @@ def get_config_policy(rules, ip_address = None): else: result.append(ExitPolicyRule(rule)) - # torrc policies can apply to IPv4 or IPv6, so we need to make sure /0 - # addresses aren't treated as being a full wildcard - - for rule in result: - rule._submask_wildcard = False - return ExitPolicy(*result) @@ -635,6 +629,9 @@ class ExitPolicyRule(object): .. versionchanged:: 1.5.0 Support for 'accept6/reject6' entries and our **is_ipv6_only** attribute. + .. versionchanged:: 1.5.0 + Support for '\*4' and '\*6' wildcards. + :var bool is_accept: indicates if exiting is allowed or disallowed :var bool is_ipv6_only: indicates if this is an accept6 or reject6 rule, only matching ipv6 addresses @@ -695,11 +692,6 @@ class ExitPolicyRule(object): self._apply_addrspec(rule, addrspec) self._apply_portspec(rule, portspec) - # If true then a submask of /0 is treated by is_address_wildcard() as being - # a wildcard. - - self._submask_wildcard = True - # Flags to indicate if this rule seems to be expanded from the 'private' # keyword or tor's default policy suffix. @@ -708,20 +700,14 @@ class ExitPolicyRule(object): def is_address_wildcard(self): """ - **True** if we'll match against any address, **False** otherwise. + **True** if we'll match against **any** address, **False** otherwise. - Note that if this policy can apply to both IPv4 and IPv6 then this is - different from being for a /0 (since, for instance, 0.0.0.0/0 wouldn't - match against an IPv6 address). That said, /0 addresses are highly unusual - and most things citing exit policies are IPv4 specific anyway, making this - moot. + Note that this is different than \*4, \*6, or '/0' address which are + wildcards for only either IPv4 or IPv6. :returns: **bool** for if our address matching is a wildcard """ - if self._submask_wildcard and self.get_masked_bits() == 0: - return True - return self._address_type == _address_type_to_int(AddressType.WILDCARD) def is_port_wildcard(self): @@ -960,6 +946,14 @@ class ExitPolicyRule(object): # Parses the addrspec... # addrspec ::= "*" | ip4spec | ip6spec + # Expand IPv4 and IPv6 specific wildcards into /0 entries so we have one + # fewer bizarre special case headaches to deal with. + + if addrspec == '*4': + addrspec = '0.0.0.0/0' + elif addrspec == '*6': + addrspec = '[0000:0000:0000:0000:0000:0000:0000:0000]/0' + if '/' in addrspec: self.address, addr_extra = addrspec.split('/', 1) else: diff --git a/test/unit/exit_policy/rule.py b/test/unit/exit_policy/rule.py index 780f7cb..59dc5d2 100644 --- a/test/unit/exit_policy/rule.py +++ b/test/unit/exit_policy/rule.py @@ -44,6 +44,7 @@ class TestExitPolicyRule(unittest.TestCase): 'reject *:*', 'accept6 *:*', 'reject6 *:*', + 'accept *:80', 'accept *:80-443', 'accept 127.0.0.1:80', @@ -64,6 +65,11 @@ class TestExitPolicyRule(unittest.TestCase): 'accept 192.168.0.1/255.255.255.0:80': 'accept 192.168.0.1/24:80', 'accept [::]/32:*': 'accept [0000:0000:0000:0000:0000:0000:0000:0000]/32:*', 'accept [::]/128:*': 'accept [0000:0000:0000:0000:0000:0000:0000:0000]:*', + + 'accept *4:*': 'accept 0.0.0.0/0:*', + 'accept *6:*': 'accept [0000:0000:0000:0000:0000:0000:0000:0000]/0:*', + 'accept6 *4:*': 'accept6 0.0.0.0/0:*', + 'accept6 *6:*': 'accept6 [0000:0000:0000:0000:0000:0000:0000:0000]/0:*', } for rule_arg, expected_str in test_inputs.items(): @@ -77,11 +83,16 @@ class TestExitPolicyRule(unittest.TestCase): 'accept 192.168.0.1:*': (False, True), 'accept 192.168.0.1:80': (False, False), - 'reject 127.0.0.1/0:*': (True, True), - 'reject 127.0.0.1/0.0.0.0:*': (True, True), + 'reject *4:*': (False, True), + 'reject *6:*': (False, True), + 'reject6 *4:*': (False, True), + 'reject6 *6:*': (False, True), + + 'reject 127.0.0.1/0:*': (False, True), + 'reject 127.0.0.1/0.0.0.0:*': (False, True), 'reject 127.0.0.1/16:*': (False, True), 'reject 127.0.0.1/32:*': (False, True), - 'reject [0000:0000:0000:0000:0000:0000:0000:0000]/0:80': (True, False), + 'reject [0000:0000:0000:0000:0000:0000:0000:0000]/0:80': (False, False), 'reject [0000:0000:0000:0000:0000:0000:0000:0000]/64:80': (False, False), 'reject [0000:0000:0000:0000:0000:0000:0000:0000]/128:80': (False, False), @@ -256,6 +267,14 @@ class TestExitPolicyRule(unittest.TestCase): (None, None, False): False, (None, None, True): True, }, + 'reject *4:*': { + ('192.168.0.1', 80): True, + ('FE80:0000:0000:0000:0202:B3FF:FE1E:8329', 80): False, + }, + 'reject *6:*': { + ('192.168.0.1', 80): False, + ('FE80:0000:0000:0000:0202:B3FF:FE1E:8329', 80): True, + }, } for rule_arg, matches in test_inputs.items(): @@ -368,6 +387,9 @@ class TestExitPolicyRule(unittest.TestCase): self.assertFalse(rule.is_match('FE80:0000:0000:0000:0202:B3FF:FE1E:8329')) self.assertFalse(rule.is_match()) + rule = ExitPolicyRule('accept6 *4:*') + self.assertTrue(rule._skip_rule) + # wildcards match all ipv6 but *not* ipv4 rule = ExitPolicyRule('accept6 *:*')

1 0