girl 0.71.1 → 0.74.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b6edf01d2b2157f11757d1a39b2f774507f114e0638aed6192ee19b29b03d5
-  data.tar.gz: 6253f10b1525763929b083e51a7693516e82ab34d2dfd374beae48e4305cf550
+  metadata.gz: '094ccee84b18d04b1061a8c29663acabd184ac524437b2347b34a30cb14a5880'
+  data.tar.gz: 37ef3aa95152d92cf36609eb32bb6658780fea3927ea1b30e062029e7ef1de10
 SHA512:
-  metadata.gz: c4d9edc69891b09e920bf27b6ad664f1243b41a182192fe26f1264ef83ebdd733c77e19d833d89f379cd63b98de62ec46a459b5be7a2238372ab0347298c3e6f
-  data.tar.gz: f3e6491a9267fb9eeef29457a6be5a74da026f1d7a37a89391eb8dec8b160e1a3d7d2eb5170acefd5aabcc792ac45e5c9bf0b8d49661654b158e5f3012d1d75a
+  metadata.gz: '095868fe1a0d43435db1f8c461f09abd28114cac5f99494a02c5062ede1c476589b623c453e852ca2674727ff9e371c17d5ddc1cce46a408a085ef71c75fcaeb'
+  data.tar.gz: 7a1190902d3f2ef39965f2154d91ab15cabe63adae1613a3ad745a14cd2f46b3c70a3f06174dbda5929af6dd57970a9ca5085c521fd00dcefeaf9009a6fbad16

data/lib/girl/proxy_worker.rb

@@ -18,7 +18,6 @@ module Girl
       @writes = []
       @roles = {}         # sock => :dotr / :proxy / :src / :dst / :tun
       @src_infos = {}     # src => {}
-      @dsts = {}          # local_port => dst
       @dst_infos = {}     # dst => {}
       @resolv_caches = {} # domain => [ ip, created_at ]
 
@@ -114,7 +113,7 @@ module Girl
 
                 @tun_info[ :src_exts ].each do | src_id, src_ext |
                   if src_ext[ :src ].closed? && ( now - src_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                    puts "p#{ Process.pid } #{ Time.new } expire src ext #{ src_id }"
+                    puts "p#{ Process.pid } #{ Time.new } expire src ext #{ src_ext[ :destination_domain ] }"
                     del_src_ext( src_id )
                   end
                 end
@@ -124,20 +123,16 @@ module Girl
             end
 
             @src_infos.each do | src, src_info |
-              is_expired = src_info[ :last_recv_at ].nil? && ( now - src_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire src"
+              if now - src_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire src #{ src_info[ :destination_domain ] }"
                 set_is_closing( src )
                 need_trigger = true
               end
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ].nil?  && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire dst"
+              if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain ] }"
                 set_is_closing( dst )
                 need_trigger = true
               end
@@ -217,12 +212,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 )
@@ -232,11 +221,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
 
@@ -256,12 +245,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 )
@@ -275,11 +263,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 )
@@ -343,10 +331,11 @@ 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 )
+      domain = src_info[ :destination_domain ]
+      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 )
@@ -364,17 +353,16 @@ module Girl
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
       local_port = dst.local_address.ip_port
-      @dsts[ local_port ] = dst
       @dst_infos[ dst ] = {
-        local_port: local_port, # 本地端口
-        src: src,               # 对应src
-        wbuff: '',              # 写前
-        cache: '',              # 块读出缓存
-        chunks: [],             # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,              # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,   # 创建时间
-        last_recv_at: nil,      # 上一次收到流量的时间，过期关闭
-        is_closing: false       # 是否准备关闭
+        local_port: local_port,     # 本地端口
+        src: src,                   # 对应src
+        domain: domain,             # 域名
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( dst, :dst )
@@ -405,27 +393,29 @@ module Girl
         new_a_tun
       end
 
+      src_info = @src_infos[ src ]
+      src_id = src_info[ :id ]
+      destination_port = src_info[ :destination_port ]
+      destination_domain = src_info[ :destination_domain ]
+
       src_ext = {
-        src: src,                  # src
-        dst_port: nil,             # 远端dst端口
-        wmems: {},                 # 写后 pack_id => data
-        send_ats: {},              # 上一次发出时间 pack_id => send_at
-        relay_pack_id: 0,          # 转发到几
-        continue_dst_pack_id: 0,   # 收到几
-        pieces: {},                # 跳号包 dst_pack_id => data
-        is_dst_closed: false,      # dst是否已关闭
-        biggest_dst_pack_id: 0,    # dst最大包号码
-        completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+        src: src,                               # src
+        dst_port: nil,                          # 远端dst端口
+        destination_domain: destination_domain, # 目的地域名
+        wmems: {},                              # 写后 pack_id => data
+        send_ats: {},                           # 上一次发出时间 pack_id => send_at
+        relay_pack_id: 0,                       # 转发到几
+        continue_dst_pack_id: 0,                # 收到几
+        pieces: {},                             # 跳号包 dst_pack_id => data
+        is_dst_closed: false,                   # dst是否已关闭
+        biggest_dst_pack_id: 0,                 # dst最大包号码
+        completed_pack_id: 0,                   # 完成到几（对面收到几）
+        last_continue_at: Time.new              # 上一次发生流量的时间
       }
 
-      src_info = @src_infos[ src ]
-      src_id = src_info[ :id ]
       @tun_info[ :src_exts ][ src_id ] = src_ext
       src_info[ :proxy_type ] = :tunnel
 
-      destination_port = src_info[ :destination_port ]
-      destination_domain = src_info[ :destination_domain ]
       destination_domain_port = [ destination_domain, destination_port ].join( ':' )
       data = [ [ 0, A_NEW_SOURCE, src_id ].pack( 'Q>CQ>' ), @custom.encode( destination_domain_port ) ].join
       loop_send_a_new_source( src_ext, data )
@@ -664,7 +654,6 @@ module Girl
         end
       end
 
-      @dsts.delete( dst_info[ :local_port ] )
       set_is_closing( dst_info[ :src ] )
     end
 
@@ -778,6 +767,7 @@ module Girl
       # puts "debug2 write src #{ written }"
       data = data[ written..-1 ]
       src_info[ from ] = data
+      src_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -829,6 +819,7 @@ module Girl
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -850,6 +841,10 @@ module Girl
           tun.sendmsg( data, 0, to_addr )
         rescue IO::WaitWritable, Errno::EINTR
           return
+        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+          puts "#{ Time.new } #{ e.class }, close tun"
+          close_tun( tun )
+          return
         end
 
         @tun_info[ :ctlmsgs ].shift
@@ -868,6 +863,10 @@ module Girl
               tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
             rescue IO::WaitWritable, Errno::EINTR
               return
+            rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+              puts "#{ Time.new } #{ e.class }, close tun"
+              close_tun( tun )
+              return
             end
           end
         end
@@ -936,6 +935,10 @@ module Girl
           tun.sendmsg( data, 0, @tun_info[ :tund_addr ] )
         rescue IO::WaitWritable, Errno::EINTR
           return
+        rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH => e
+          puts "#{ Time.new } #{ e.class }, close tun"
+          close_tun( tun )
+          return
         end
 
         # puts "debug2 written pack #{ pack_id }"
@@ -969,22 +972,21 @@ module Girl
       # puts "debug1 accept a src #{ addrinfo.inspect } #{ id }"
 
       @src_infos[ src ] = {
-        id: id,                  # id
-        proxy_proto: :uncheck,   # :uncheck / :http / :socks5
-        proxy_type: :uncheck,    # :uncheck / :checking / :direct / :tunnel / :negotiation
-        dst: nil,                # :direct的场合，对应的dst
-        destination_domain: nil, # 目的地域名
-        destination_port: nil,   # 目的地端口
-        biggest_pack_id: 0,      # 最大包号码
-        is_connect: true,        # 代理协议是http的场合，是否是CONNECT
-        rbuffs: [],              # 非CONNECT，dst或者远端dst未准备好，暂存流量 [ pack_id, data ]
-        wbuff: '',               # 写前
-        cache: '',               # 块读出缓存
-        chunks: [],              # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,               # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,    # 创建时间
-        last_recv_at: nil,       # 上一次收到流量的时间，过期关闭
-        is_closing: false        # 是否准备关闭
+        id: id,                     # id
+        proxy_proto: :uncheck,      # :uncheck / :http / :socks5
+        proxy_type: :uncheck,       # :uncheck / :checking / :direct / :tunnel / :negotiation
+        dst: nil,                   # :direct的场合，对应的dst
+        destination_domain: nil,    # 目的地域名
+        destination_port: nil,      # 目的地端口
+        biggest_pack_id: 0,         # 最大包号码
+        is_connect: true,           # 代理协议是http的场合，是否是CONNECT
+        rbuffs: [],                 # 非CONNECT，dst或者远端dst未准备好，暂存流量 [ pack_id, data ]
+        wbuff: '',                  # 写前
+        cache: '',                  # 块读出缓存
+        chunks: [],                 # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                  # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new, # 上一次发生流量的时间
+        is_closing: false           # 是否准备关闭
       }
 
       add_read( src, :src )
@@ -1006,7 +1008,7 @@ module Girl
 
       # puts "debug2 read src #{ data.inspect }"
       src_info = @src_infos[ src ]
-      src_info[ :last_recv_at ] = Time.new
+      src_info[ :last_continue_at ] = Time.new
       proxy_type = src_info[ :proxy_type ]
 
       case proxy_type
@@ -1113,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
 
@@ -1196,7 +1198,7 @@ module Girl
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
       src = dst_info[ :src ]
 
       if src.closed?

data/lib/girl/proxyd_worker.rb

@@ -112,7 +112,7 @@ module Girl
 
                   tund_info[ :dst_exts ].each do | dst_local_port, dst_ext |
                     if dst_ext[ :dst ].closed? && ( now - dst_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                      puts "p#{ Process.pid } #{ Time.new } expire dst ext #{ dst_local_port }"
+                      puts "p#{ Process.pid } #{ Time.new } expire dst ext #{ dst_ext[ :domain_port ] }"
                       del_dst_ext( tund, dst_local_port )
                     end
                   end
@@ -123,10 +123,8 @@ module Girl
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ].nil? && ( now - dst_info[ :created_at ] > EXPIRE_NEW )
-
-              if is_expired
-                puts "p#{ Process.pid } #{ Time.new } expire dst"
+              if now - dst_info[ :last_continue_at ] > EXPIRE_AFTER
+                puts "p#{ Process.pid } #{ Time.new } expire dst #{ dst_info[ :domain_port ] }"
                 set_is_closing( dst )
                 need_trigger = true
               end
@@ -195,7 +193,7 @@ module Girl
 
         if Time.new - created_at < RESOLV_CACHE_EXPIRE
           # puts "debug1 #{ destination_domain_port } hit resolv cache #{ Addrinfo.new( destination_addr ).inspect }"
-          deal_with_destination_addr( tund, src_id, destination_addr )
+          deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
           return
         end
 
@@ -204,13 +202,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
@@ -219,7 +221,7 @@ module Girl
             @resolv_caches[ destination_domain_port ] = [ destination_addr, Time.new ]
 
             unless tund.closed?
-              if deal_with_destination_addr( tund, src_id, destination_addr )
+              if deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
                 next_tick
               end
             end
@@ -231,8 +233,8 @@ 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 )
+    def deal_with_destination_addr( tund, src_id, destination_addr, destination_domain_port )
+      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
@@ -246,33 +248,34 @@ module Girl
       local_port = dst.local_address.ip_port
 
       @dst_infos[ dst ] = {
-        local_port: local_port, # 本地端口
-        tund: tund,             # 对应tund
-        biggest_pack_id: 0,     # 最大包号码
-        wbuff: '',              # 写前
-        cache: '',              # 块读出缓存
-        chunks: [],             # 块队列，写前达到块大小时结一个块 filename
-        spring: 0,              # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
-        created_at: Time.new,   # 创建时间
-        last_recv_at: nil,      # 上一次收到流量的时间，过期关闭
-        is_closing: false       # 是否准备关闭
+        local_port: local_port,               # 本地端口
+        tund: tund,                           # 对应tund
+        domain_port: destination_domain_port, # 域名和端口
+        biggest_pack_id: 0,                   # 最大包号码
+        wbuff: '',                            # 写前
+        cache: '',                            # 块读出缓存
+        chunks: [],                           # 块队列，写前达到块大小时结一个块 filename
+        spring: 0,                            # 块后缀，结块时，如果块队列不为空，则自增，为空，则置为0
+        last_continue_at: Time.new,           # 上一次发生流量的时间
+        is_closing: false                     # 是否准备关闭
       }
       add_read( dst, :dst )
 
       tund_info = @tund_infos[ tund ]
       tund_info[ :dst_local_ports ][ src_id ] = local_port
       tund_info[ :dst_exts ][ local_port ] = {
-        dst: dst,                  # dst
-        src_id: src_id,            # 近端src id
-        wmems: {},                 # 写后 pack_id => data
-        send_ats: {},              # 上一次发出时间 pack_id => send_at
-        relay_pack_id: 0,          # 转发到几
-        continue_src_pack_id: 0,   # 收到几
-        pieces: {},                # 跳号包 src_pack_id => data
-        is_src_closed: false,      # src是否已关闭
-        biggest_src_pack_id: 0,    # src最大包号码
-        completed_pack_id: 0,      # 完成到几（对面收到几）
-        last_continue_at: Time.new # 创建，或者上一次收到连续流量，或者发出新包的时间
+        dst: dst,                             # dst
+        src_id: src_id,                       # 近端src id
+        domain_port: destination_domain_port, # 域名和端口
+        wmems: {},                            # 写后 pack_id => data
+        send_ats: {},                         # 上一次发出时间 pack_id => send_at
+        relay_pack_id: 0,                     # 转发到几
+        continue_src_pack_id: 0,              # 收到几
+        pieces: {},                           # 跳号包 src_pack_id => data
+        is_src_closed: false,                 # src是否已关闭
+        biggest_src_pack_id: 0,               # src最大包号码
+        completed_pack_id: 0,                 # 完成到几（对面收到几）
+        last_continue_at: Time.new            # 上一次发生流量的时间
       }
 
       data = [ 0, PAIRED, src_id, local_port ].pack( 'Q>CQ>n' )
@@ -582,6 +585,7 @@ module Girl
       # puts "debug2 write dst #{ written }"
       data = data[ written..-1 ]
       dst_info[ from ] = data
+      dst_info[ :last_continue_at ] = Time.new
     end
 
     ##
@@ -771,7 +775,7 @@ module Girl
 
       # puts "debug2 read dst #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      dst_info[ :last_recv_at ] = Time.new
+      dst_info[ :last_continue_at ] = Time.new
       tund = dst_info[ :tund ]
 
       if tund.closed?
@@ -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.71.1'.freeze
+  VERSION = '0.74.0'.freeze
 end

metadata

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