reaver 0.18.1 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137f52f4df99e56407d711cf500344f4d6dbd77616b3ff9a4bcabe4ad973ea68
-  data.tar.gz: 3d308ca92833ad46fe7cc90c7d77b356a58619dc630c73d9440db8e60ad1b77b
+  metadata.gz: 6834d2796f8a39032bde1bca4048096894c9eee6f86ba94827d91c602bd77472
+  data.tar.gz: 36930811fdab7dcc96659fe57d65197211111eb1b571d9a0cb17b34d3a13a503
 SHA512:
-  metadata.gz: 98b0be9ab2dbf8681de1b09a790d5b9407f4e229bb072da470cae53bb941b7c39ddaef0f01e5a5aae442270e790891e95865cc37e2a5b9b555a83ca035724c44
-  data.tar.gz: 072eedc65a9875d449e9d60b29a238ed2e7fdcb71c3d6f0f061ff77eb855fd61e3d3065de73f4429d5efcac05fbf625ac51591bd9aba7d5605df99ce5cb549a9
+  metadata.gz: e6a5baf04b9dfd95ae78faff572036a085917e97b23bd6d5fb486aa46d71b6aa6f89df684038e5714ed0e6a613ef8f968bed8e2d8d418f89e48b17d4cb3c572c
+  data.tar.gz: 9063460fa6da35548ff7e1834e2e3f110c0fdc1046296a9c9b7107c4f91837ab1d9570ebb92bca1c0569c4b6959151fb01d38e7ae2200b87c677c6860449ad51

data/CHANGELOG.md

@@ -1,5 +1,6 @@
-## 0.18.1
+## 0.19.1
 
+- Download with net/http(s) instead of open-uri
 - Remove threading, need more test.
 
 ## 0.18.0 - Oct. 2025

data/lib/reaver/download.rb

@@ -2,26 +2,56 @@
 
 require 'open-uri'
 require 'net/http'
-require 'tempfile'
-require 'fileutils'
+require 'net/https'
 
 # Download link
 module Reaver
   module_function
 
-  def download(url, name)
+  # https://github.com/ruby/open-uri/blob/master/lib/open-uri.rb
+  def download(url, name, limit = 5)
     dest = name
-    url = URI(url)
-    raise Error, 'url was invalid' unless url.respond_to?(:open)
+    url = URI.parse(url)
+    raise ArgumentError, 'url was invalid' unless url.respond_to?(:open)
+    raise ArgumentError, 'too many HTTP redirects' if limit.zero?
 
-    options = {}
+    http_object = Net::HTTP.new(url.host, url.port)
+    just_add_ssl(http_object) # if url.scheme == 'https'
+    http_object.start do |http|
+      request = Net::HTTP::Get.new(url.request_uri, { 'user-agent' => agent_list })
+      response_stuff(http, request, dest, limit)
+    end
+  end
+
+  def response_stuff(http, request, dest, limit)
+    http.read_timeout = 500
+    http.request request do |response|
+      case response
+      when Net::HTTPSuccess then get_the_file(response, dest)
+      when Net::HTTPRedirection then download(response['location'], dest, limit - 1)
+      else
+        raise response.value
+      end
+    end
+  end
 
+  def just_add_ssl(http_object)
+    store = OpenSSL::X509::Store.new
+    store.set_default_paths
+    http_object.use_ssl = true
+    http_object.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    http_object.cert_store = store
+  end
+
+  def get_the_file(res, dest)
     Whirly.start do
       Whirly.status = "Downloading #{dest}"
-      options['User-Agent'] = agent_list
-      downloaded_file = URI.open(url, options)
-
-      get_the_link(downloaded_file, dest)
+      File.binwrite(dest, res.read_body)
+      # open(dest, 'wb') do |io|
+      # res.read_body do |chunk|
+      #   io.write chunk
+      # end
+      # end
     end
   end
 
@@ -35,18 +65,4 @@ module Reaver
           'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36 Trailer/93.3.8652.5']
     ag.sample
   end
-
-  def get_the_link(file, dest)
-    # open-uri will return a StringIO instead of a Tempfile if the filesize
-    # is less than 10 KB, so we patch this behaviour by converting it into
-    # a Tempfile.
-    if file.is_a?(StringIO)
-      tempfile = Tempfile.new('open-uri', binmode: true)
-      IO.copy_stream(file, tempfile.path)
-      FileUtils.mv tempfile.path, dest
-    else
-      IO.copy_stream(file, dest)
-    end
-    file
-  end
 end

data/lib/reaver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Reaver
-  VERSION = '0.18.1'
+  VERSION = '0.19.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reaver
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.1
 platform: ruby
 authors:
 - szorfein