girl 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 836b54e1549dfed638c775a99d128c18ce079d91bc508933635a8a8cbdfb3c2e
-  data.tar.gz: 7c1f1bab96cab7395e49b2dd71ec5dfc1073b57ffa6611bff7abeb1a3ef8162b
+  metadata.gz: 3e6e47afe34c123e702c013b4b2f71c3ef836902edd8ab7508b9fe666c2052c7
+  data.tar.gz: 673a5b27d4863a9c1daa34abc94536e7c7d68549363071e73d9f57a1db4056bc
 SHA512:
-  metadata.gz: 61a0a02a8a480343cd27f295d82dda48ab93e0d0c486a0d2cb82e8961477bffcc20e219238d794db8056ec00cb175955eb7c1a111b35d4fd189edec069a7390d
-  data.tar.gz: 694ea8625f406e0e2293c20b7144398ac2a09978f510d91387e3caa76d967c72dfc712334d0d1994bf8ac2822ed0b27552d7c88924b449c1fad9ff965e4293be
+  metadata.gz: 1c105f47f7cfd38572adef3c40be156e88fe1b767d6144cd923154e57c19a5508fbaaaff325e2c252f8371ca97c621a8a6b5ce020381c8738b2529bade9840b9
+  data.tar.gz: 3b13786e8062bad65c975e48340c2b1deae88be8965862543bd644783b3ecbab6b446c2e872a64169a8380fef0679d7c504c6fdbfbe08995d5ae2662b67319b8

data/girl.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
 girl.gemspec
 lib/girl.rb
 lib/girl/concurrent_hash.rb
-lib/girl/custom_dns_query.rb
 lib/girl/custom.rb
 lib/girl/head.rb
 lib/girl/proxy_custom.rb

data/lib/girl/concurrent_hash.rb

@@ -1,26 +1,26 @@
-class ConcurrentHash < Hash
-  def initialize
-    super
-    @mutex = Mutex.new
-  end
-
-  def []( *args )
-    @mutex.synchronize { super }
-  end
-
-  def []=( *args )
-    @mutex.synchronize { super }
-  end
-
-  def delete( *args )
-    @mutex.synchronize { super }
-  end
-
-  def each( *args )
-    @mutex.synchronize { super }
-  end
-
-  def clear( *args )
-    @mutex.synchronize { super }
-  end
-end
+class ConcurrentHash < Hash
+  def initialize
+    super
+    @mutex = Mutex.new
+  end
+
+  def []( *args )
+    @mutex.synchronize { super }
+  end
+
+  def []=( *args )
+    @mutex.synchronize { super }
+  end
+
+  def delete( *args )
+    @mutex.synchronize { super }
+  end
+
+  def each( *args )
+    @mutex.synchronize { super }
+  end
+
+  def clear( *args )
+    @mutex.synchronize { super }
+  end
+end

data/lib/girl/proxy.rb

@@ -14,8 +14,8 @@ require 'socket'
 #
 =begin
 C:  1 hello            -> hello
-    2 tund port        -> n: tund port
-    3 a new source     -> Q>: src id -> encoded destination address
+    2 tund port        -> n: atund port -> n: btund port
+    3 a new source     -> Q>: src id -> destination
     4 paired           -> Q>: src id -> n: dst id
     5 dest status      NOT USE
     6 source status    NOT USE
@@ -32,13 +32,11 @@ C:  1 hello            -> hello
    17 continue         NOT USE
    18 is resend ready  NOT USE
    19 resend ready     NOT USE
-   20 resolv           -> Q>: src id -> encoded domain
-   21 resolved         -> Q>: src id -> encoded ip
+   20 resolv           NOT USE
+   21 resolved         NOT USE
    22 heartbeat        NOT USE
    23 unknown ctl addr
    24 ctl fin
-   25 source eof       -> Q>: dst id
-   26 dest eof         -> Q>: src id
   101 traff infos
   101 traff infos      -> [ C: im len -> im -> Q>: traff in ->  Q>: traff out ]
 =end

data/lib/girl/proxy_custom.rb

@@ -1,16 +1,16 @@
-require 'girl/custom'
-
-module Girl
-  class ProxyCustom
-    include Custom
-
-    def initialize( im )
-      @im = im
-    end
-
-    def hello
-      @im
-    end
-
-  end
-end
+require 'girl/custom'
+
+module Girl
+  class ProxyCustom
+    include Custom
+
+    def initialize( im )
+      @im = im
+    end
+
+    def hello
+      @im
+    end
+
+  end
+end

data/lib/girl/proxy_worker.rb

@@ -6,6 +6,7 @@ module Girl
     #
     def initialize( redir_port, proxyd_host, proxyd_port, directs, remotes, im )
       @proxyd_host = proxyd_host
+      @proxyd_port = proxyd_port
       @proxyd_addr = Socket.sockaddr_in( proxyd_port, proxyd_host )
       @directs = directs
       @remotes = remotes
@@ -19,7 +20,7 @@ module Girl
       @resume_srcs = []
       @resume_dsts = []
       @resume_btuns = []
-      @pending_srcs = []                     # 还没配到tund，暂存的src
+      @pending_srcs = []                     # 还没得到atund和btund地址，暂存的src
       @roles = ConcurrentHash.new            # sock => :dotr / :redir / :ctl / :src / :dst / :atun / :btun
       @src_infos = ConcurrentHash.new        # src => {}
       @dst_infos = ConcurrentHash.new        # dst => {}
@@ -296,7 +297,7 @@ module Girl
       close_sock( atun )
       atun_info = @atun_infos.delete( atun )
       src = atun_info[ :src ]
-      
+
       if src then
         @paused_srcs.delete( src )
       end
@@ -430,9 +431,8 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
 
-      if ip_info.ipv4_loopback? \
-        || ip_info.ipv6_loopback? \
-        || ( ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) ) then
+      if ( ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) ) \
+        || ( ( ip_info.ip_address == @proxyd_host ) && ( src_info[ :destination_port ] == @proxyd_port ) ) then
         puts "p#{ Process.pid } #{ Time.new } ignore #{ ip_info.ip_address }:#{ src_info[ :destination_port ] }"
         add_closing_src( src )
         return
@@ -449,7 +449,6 @@ module Girl
         is_direct = @is_direct_caches[ ip_info.ip_address ]
       else
         is_direct = @directs.any? { | direct | direct.include?( ip_info.ip_address ) }
-        # 判断直连耗时较长（树莓派 0.27秒），这里可能切去主线程，回来src可能已关闭
         puts "p#{ Process.pid } #{ Time.new } cache is direct #{ ip_info.ip_address } #{ is_direct }"
         @is_direct_caches[ ip_info.ip_address ] = is_direct
       end
@@ -458,7 +457,6 @@ module Girl
         # puts "debug #{ ip_info.inspect } hit directs"
         new_a_dst( src, ip_info )
       else
-        # 走远端
         # puts "debug #{ ip_info.inspect } go tunnel"
         set_proxy_type_tunnel( src )
       end
@@ -724,6 +722,7 @@ module Girl
     # new tuns
     #
     def new_tuns( src_id, dst_id )
+      return if @ctl_info[ :atund_addr ].nil? || @ctl_info[ :btund_addr ].nil?
       src = @srcs[ src_id ]
       return if src.nil? || src.closed?
       src_info = @src_infos[ src ]
@@ -864,6 +863,7 @@ module Girl
     #
     def send_ctlmsg( data )
       return if @ctl.nil? || @ctl.closed?
+      data = @custom.encode( data )
 
       begin
         @ctl.sendmsg( data, 0, @proxyd_addr )
@@ -925,25 +925,6 @@ module Girl
       add_write( src )
     end
 
-    ##
-    # sub http request
-    #
-    def sub_http_request( data )
-      lines = data.split( "\r\n" )
-
-      return [ data, nil ] if lines.empty?
-
-      method, url, proto = lines.first.split( ' ' )
-
-      if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://' then
-        domain_port = url.split( '/' )[ 2 ]
-        data = data.sub( "http://#{ domain_port }", '' )
-        # puts "debug subed #{ data.inspect } #{ domain_port }"
-      end
-
-      [ data, domain_port ]
-    end
-
     ##
     # read dotr
     #
@@ -1042,6 +1023,7 @@ module Girl
         return
       end
 
+      data = @custom.decode( data )
       ctl_num = data[ 0 ].unpack( 'C' ).first
 
       case ctl_num
@@ -1060,7 +1042,7 @@ module Girl
           @pending_srcs.clear
         end
       when PAIRED then
-        return if @ctl_info[ :atund_addr ].nil? || @ctl_info[ :btund_addr ].nil? || data.size != 11
+        return if data.size != 11
         src_id, dst_id = data[ 1, 10 ].unpack( 'Q>n' )
         # puts "debug got paired #{ src_id } #{ dst_id }"
         @ctl_info[ :resends ].delete( [ A_NEW_SOURCE, src_id ].pack( 'CQ>' ) )
@@ -1159,7 +1141,16 @@ module Girl
             return
           end
 
-          data, domain_port = sub_http_request( data )
+          lines = data.split( "\r\n" )
+
+          unless lines.empty? then
+            method, url, proto = lines.first.split( ' ' )
+
+            if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://' then
+              domain_port = url.split( '/' )[ 2 ]
+              # puts "debug domain port #{ domain_port }"
+            end
+          end
 
           unless domain_port then
             # puts "debug not HTTP"
@@ -1226,10 +1217,6 @@ module Girl
       when :tunnel then
         atun = src_info[ :atun ]
 
-        if atun && !src_info[ :is_connect ] then
-          data, _ = sub_http_request( data )
-        end
-
         if atun then
           add_atun_wbuff( atun, pack_a_chunk( data ) )
         else
@@ -1240,10 +1227,6 @@ module Girl
         dst = src_info[ :dst ]
 
         if dst then
-          unless src_info[ :is_connect ] then
-            data, _ = sub_http_request( data )
-          end
-
           add_dst_wbuff( dst, data )
         else
           # puts "debug add src.rbuff #{ data.bytesize }"

data/lib/girl/proxyd_custom.rb

@@ -1,12 +1,12 @@
-require 'girl/custom'
-
-module Girl
-  class ProxydCustom
-    include Custom
-
-    def check( data, addrinfo )
-      :success
-    end
-
-  end
-end
+require 'girl/custom'
+
+module Girl
+  class ProxydCustom
+    include Custom
+
+    def check( data, addrinfo )
+      :success
+    end
+
+  end
+end

data/lib/girl/proxyd_worker.rb

@@ -221,7 +221,7 @@ module Girl
       close_sock( btun )
       btun_info = @btun_infos.delete( btun )
       dst = btun_info[ :dst ]
-      
+
       if dst then
         @paused_dsts.delete( dst )
       end
@@ -519,6 +519,15 @@ module Girl
       @dotw.write( '.' )
     end
 
+    ##
+    # pack a chunk
+    #
+    def pack_a_chunk( data )
+      # puts "debug pack a chunk"
+      data = @custom.encode( data )
+      "#{ [ data.bytesize ].pack( 'n' ) }#{ data }"
+    end
+
     ##
     # resolve domain
     #
@@ -564,6 +573,8 @@ module Girl
     # send ctlmsg
     #
     def send_ctlmsg( data, to_addr )
+      data = @custom.encode( data )
+
       begin
         @ctld.sendmsg( data, 0, to_addr )
       rescue Exception => e
@@ -635,6 +646,7 @@ module Girl
     #
     def read_ctld( ctld )
       data, addrinfo, rflags, *controls = ctld.recvmsg
+      data = @custom.decode( data )
       ctl_num = data[ 0 ].unpack( 'C' ).first
       ctl_addr = addrinfo.to_sockaddr
       ctl_info = @ctl_infos[ ctl_addr ]
@@ -777,12 +789,10 @@ module Girl
       end
 
       @traff_ins[ dst_info[ :im ] ] += data.bytesize
-      # puts "debug read dst #{ data.bytesize }, encode"
-      data = @custom.encode( data )
-      data = "#{ [ data.bytesize ].pack( 'n' ) }#{ data }"
+      # puts "debug read dst #{ data.bytesize }"
 
       if btun then
-        add_btun_wbuff( btun, data )
+        add_btun_wbuff( btun, pack_a_chunk( data ) )
       else
         # puts "debug add dst.rbuff #{ data.bytesize }"
         add_dst_rbuff( dst, data )
@@ -1009,8 +1019,17 @@ module Girl
       btun_info[ :domain_port ] = dst_info[ :domain_port ]
 
       unless dst_info[ :rbuff ].empty? then
-        # puts "debug move dst.rbuff to btun.wbuff"
-        add_btun_wbuff( btun, dst_info[ :rbuff ] )
+        data2 = ''
+
+        until dst_info[ :rbuff ].empty? do
+          _data = dst_info[ :rbuff ][ 0, 65535 ]
+          data_size = _data.bytesize
+          # puts "debug move dst.rbuff to btun.wbuff"
+          data2 << pack_a_chunk( _data )
+          dst_info[ :rbuff ] = dst_info[ :rbuff ][ data_size..-1 ]
+        end
+
+        add_btun_wbuff( btun, data2 )
       end
 
       dst_info[ :btun ] = btun

data/lib/girl/relay.rb

@@ -3,7 +3,6 @@ require 'girl/concurrent_hash'
 require 'girl/head'
 require 'girl/proxy_custom'
 require 'girl/relay_worker'
-require 'girl/resolv_custom'
 require 'girl/version'
 require 'json'
 require 'socket'

data/lib/girl/relay_worker.rb

@@ -13,7 +13,6 @@ module Girl
       @directs = directs
       @remotes = remotes
       @custom = Girl::ProxyCustom.new( im )
-      @resolv_custom = Girl::ResolvCustom.new
       @reads = []
       @writes = []
       @closing_rsvs = []
@@ -24,7 +23,7 @@ module Girl
       @resume_srcs = []
       @resume_dsts = []
       @resume_btuns = []
-      @pending_srcs = []                     # 还没配到tund，暂存的src
+      @pending_srcs = []                     # 还没得到atund和btund地址，暂存的src
       @roles = ConcurrentHash.new            # sock => :dotr / :resolv / :rsv / :redir / :proxy / :src / :dst / :atun / :btun
       @rsv_infos = ConcurrentHash.new        # rsv => {}
       @src_infos = ConcurrentHash.new        # src => {}
@@ -445,9 +444,8 @@ module Girl
       return if src.closed?
       src_info = @src_infos[ src ]
 
-      if ip_info.ipv4_loopback? \
-        || ip_info.ipv6_loopback? \
-        || ( ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) ) then
+      if ( ( @ip_address_list.any? { | addrinfo | addrinfo.ip_address == ip_info.ip_address } ) && ( src_info[ :destination_port ] == @redir_port ) ) \
+        || ( ( ip_info.ip_address == @proxyd_host ) && ( src_info[ :destination_port ] == @proxyd_port ) ) then
         puts "p#{ Process.pid } #{ Time.new } ignore #{ ip_info.ip_address }:#{ src_info[ :destination_port ] }"
         add_closing_src( src )
         return
@@ -464,7 +462,6 @@ module Girl
         is_direct = @is_direct_caches[ ip_info.ip_address ]
       else
         is_direct = @directs.any? { | direct | direct.include?( ip_info.ip_address ) }
-        # 判断直连耗时较长（树莓派 0.27秒），这里可能切去主线程，回来src可能已关闭
         puts "p#{ Process.pid } #{ Time.new } cache is direct #{ ip_info.ip_address } #{ is_direct }"
         @is_direct_caches[ ip_info.ip_address ] = is_direct
       end
@@ -473,7 +470,6 @@ module Girl
         # puts "debug #{ ip_info.inspect } hit directs"
         new_a_dst( src, ip_info )
       else
-        # 走远端
         # puts "debug #{ ip_info.inspect } go tunnel"
         set_proxy_type_tunnel( src )
       end
@@ -754,7 +750,7 @@ module Girl
       rsv.bind( Socket.sockaddr_in( 0, '0.0.0.0' ) )
 
       if @qnames.any? { | qname | data.include?( qname ) } then
-        data = @resolv_custom.encode( data )
+        data = @custom.encode( data )
         to_addr = @resolvd_addr
       else
         to_addr = @nameserver_addr
@@ -774,6 +770,7 @@ module Girl
     # new tuns
     #
     def new_tuns( src_id, dst_id )
+      return if @ctl_info[ :atund_addr ].nil? || @ctl_info[ :btund_addr ].nil?
       src = @srcs[ src_id ]
       return if src.nil? || src.closed?
       src_info = @src_infos[ src ]
@@ -860,6 +857,7 @@ module Girl
     #
     def send_ctlmsg( data )
       return if @ctl.nil? || @ctl.closed?
+      data = @custom.encode( data )
 
       begin
         @ctl.sendmsg( data, 0, @proxyd_addr )
@@ -888,9 +886,7 @@ module Girl
     def send_data( sock, to_addr, data )
       begin
         sock.sendmsg( data, 0, to_addr )
-      rescue IO::WaitWritable, Errno::EINTR
-        print 'w'
-      rescue Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN => e
+      rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } sendmsg to #{ to_addr.ip_unpack.inspect } #{ e.class }"
       end
     end
@@ -933,25 +929,6 @@ module Girl
       add_write( src )
     end
 
-    ##
-    # sub http request
-    #
-    def sub_http_request( data )
-      lines = data.split( "\r\n" )
-
-      return [ data, nil ] if lines.empty?
-
-      method, url, proto = lines.first.split( ' ' )
-
-      if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://' then
-        domain_port = url.split( '/' )[ 2 ]
-        data = data.sub( "http://#{ domain_port }", '' )
-        # puts "debug subed #{ data.inspect } #{ domain_port }"
-      end
-
-      [ data, domain_port ]
-    end
-
     ##
     # read dotr
     #
@@ -1018,7 +995,7 @@ module Girl
       # puts "debug rsv recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
 
       if addrinfo.to_sockaddr == @resolvd_addr then
-        data = @resolv_custom.decode( data )
+        data = @custom.decode( data )
       end
 
       rsv_info = @rsv_infos[ rsv ]
@@ -1093,6 +1070,7 @@ module Girl
         return
       end
 
+      data = @custom.decode( data )
       ctl_num = data[ 0 ].unpack( 'C' ).first
 
       case ctl_num
@@ -1111,7 +1089,7 @@ module Girl
           @pending_srcs.clear
         end
       when PAIRED then
-        return if @ctl_info[ :atund_addr ].nil? || @ctl_info[ :btund_addr ].nil? || data.size != 11
+        return if data.size != 11
         src_id, dst_id = data[ 1, 10 ].unpack( 'Q>n' )
         # puts "debug got paired #{ src_id } #{ dst_id }"
         @ctl_info[ :resends ].delete( [ A_NEW_SOURCE, src_id ].pack( 'CQ>' ) )

data/lib/girl/resolv_custom.rb

@@ -1,7 +1,7 @@
-require 'girl/custom_dns_query'
+require 'girl/custom'
 
 module Girl
   class ResolvCustom
-    include CustomDnsQuery
+    include Custom
   end
 end

data/lib/girl/resolvd_worker.rb

@@ -5,7 +5,7 @@ module Girl
     # initialize
     #
     def initialize( resolvd_port, nameserver )
-      @resolv_custom = Girl::ResolvCustom.new
+      @custom = Girl::ResolvCustom.new
       @nameserver_addr = Socket.sockaddr_in( 53, nameserver )
       @roles = ConcurrentHash.new     # :resolvd / :dst
       @reads = []
@@ -176,7 +176,7 @@ module Girl
     def read_resolvd( resolvd )
       data, addrinfo, rflags, *controls = resolvd.recvmsg
       # puts "debug1 resolvd recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
-      data = @resolv_custom.decode( data )
+      data = @custom.decode( data )
       new_a_dst( addrinfo.to_sockaddr, data )
     end
 
@@ -187,7 +187,7 @@ module Girl
       data, addrinfo, rflags, *controls = dst.recvmsg
       # puts "debug1 dst recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      data = @resolv_custom.encode( data )
+      data = @custom.encode( data )
       send_data( @resolvd, dst_info[ :src_addr ], data )
       close_dst( dst )
     end

data/lib/girl/ssl_worker.rb

@@ -236,6 +236,17 @@ module Girl
       end
     end
 
+    ##
+    # close redir
+    #
+    def close_redir( redir )
+      return if redir.closed?
+      redir.close
+      @roles.delete( redir )
+      @reads.delete( redir )
+      @src_infos.each { | src, _ | close_src( src ) }
+    end
+
     ##
     # close sock
     #
@@ -369,7 +380,7 @@ module Girl
           @paused_dsts.each do | dst |
             dst_info = @dst_infos[ dst ]
             src = dst_info[ :src ]
-            
+
             if src && !src.closed? then
               src_info = @src_infos[ src ]
 
@@ -560,15 +571,17 @@ module Girl
 
         unless accepted then
           puts "p#{ Process.pid } #{ Time.new } accept timeout"
-          redir.close
-          @roles.delete( redir )
-          @reads.delete( redir )
+          close_redir( redir )
           new_a_redir
         end
       end
 
       begin
         src = redir.accept
+      rescue SystemExit => e
+        puts "p#{ Process.pid } #{ Time.new } redir accept #{ e.class }"
+        close_redir( redir )
+        return
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } redir accept #{ e.class }"
         puts e.full_message

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '4.1.0'.freeze
+  VERSION = '4.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email:
@@ -21,7 +21,6 @@ files:
 - lib/girl.rb
 - lib/girl/concurrent_hash.rb
 - lib/girl/custom.rb
-- lib/girl/custom_dns_query.rb
 - lib/girl/head.rb
 - lib/girl/proxy.rb
 - lib/girl/proxy_custom.rb

data/lib/girl/custom_dns_query.rb

@@ -1,11 +0,0 @@
-module Girl
-  module CustomDnsQuery
-    def encode( data )
-      data.reverse
-    end
-
-    def decode( data )
-      data.reverse
-    end
-  end
-end