tor 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cfccedfae1deb3bfeb415f8df82f0429c7ba5006
-  data.tar.gz: 7e08802cf5ab8d0385cc4d436a5c28f849326ce5
+SHA256:
+  metadata.gz: 7be2c2b80fea90e1b3e9567624a442d4b3d1a92946f72d6b465280ad4b5d0ec8
+  data.tar.gz: 96358536b8479ea4fba83fb236dabb6b743074c058a48a6fbfe435bf00ab5bbc
 SHA512:
-  metadata.gz: c52ab924220a91cbc2613cdad24e922cb79cef86ab87b765b9096fc1ebf5e2c718be35ec58f46adf127815b4021291258fe26e04cb89818a265966fcf47b55d1
-  data.tar.gz: e51397feb8954645d47ac639b238ca8dddda36d6c2591d4f4c93ef147eeeff4e0e841b9d1a0c1771394e319180d10feb088eaa6ffb879cb6a7869541359a56c4
+  metadata.gz: b961dc19ac6f692cbade5226a895782c311cf6463fd228595ee4044085de9340f6948e852c981649c63abfd0abd01665d3fd7cabf2970815be6f87541b8158ee
+  data.tar.gz: cbecd4beddfd8d543d79233ea2f116609204550f0366a091aacac9573eae593e08c2d5c663020b56713ea6fc46b6dbb2ca39aa6b4e0e1686bb30d6ae7c7b2a7c

data/AUTHORS

@@ -1 +1,2 @@
 * Arto Bendiken <arto.bendiken@gmail.com>
+* Łukasz Wieczorek <wieczorek1990@gmail.com>

data/README

@@ -1 +1 @@
-README.md
+./README.md

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/tor/dnsel.rb

@@ -1,49 +1,12 @@
 require 'resolv' unless defined?(Resolv)
 
 module Tor
-  ##
-  # Tor DNS Exit List (DNSEL) client.
-  #
-  # Unless the target IP address and port are explicitly specified, the
-  # query will be performed using a target IP address of "8.8.8.8" and a
-  # target port of 53. These correspond to the DNS protocol port on one of
-  # the [Google Public DNS](http://code.google.com/speed/public-dns/)
-  # servers, and they are guaranteed to be reachable from Tor's default exit
-  # policy.
-  #
-  # @example Checking source IP addresses
-  #   Tor::DNSEL.include?("185.220.101.21")               #=> true
-  #   Tor::DNSEL.include?("1.2.3.4")                     #=> false
-  #
-  # @example Checking source hostnames
-  #   Tor::DNSEL.include?("ennui.lostinthenoise.net")    #=> true
-  #   Tor::DNSEL.include?("myhost.example.org")          #=> false
-  #
-  # @example Specifying an explicit target port
-  #   Tor::DNSEL.include?("185.220.101.21", :port => 80)  #=> true
-  #   Tor::DNSEL.include?("185.220.101.21", :port => 25)  #=> false
-  #
-  # @example Specifying an explicit target IP address and port
-  #   Tor::DNSEL.include?(source_addr, :addr => target_addr, :port => target_port)
-  #   Tor::DNSEL.include?("185.220.101.21", :addr => myip, :port => myport)
-  #
-  # @example Using from a Rack application
-  #   Tor::DNSEL.include?(env['REMOTE_ADDR'] || env['REMOTE_HOST'], {
-  #     :addr => env['SERVER_NAME'],
-  #     :port => env['SERVER_PORT'],
-  #   })
-  #
-  # @see https://www.torproject.org/tordnsel/
-  # @see https://trac.torproject.org/projects/tor/wiki/TheOnionRouter/TorDNSExitList
-  # @see http://gitweb.torproject.org/tor.git?a=blob_plain;hb=HEAD;f=doc/contrib/torel-design.txt
   module DNSEL
     RESOLVER    = Resolv::DefaultResolver unless defined?(RESOLVER)
-    TARGET_ADDR = '8.8.8.8'.freeze        unless defined?(TARGET_ADDR)     # Google Public DNS
-    TARGET_PORT = 53                      unless defined?(TARGET_PORT)     # DNS
-    DNS_SUFFIX  = 'ip-port.exitlist.torproject.org'.freeze
+    DNS_SUFFIX  = 'dnsel.torproject.org'.freeze
 
     ##
-    # Returns `true` if the Tor DNSEL includes `host`, `false` otherwise.
+    # Returns `true` if `host` is a Tor Exit Node, `false` otherwise.
     #
     # If the DNS server is unreachable or the DNS query times out, returns
     # `nil` to indicate that we don't have a definitive answer one way or
@@ -54,13 +17,10 @@ module Tor
     #   Tor::DNSEL.include?("1.2.3.4")          #=> false
     #
     # @param  [String, #to_s]          host
-    # @param  [Hash{Symbol => Object}] options
-    # @option options [String, #to_s]  :addr ("8.8.8.8")
-    # @option options [Integer, #to_i] :port (53)
     # @return [Boolean]
-    def self.include?(host, options = {})
+    def self.include?(host)
       begin
-        query(host, options) == '127.0.0.2'
+        query(host) == '127.0.0.2'
       rescue Resolv::ResolvError   # NXDOMAIN
         false
       rescue Resolv::ResolvTimeout
@@ -81,31 +41,23 @@ module Tor
     #   Tor::DNSEL.query("1.2.3.4")             #=> Resolv::ResolvError
     #
     # @param  [String, #to_s]          host
-    # @param  [Hash{Symbol => Object}] options
-    # @option options [String, #to_s]  :addr ("8.8.8.8")
-    # @option options [Integer, #to_i] :port (53)
     # @return [String]
     # @raise  [Resolv::ResolvError] for an NXDOMAIN response
-    def self.query(host, options = {})
-      getaddress(dnsname(host, options))
+    def self.query(host)
+      getaddress(dnsname(host))
     end
 
     ##
     # Returns the DNS name used for Tor DNSEL queries of `host`.
     #
     # @example
-    #   Tor::DNSEL.dnsname("1.2.3.4")           #=> "4.3.2.1.53.8.8.8.8.ip-port.exitlist.torproject.org"
+    #   Tor::DNSEL.dnsname("1.2.3.4")           #=> "4.3.2.1.dnsel.torproject.org"
     #
     # @param  [String, #to_s]          host
-    # @param  [Hash{Symbol => Object}] options
-    # @option options [String, #to_s]  :addr ("8.8.8.8")
-    # @option options [Integer, #to_i] :port (53)
     # @return [String]
-    def self.dnsname(host, options = {})
+    def self.dnsname(host)
       source_addr = getaddress(host, true)
-      target_addr = getaddress(options[:addr] || TARGET_ADDR, true)
-      target_port = options[:port] || TARGET_PORT
-      [source_addr, target_port, target_addr, DNS_SUFFIX].join('.')
+      "#{source_addr}.#{DNS_SUFFIX}"
     end
     class << self; alias_method :hostname, :dnsname; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tor
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Arto Bendiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,18 +27,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 description: Tor.rb is a Ruby library for interacting with the Tor anonymity network.
@@ -56,7 +62,7 @@ files:
 - lib/tor/version.rb
 homepage: http://cypherpunk.rubyforge.org/tor/
 licenses:
-- Public Domain
+- Unlicense
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -74,8 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Tor (>= 0.2.1.25)
-rubyforge_project: cypherpunk
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Onion routing for Ruby.