Merge pull request #2 from ninoseki/update-outout-format

feat: update output format
ninoseki · Jun 16, 2020 · b6c9ee6 · b6c9ee6
2 parents cbc61f0 + 8303159
commit b6c9ee6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/rangescan/scanner.rb b/lib/rangescan/scanner.rb
@@ -45,7 +45,13 @@ def get(ipv4)
 
       begin
         res = HTTP.timeout(timeout).headers(default_headers).get(url, ssl_options)
-        { ipv4: ipv4, code: res.code, body: res.body.to_s }
+        {
+          url: url,
+          ipv4: ipv4,
+          code: res.code,
+          headers: res.headers.to_h,
+          body: res.body.to_s
+        }
       rescue StandardError
         nil
       end

diff --git a/spec/range_scan/scanner_spec.rb b/spec/range_scan/scanner_spec.rb
@@ -88,5 +88,13 @@ def server
       results = scanner.scan([host])
       expect(results.first.dig(:body)).to eq("foo")
     end
+
+    it do
+      scanner = described_class.new(port: port)
+      results = scanner.scan([host])
+
+      first = results.first
+      [:url, :ipv4, :code, :headers, :body].all? { |key| first.key? key }
+    end
   end
 end