girl 0.72.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb4fc20afbb57a58552ce95b6580c6d743fd85a1cd7f0a20d820c9481c8d2dd
-  data.tar.gz: be27ab104fd8715186d18031999f6050eeaebeb6d8bc7c4e19b3f29ebd997928
+  metadata.gz: d975dc92620d5ea2c27493ed0fbbb19a145fc7ecda564c2f5609eb710e06912d
+  data.tar.gz: 5c098f6b8aecc89d246e8e4b1c477eb42e86ce695b27d4329962255d380b4f09
 SHA512:
-  metadata.gz: 7f458ccee3db7c612f29715fa66c70e70fd3d4a8bfd4773c9590ebf830079d3d6ea3bc1daeed67d26ef70b08d7857592073602f20b0937b5f384713d15ff334f
-  data.tar.gz: 504190992e2966453ab1783f6fcccea05ac18c0a067a3b9c0372e6b097392d5b4f64c70d1ea405aa090de15408d6d9eb86a1042b6feb27ef922ca6c213bcdb80
+  metadata.gz: 326b198254e6508e42b00145e00c56214574510448ba05b852b257b44da2c54b443509d1e2af514a668b1394e27cfff2ae93cf1957526adf9315a73e32a3ebbd
+  data.tar.gz: 21e0cab87ffe323314607d74c3884eb2987208a9375b417c1158d1768e7aafcf536d7370d5fdff58b08d1d7acb95da009eba57ddcc9d9d22702e405078b2c7e5

data/lib/girl/proxy_worker.rb

@@ -216,12 +216,6 @@ module Girl
     # resolve domain
     #
     def resolve_domain( src, domain )
-      if ( /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ domain ) && domain.split( '.' ).all? { | part | part.to_i < 256 }
-        # puts "debug1 #{ domain } is a ip"
-        deal_with_destination_ip( src, domain )
-        return
-      end
-
       if @remotes.any? { | remote | ( domain.size >= remote.size ) && ( domain[ ( remote.size * -1 )..-1 ] == remote ) }
         # puts "debug1 #{ domain } hit remotes"
         new_a_src_ext( src )
@@ -231,11 +225,11 @@ module Girl
       resolv_cache = @resolv_caches[ domain ]
 
       if resolv_cache
-        destination_ip, created_at = resolv_cache
+        ip_info, created_at = resolv_cache
 
         if Time.new - created_at < RESOLV_CACHE_EXPIRE
-          # puts "debug1 #{ domain } hit resolv cache #{ destination_ip }"
-          deal_with_destination_ip( src, destination_ip )
+          # puts "debug1 #{ domain } hit resolv cache #{ ip_info.inspect }"
+          deal_with_destination_ip( src, ip_info )
           return
         end
 
@@ -255,12 +249,11 @@ module Girl
 
         @mutex.synchronize do
           if ip_info
-            destination_ip = ip_info.ip_address
-            # puts "debug1 resolved #{ domain } #{ destination_ip }"
-            @resolv_caches[ domain ] = [ destination_ip, Time.new ]
+            @resolv_caches[ domain ] = [ ip_info, Time.new ]
 
             unless src.closed?
-              deal_with_destination_ip( src, destination_ip )
+              puts "p#{ Process.pid } #{ Time.new } resolved #{ domain } #{ ip_info.ip_address }"
+              deal_with_destination_ip( src, ip_info )
             end
           else
             set_is_closing( src )
@@ -274,11 +267,11 @@ module Girl
     ##
     # deal with destination ip
     #
-    def deal_with_destination_ip( src, destination_ip )
-      if @directs.any? { | direct | direct.include?( destination_ip ) }
+    def deal_with_destination_ip( src, ip_info )
+      if @directs.any? { | direct | direct.include?( ip_info.ip_address ) }
         # ip命中直连列表，直连
-        # puts "debug1 #{ destination_ip } hit directs"
-        new_a_dst( src, destination_ip )
+        # puts "debug1 #{ ip_info.inspect } hit directs"
+        new_a_dst( src, ip_info )
       else
         # 走远端
         new_a_src_ext( src )
@@ -342,10 +335,10 @@ module Girl
     ##
     # new a dst
     #
-    def new_a_dst( src, destination_ip )
+    def new_a_dst( src, ip_info )
       src_info = @src_infos[ src ]
-      destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], destination_ip )
-      dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
+      dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
 
       if RUBY_PLATFORM.include?( 'linux' )
         dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
@@ -1122,7 +1115,7 @@ module Girl
             src_info[ :destination_domain ] = destination_ip
             src_info[ :destination_port ] = destination_port
             # puts "debug1 IP V4 address #{ destination_addrinfo.inspect }"
-            deal_with_destination_ip( src, destination_ip )
+            deal_with_destination_ip( src, destination_addrinfo )
           elsif atyp == 3
             domain_len = data[ 4 ].unpack( 'C' ).first
 

data/lib/girl/proxyd_worker.rb

@@ -204,13 +204,17 @@ module Girl
       end
 
       Thread.new do
-        destination_domain, destination_port = destination_domain_port.split( ':' )
-        destination_port = destination_port.to_i
+        colon_idx = destination_domain_port.rindex( ':' )
 
-        begin
-          destination_addr = Socket.sockaddr_in( destination_port, destination_domain )
-        rescue Exception => e
-          puts "p#{ Process.pid } #{ Time.new } sockaddr in #{ destination_domain_port } #{ e.class }"
+        if colon_idx
+          destination_domain = destination_domain_port[ 0...colon_idx ]
+          destination_port = destination_domain_port[ ( colon_idx + 1 )..-1 ].to_i
+
+          begin
+            destination_addr = Socket.sockaddr_in( destination_port, destination_domain )
+          rescue Exception => e
+            puts "p#{ Process.pid } #{ Time.new } sockaddr in #{ destination_domain_port } #{ e.class }"
+          end
         end
 
         @mutex.synchronize do
@@ -232,7 +236,7 @@ module Girl
     # deal with destination addr
     #
     def deal_with_destination_addr( tund, src_id, destination_addr )
-      dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      dst = Socket.new( Addrinfo.new( destination_addr ).ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
       dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
@@ -814,7 +818,6 @@ module Girl
         when A_NEW_SOURCE
           src_id = data[ 9, 8 ].unpack( 'Q>' ).first
           dst_local_port = tund_info[ :dst_local_ports ][ src_id ]
-          # puts "debug1 got a new source #{ src_id }"
 
           if dst_local_port
             dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
@@ -831,8 +834,8 @@ module Girl
           end
 
           data = data[ 17..-1 ]
-          # puts "debug1 #{ data }"
           destination_domain_port = @custom.decode( data )
+          puts "p#{ Process.pid } #{ Time.new } a new source #{ src_id } #{ destination_domain_port }"
           resolve_domain( tund, src_id, destination_domain_port )
         when SOURCE_STATUS
           src_id, relay_src_pack_id, continue_dst_pack_id  = data[ 9, 24 ].unpack( 'Q>Q>Q>' )

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.72.0'.freeze
+  VERSION = '0.73.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.72.0
+  version: 0.73.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: