Add is_ip_range? method

Author: sjanusz-r7

lib/rex/socket.rb

@@ -173,6 +173,29 @@ def self.dotted_ip?(addr)
     (support_ipv6? && self.is_ipv6?(addr)) || self.is_ipv4?(addr)
   end
 
+  def self.is_ip_range?(addr)
+    elements = addr.split('-')
+    return false if elements.length != 2
+
+    elements.map! { |e| e.strip }
+
+    # We were provided with a simple case of '1.1.1.1-1.2.3.4', or '::1-::ffff'
+    return true if elements.all? { |element| is_ipv6?(element) } || elements.all? { |element| is_ipv4?(element) }
+
+    return false if elements.any? { |element| is_mac_addr?(element) }
+
+    # If we have a mix of IPv4 and IPv6 addresses, that's not a valid range
+    return false if elements.any? { |element| is_ipv4?(element) } && elements.any? { |element| is_ipv6?(element) }
+
+    ipv4_ending_regex = /((.)?[0-9]{1,3})+$/.freeze
+    return true if is_ipv4?(elements.first) && elements.last.match?(ipv4_ending_regex)
+
+    ipv6_ending_regex = /(^::[a-f0-9]{1,4})+$/.freeze
+    return true if is_ipv6?(elements.first) && elements.last.downcase.match?(ipv6_ending_regex)
+
+    false
+  end
+
   # Checks to see if an address is an IPv6 address and if so, converts it into its
   # square bracket format for addressing as noted in RFC 6874 which states that an IPv6
   # address literal in a URL is always embedded between [ and ]. Please also refer to

spec/rex/socket_spec.rb

@@ -277,6 +277,13 @@
       end
     end
 
+    context 'with an IP CIDR' do
+      let(:try) { '192.168.1.1/30' }
+      it 'should return true' do
+        expect(addr).to eq true
+      end
+    end
+
     context 'with multiple IPv4 addresses' do
       context 'separated by newlines' do
         let(:try) { "127.0.0.1\n127.0.0.1" }
@@ -377,6 +384,20 @@
        end
      end
 
+     context 'with an ip address range' do
+       let(:try) { '192.168.1.1-4' }
+       it 'should return false' do
+         expect(name).to eq false
+       end
+     end
+
+     context 'with an ip CIDR' do
+       let(:try) { '192.168.1.1/24' }
+       it 'should return false' do
+         expect(name).to eq false
+       end
+     end
+
      context 'with a hostname' do
        let(:try) { "localhost" }
        it "should return true" do
@@ -529,4 +550,48 @@
       end
     end
   end
+
+  describe '.is_ip_range?' do
+    [
+      { input: '1.1.1.1 - 1.1.1.255', expected: true },
+      { input: '1.1.1.1- 1.1.1.255', expected: true },
+      { input: '1.1.1.1 -1.1.1.255', expected: true },
+      { input: '1.1.1.1-1.1.1.255', expected: true },
+      { input: '  1.1.1.1  -  1.1.1.255  ', expected: true },
+      { input: '1.1.1.1 - 255', expected: true },
+      { input: '::1 - ::ffff', expected: true },
+      { input: '127.0.0.1-.5', expected: true },
+      { input: '127.0.0.1-5', expected: true },
+      { input: '127.0.0.1-1.5', expected: true },
+      { input: '127.0.0.1-.1.5', expected: true },
+      { input: '::1 - ::1', expected: true },
+      { input: '::ffff - ::ffff', expected: true },
+      { input: '1.1.1.1 - ::1', expected: false },
+      { input: '::1 - 1.1.1.1', expected: false },
+      { input: 'example-domain.com', expected: false },
+      { input: 'example-domain-name.com', expected: false },
+      { input: '127.0.0.1', expected: false },
+      { input: '::1', expected: false },
+      { input: '::ffff::ffff', expected: false },
+      { input: '::1-::ffffffff', expected: false },
+      { input: '::1-ffff', expected: false },
+      { input: '1-ffff', expected: false },
+      { input: '1-::ffff', expected: false },
+      { input: 'example-domain.com-example-subdomain.com', expected: false },
+      { input: 'example-domain.com-docs.rapid7.com', expected: false },
+      { input: 'example-domain.com-127.0.0.1', expected: false },
+      { input: '127.0.0.1-rapid7.com', expected: false },
+      { input: '1-rapid7.com', expected: false },
+      { input: '::1-rapid7.com::ffff', expected: false },
+      { input: '00:1A:2B:3C:4D:5E-00:A1:B2:C3:D4:E5', expected: false },
+      { input: '00:1A:2B:3C:4D:5E-00:A1:B2:C3:D4:E5', expected: false },
+    ].each do |test_case|
+      it "should return #{test_case[:expected]} when given #{test_case[:input]}" do
+        input = test_case[:input]
+        expected = test_case[:expected]
+
+        expect(described_class.is_ip_range?(input)).to eq(expected)
+      end
+    end
+  end
 end