girl 0.60.1 → 0.64.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7ae98a97c1517a3cabb320198b9e0d909b74a6c610f7b6e0109b6248b60b530
-  data.tar.gz: 8c987e8a39f60fe03261ad1b9caadac7c6b6faf3bdb898866d4c507d3a492571
+  metadata.gz: 5f4e1bba2efaa28dcf93f09ed4e913b449165cdd55febb11d5b59d88f374e49f
+  data.tar.gz: e23ceb94f65c8edf04b53fb8fd369b47d1aecd602bbdd4057f0498fda63bfeb8
 SHA512:
-  metadata.gz: 468a1ae9530407076582f1c6fc92cf56e3d36b87dbfc9805b7b2dd3a6b4f77294dd14e98d097ed2ab5b50203a569bffd8b572df3acd8caa07cc8b5c890721c04
-  data.tar.gz: c6ef17b8a4dc02a5bd037f4700577c2669d7642b34c51fed9a86ec076e43b7a3810401a24541bd90958a2169406496dbd22a8cf9b1cc062b908a3c95c249ed55
+  metadata.gz: d8f9d02746902687b25c2c17346cae8bda8e493c4b7325afa0c64a6417769dd3c39941cf2668b41041ce5f74205399cdc3ce990808602ff6e748012b5462a284
+  data.tar.gz: b4b52b30693c3d6afca6bd9fee85ac7782afba4b58f475aa73961d3fc8fb3ba21299c745f827631e732dc9e63b2faca5e506dd9f5201e134edd52d38f5fc6097

data/lib/girl/head.rb

@@ -7,7 +7,7 @@ module Girl
   WMEMS_LIMIT           = 100_000                # 写后上限，达到上限暂停写
   RESUME_BELOW          = 50_000                 # 降到多少以下恢复写
   EXPIRE_NEW            = 10                     # 创建之后多久没有流量进来，过期
-  EXPIRE_AFTER          = 900                    # 多久没有新流量进来，过期
+  EXPIRE_AFTER          = 3600                   # 多久没有新流量进来，过期
   CHECK_EXPIRE_INTERVAL = 30                     # 检查过期间隔
   HEARTBEAT_INTERVAL    = 30                     # 心跳间隔
   STATUS_INTERVAL       = 0.3                    # 发送状态间隔

data/lib/girl/proxy_worker.rb

@@ -102,7 +102,7 @@ module Girl
             now = Time.new
 
             if @tun && !@tun.closed?
-              is_expired = @tun_info[ :last_recv_at ] ? ( now - @tun_info[ :last_recv_at ] > EXPIRE_AFTER ) : ( now - @tun_info[ :created_at ] > EXPIRE_NEW )
+              is_expired = @tun_info[ :last_recv_at ].nil? && ( now - @tun_info[ :created_at ] > EXPIRE_NEW )
 
               if is_expired
                 puts "p#{ Process.pid } #{ Time.new } expire tun"
@@ -113,7 +113,7 @@ module Girl
 
                 @tun_info[ :src_exts ].each do | src_addr, src_ext |
                   if src_ext[ :src ].closed? && ( now - src_ext[ :last_continue_at ] > EXPIRE_AFTER )
-                    puts "p#{ Process.pid } #{ Time.new } expire src_ext"
+                    puts "p#{ Process.pid } #{ Time.new } expire src ext"
                     del_src_ext( src_addr )
                   end
                 end
@@ -363,7 +363,7 @@ module Girl
       end
 
       # puts "debug1 a new dst #{ dst.local_address.inspect }"
-      local_port = dst.local_address.ip_unpack
+      local_port = dst.local_address.ip_unpack.last
       @dsts[ local_port ] = dst
       @dst_infos[ dst ] = {
         local_port: local_port, # 本地端口
@@ -454,7 +454,13 @@ module Girl
     # sub http request
     #
     def sub_http_request( data )
-      method, url, proto = data.split( "\r\n" ).first.split( ' ' )
+      lines = data.split( "\r\n" )
+
+      if lines.empty?
+        return [ data, nil ]
+      end
+
+      method, url, proto = lines.first.split( ' ' )
 
       if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://'
         domain_and_port = url.split( '/' )[ 2 ]
@@ -491,7 +497,7 @@ module Girl
         spring = @tun_info[ :chunks ].size > 0 ? ( @tun_info[ :spring ] + 1 ) : 0
         filename = "#{ Process.pid }-#{ @tun_info[ :port ] }.#{ spring }"
         chunk_path = File.join( @tun_chunk_dir, filename )
-        wbuffs = @tun_info[ :wbuffs ].map{ | _src_addr, _data | [ _src_addr, _data.bytesize.pack( 'n' ), _data ].join }
+        wbuffs = @tun_info[ :wbuffs ].map{ | _src_addr, _data | [ _src_addr, [ _data.bytesize ].pack( 'n' ), _data ].join }
 
         begin
           IO.binwrite( chunk_path, wbuffs.join )
@@ -1012,6 +1018,12 @@ module Girl
         if data[ 0, 7 ] == 'CONNECT'
           # puts "debug1 CONNECT"
           domain_and_port = data.split( "\r\n" )[ 0 ].split( ' ' )[ 1 ]
+
+          unless domain_and_port
+            puts "p#{ Process.pid } #{ Time.new } CONNECT miss domain"
+            set_is_closing( src )
+            return
+          end
         elsif data[ 0 ].unpack( 'C' ).first == 5
           # puts "debug1 socks5 #{ data.inspect }"
 
@@ -1058,6 +1070,12 @@ module Girl
           unless domain_and_port
             # puts "debug1 not HTTP"
             domain_and_port = host_line.split( ' ' )[ 1 ]
+
+            unless domain_and_port
+              puts "p#{ Process.pid } #{ Time.new } Host line miss domain"
+              set_is_closing( src )
+              return
+            end
           end
 
           src_info[ :rbuffs ] << data

data/lib/girl/proxyd_worker.rb

@@ -109,7 +109,7 @@ module Girl
                 else
                   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_local_port }"
                       del_dst_ext( tund, dst_local_port )
                       need_trigger = true
                     end
@@ -119,7 +119,7 @@ module Girl
             end
 
             @dst_infos.each do | dst, dst_info |
-              is_expired = dst_info[ :last_recv_at ] ? ( now - dst_info[ :last_recv_at ] > EXPIRE_AFTER ) : ( now - dst_info[ :created_at ] > EXPIRE_NEW )
+              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"
@@ -791,8 +791,13 @@ module Girl
       tund_info = @tund_infos[ tund ]
 
       if from_addr != tund_info[ :tun_addr ]
-        puts "p#{ Process.pid } #{ Time.new } #{ addrinfo.inspect } not match #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
-        return
+        if addrinfo.ip_port == Addrinfo.new( tund_info[ :tun_addr ] ).ip_port
+          puts "p#{ Process.pid } #{ Time.new } tun ip changed #{ addrinfo.inspect }"
+          tund_info[ :tun_addr ] = from_addr
+        else
+          puts "p#{ Process.pid } #{ Time.new } #{ addrinfo.inspect } not match #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
+          return
+        end
       end
 
       tund_info[ :is_tunneled ] = true

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.60.1'.freeze
+  VERSION = '0.64.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.60.1
+  version: 0.64.1
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: