rsocks5patch 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1d99bc0cb455cbe4de6e7bf8d89c1ae4050ccdae12c02783d5352dad7c05db
-  data.tar.gz: 45c799e546887483174c50d4bc73b8ad7f9bf89e718bdf039eb73ec05fdaf74f
+  metadata.gz: 4ddd720bb293c195220d0b51f5121a4cd3724e1fd44757c94687b1fd23ca22a1
+  data.tar.gz: c7ca15c0bc42ae88169ffaaef90968b381052e8b6ac29df4a912bd20c4dcd385
 SHA512:
-  metadata.gz: 1125085b0c643e920e2282aaac260b8bfb68e9f9b5dd3c9d865bfd4df5fb5a4a62a606896a95de974c02d5a0386a156511489443e1bc474c447ba1900640ff65
-  data.tar.gz: 632fbd71e14f025ab75ba9667a572c6f5c90864a86246cbf3612d656d13ed06088bf7a224ea183c9dba9edf33232167675ad4fa897caa58e2dad4dd3917e4c56
+  metadata.gz: 372a39f79aecfac4223182b669010a5dc1d3c35e176ee449f2a9e0fe5614f7d691e8a45ac7c972ba870131c7518d96a5a0dfaeed7019e533440039f54b2331bb
+  data.tar.gz: cce52e1e236dc8bd6c38b28259bd7fb501138821165b46f6c72edbeeb048dd6d5abbc39440864c0d9e44a7926d2aff03dfd538de66132d35e02af4b63849cf35

data/Gemfile.lock

@@ -0,0 +1,63 @@
+PATH
+  remote: .
+  specs:
+    rsocks5patch (0.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    diff-lcs (1.5.1)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    parallel (1.24.0)
+    parser (3.3.1.0)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.0)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.64.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    strscan (3.1.0)
+    unicode-display_width (2.5.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  rake (~> 13.0)
+  rsocks5patch!
+  rspec (~> 3.0)
+  rubocop (~> 1.21)
+
+BUNDLED WITH
+   2.3.18

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2023 TODO: Write your name
+Copyright (c) 2023 Sam Baskinger
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/rsocks5patch/socks5.rb

@@ -0,0 +1,65 @@
+module Rsocks5patch
+  module Socks5
+    def self.mustread(socket, num)
+      data = ""
+      loop do
+        tmp = socket.read(num - data.length)
+        return null if tmp.nil?
+
+        data += tmp
+        return data if data.length == num
+      end
+    end
+
+    def self.init_socks5(socket, host, port)
+      socket.write([0x5, 0x1, 0x0].pack("CCC"))
+      ver, auth = mustread(socket, 2).unpack("CC")
+
+      raise StandardError, "Unexpected version #{ver}." if ver != 0x5
+      raise StandardError, "No available auth method." if auth == 0xff
+
+      # Version, CMD=1, RSV=0, ADDRTYPE=3, LEN, HOST, PORT
+      socket.write([0x5, 0x01, 0x00, 0x3, host.length, host, port].pack("CCCCCa*n"))
+
+      ver, status, _resv, addrtype = mustread(socket, 4).unpack("CCCC")
+      raise StandardError, "Unexpected version #{ver}." if ver != 0x5
+
+      case status
+      when 0x00
+        ""
+      when 0x01
+        raise StandardError, "general failure"
+      when 0x02
+        raise StandardError, "connection not allowed by ruleset"
+      when 0x03
+        raise StandardError, "network unreachable"
+      when 0x04
+        raise StandardError, "host unreachable"
+      when 0x05
+        raise StandardError, "connection refused by destination host"
+      when 0x06
+        raise StandardError, "TTL expired"
+      when 0x07
+        raise StandardError, "command not supported / protocol error"
+      when 0x08
+        raise StandardError, "address type not supported"
+      else
+        raise StandardError, "unexpected error status #{status}"
+      end
+
+      case addrtype
+      when 0x1
+        _ipv4addr = mustread(socket, 4)
+      when 0x3
+        _len = mustread(socket, 1)
+        _host = mustread(socket, len)
+      when 0x4
+        _ipv6addr = mustread(socket, 16)
+      else
+        raise StandardError, "No available auth method." if auth == 0xff
+      end
+      _port = mustread(socket, 2)
+
+    end
+  end
+end

data/lib/rsocks5patch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rsocks5patch
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/rsocks5patch.rb

@@ -7,6 +7,7 @@ require "uri"
 require "socket"
 
 require_relative "rsocks5patch/version"
+require_relative "rsocks5patch/socks5"
 
 # When this module is evaluated it will patch the Ruby Socket class.
 module Rsocks5patch
@@ -21,17 +22,6 @@ module Rsocks5patch
       attr_accessor :socks_host, :socks_port
     end
 
-    def self.mustread(socket, num)
-      data = ""
-      loop do
-        tmp = socket.read(num - data.length)
-        return null if tmp.nil?
-
-        data += tmp
-        return data if data.length == num
-      end
-    end
-
     def self.tcp(
       host,
       port,
@@ -52,55 +42,42 @@ module Rsocks5patch
 
       socket = orig_func(socks_host, socks_port, local_host, local_port, connect_timeout: nil, resolv_timeout: nil)
 
-      socket.write([0x5, 0x1, 0x0].pack("CCC"))
-      ver, auth = mustread(socket, 2).unpack("CC")
-
-      raise StandardError, "Unexpected version #{ver}." if ver != 0x5
-      raise StandardError, "No available auth method." if auth == 0xff
-
-      # Version, CMD=1, RSV=0, ADDRTYPE=3, LEN, HOST, PORT
-      socket.write([0x5, 0x01, 0x00, 0x3, host.length, host, port].pack("CCCCCa*n"))
-
-      ver, status, _resv, addrtype = mustread(socket, 4).unpack("CCCC")
-      raise StandardError, "Unexpected version #{ver}." if ver != 0x5
-
-      case status
-      when 0x00
-        ""
-      when 0x01
-        raise StandardError, "general failure"
-      when 0x02
-        raise StandardError, "connection not allowed by ruleset"
-      when 0x03
-        raise StandardError, "network unreachable"
-      when 0x04
-        raise StandardError, "host unreachable"
-      when 0x05
-        raise StandardError, "connection refused by destination host"
-      when 0x06
-        raise StandardError, "TTL expired"
-      when 0x07
-        raise StandardError, "command not supported / protocol error"
-      when 0x08
-        raise StandardError, "address type not supported"
-      else
-        raise StandardError, "unexpected error status #{status}"
-      end
+      Rsocks5patch::Socks5.init_socks5(socket, host, port)
+
+      socket
+    end
+  end
+
+  TCPSocket.class_eval do
+    class << self
+      alias_method :orig_func, :open
+
+    end
+
+    def self.open(
+      conn_addr,
+      conn_port,
+      local_host=nil,
+      local_port=nil,
+      connect_timeout: nil,
+      resolv_timeout: nil,
+      socks_host: nil,
+      socks_port: nil
+    )
+      socks_host ||= Socket.socks_host
+      socks_port ||= Socket.socks_port
 
-      case addrtype
-      when 0x1
-        _ipv4addr = mustread(socket, 4)
-      when 0x3
-        _len = mustread(socket, 1)
-        _host = mustread(socket, len)
-      when 0x4
-        _ipv6addr = mustread(socket, 16)
-      else
-        raise StandardError, "No available auth method." if auth == 0xff
+      unless socks_host
+        return orig_func(conn_addr, conn_port, local_host, local_port, connect_timeout: connect_timeout,
+                                                            resolv_timeout: resolv_timeout)
       end
-      _port = mustread(socket, 2)
+
+      socket = orig_func(socks_host, socks_port, local_host, local_port, connect_timeout: nil, resolv_timeout: nil)
+
+      Rsocks5patch::Socks5.init_socks5(socket, conn_addr, conn_port)
 
       socket
     end
   end
+
 end

data/rsocks5patch.gemspec

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative "lib/rsocks5patch/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "rsocks5patch"
+  spec.version = Rsocks5patch::VERSION
+  spec.authors = ["Sam Baskinger"]
+  spec.email = ["basking2@yahoo.com"]
+
+  spec.summary = "Patch SOCKS5 capabilities into Ruby's Socket class."
+  # spec.description = "Patch SOCKS5 capabilities into Ruby's Socket class."
+  spec.homepage = "https://gitlab.com/basking2/rsocks5patch"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 2.6.0"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://gitlab.com/basking2/rsocks5patch"
+  spec.metadata["changelog_uri"] = "https://gitlab.com/basking2/rsocks5patch/-/blob/main/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # Uncomment to register a new dependency of your gem
+  # spec.add_dependency "example-gem", "~> 1.0"
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsocks5patch
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sam Baskinger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -21,11 +21,14 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/rsocks5patch.rb
+- lib/rsocks5patch/socks5.rb
 - lib/rsocks5patch/version.rb
+- rsocks5patch.gemspec
 - sig/rsocks5patch.rbs
 homepage: https://gitlab.com/basking2/rsocks5patch
 licenses:
@@ -50,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Patch SOCKS5 capabilities into Ruby's Socket class.