gitlab-net-dns 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da76ca67ffda2850455d743e3485328b73296a7cfdca4808e8540fc0ba4b2593
-  data.tar.gz: c854da335de562911f61a177047bdcda77541be3c8647be8bc78a10ca0918f62
+  metadata.gz: 74ee6c4e55aca3a4b262ef65ed15aa7eb4faefba46e236581313e600f488d4fb
+  data.tar.gz: c0737bd705ee060cb3e0cabd8f16985e24cbc9c32435ab7287435075a70c4532
 SHA512:
-  metadata.gz: 2262bc9366375314c0119d96f2163f658b181d0b6bb1e6044aee62707ccf4da1c89ab8da66c508f3b0155d7fa240c583697cf4b4431b3bfe4bf04057b08a7628
-  data.tar.gz: 1a157339c0ee195365c5aa20692c8496d1401a7eb2a0fb6f48db3ecbc346f42ab7ff8e3bf3c454f851554234a66bcd83dd2d4d1568f22a989ba61812be716562
+  metadata.gz: 88cc517f05b54349d8cc62a597415e395888398e9d4557b1f9c8176b7dc1b98ab6b4683a82ca50909c37054c1e9bee076648eb637242db69d2ab94899577ea71
+  data.tar.gz: 9e4bfdd6c46a3e1e48449aa384561cd158c4e7580e01593d24f860900ffc708d789fbdfbc5f6b39ba35fdeccc2d5d3971e4f482e158792e16d56509d2d5b200d

data/lib/net/dns/resolver.rb

@@ -1642,13 +1642,14 @@ module Net
             socket.bind(Socket.pack_sockaddr_in(@config[:source_port], @config[:source_address].to_s))
 
             sockaddr = Socket.pack_sockaddr_in(ns_port, ns.to_s)
+            success = false
 
             @config[:tcp_timeout].timeout do
               socket.connect(sockaddr)
               @logger.info "Contacting nameserver #{ns} port #{ns_port}"
               socket.write(length + packet_data)
               ans = socket.recv(Net::DNS::INT16SZ)
-              len = ans.unpack("n")[0]
+              len = ans.unpack("n")[0].to_i
 
               @logger.info "Receiving #{len} bytes..."
 
@@ -1667,8 +1668,16 @@ module Net
                 @logger.warn "Malformed packet from nameserver #{ns}, trying next."
                 next
               end
+
+              success = true
             end
-            return [buffer, ["", ns_port, ns.to_s, ns.to_s]]
+
+            # Return buffer and the socket "from" data:
+            # from[0] - Address family as a string (e.g., "AF_INET" or "AF_INET6")
+            # from[1] - Port number as an integer
+            # from[2] - IP address as a string (e.g., "192.168.1.1" or "::1")
+            # from[3] - IP address as a string (same as from[2])
+            return [buffer, ["", ns_port, ns.to_s, ns.to_s]] if success
           rescue Timeout::Error
             @logger.warn "Nameserver #{ns} not responding within TCP timeout, trying next one"
             next
@@ -1676,7 +1685,8 @@ module Net
             socket.close
           end
         end
-        ans
+
+        nil
       end
 
       def query_udp(packet, packet_data)

data/lib/net/dns/version.rb

@@ -3,6 +3,6 @@
 module Net
   module DNS
     # The current library version.
-    VERSION = "0.13.0"
+    VERSION = "0.15.0"
   end
 end

data/test/unit/dns_resolver_test.rb

@@ -0,0 +1,80 @@
+require 'test_helper'
+require 'net/dns/resolver'
+
+class TestDNSResolver < Minitest::Test
+  def setup
+    @resolver = Net::DNS::Resolver.new(
+        nameservers: ['8.8.8.8'],
+        port: 53,
+        source_address: IPAddr.new('0.0.0.0'),
+        tcp_timeout: 5,
+        udp_timeout: 5
+      )
+
+    # Sample DNS packet data
+    @packet_data = "\x12\x34\x01\x00\x00\x01\x00\x00\x00\x00\x00\x00\x03www\x06google\x03com\x00\x00\x01\x00\x01"
+  end
+
+  # Tests for query_tcp
+  def test_query_tcp_successful_response
+    mock_socket = Minitest::Mock.new
+
+    Socket.stub(:new, mock_socket) do
+      mock_socket.expect(:bind, nil, [String])
+      mock_socket.expect(:connect, nil, [String])
+      mock_socket.expect(:write, @packet_data.size + 2, [String])
+      mock_socket.expect(:recv, "\x00\x20", [2]) # Length = 32 bytes
+      mock_socket.expect(:recvfrom, ["A" * 32, nil], [32])
+      mock_socket.expect(:close, nil)
+
+      Socket.stub(:pack_sockaddr_in, "mock_sockaddr") do
+        result = @resolver.send(:query_tcp, @packet, @packet_data)
+
+        refute_nil result
+        assert_equal 2, result.size
+        assert_equal "A" * 32, result[0] # Response data
+        assert_equal ["", 53, "8.8.8.8", "8.8.8.8"], result[1] # From info
+      end
+    end
+
+    mock_socket.verify
+  end
+
+  def test_query_tcp_zero_length_response
+    mock_socket = Minitest::Mock.new
+
+    Socket.stub(:new, mock_socket) do
+      mock_socket.expect(:bind, nil, [String])
+      mock_socket.expect(:connect, nil, [String])
+      mock_socket.expect(:write, @packet_data.size + 2, [String])
+      mock_socket.expect(:recv, "\x00\x00", [2]) # Length = 0 bytes
+      mock_socket.expect(:close, nil)
+
+      Socket.stub(:pack_sockaddr_in, "mock_sockaddr") do
+        result = @resolver.send(:query_tcp, @packet, @packet_data)
+        assert_nil result # Should return nil for zero-length response
+      end
+    end
+
+    mock_socket.verify
+  end
+
+  def test_query_tcp_bogus_response
+    mock_socket = Minitest::Mock.new
+
+    Socket.stub(:new, mock_socket) do
+      mock_socket.expect(:bind, nil, [String])
+      mock_socket.expect(:connect, nil, [String])
+      mock_socket.expect(:write, @packet_data.size + 2, [String])
+      mock_socket.expect(:recv, "0", [2]) # Length = 0 bytes
+      mock_socket.expect(:close, nil)
+
+      Socket.stub(:pack_sockaddr_in, "mock_sockaddr") do
+        result = @resolver.send(:query_tcp, @packet, @packet_data)
+        assert_nil result # Should return nil for zero-length response
+      end
+    end
+
+    mock_socket.verify
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-net-dns
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Marco Ceresa
 - Simone Carletti
 bindir: bin
 cert_chain: []
-date: 2025-06-10 00:00:00.000000000 Z
+date: 2025-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -124,6 +124,7 @@ files:
 - spec/unit/resolver/udp_timeout_spec.rb
 - spec/unit/resolver_spec.rb
 - test/test_helper.rb
+- test/unit/dns_resolver_test.rb
 - test/unit/header_test.rb
 - test/unit/names_test.rb
 - test/unit/packet_test.rb
@@ -168,6 +169,7 @@ test_files:
 - spec/unit/resolver/udp_timeout_spec.rb
 - spec/unit/resolver_spec.rb
 - test/test_helper.rb
+- test/unit/dns_resolver_test.rb
 - test/unit/header_test.rb
 - test/unit/names_test.rb
 - test/unit/packet_test.rb