girl 0.75.0 → 0.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac2f8ddb303a57e5c898754c88710847686e84b3ef406c053ef926424da78e2b
-  data.tar.gz: 4506688a3176c9effe1804e3d247379a79d96906e4c8417d6f0660ecaa082141
+  metadata.gz: 7758f3ee995f864831703ae7f9615dba9f0280ebcb10130f29c24f8f862c43c8
+  data.tar.gz: 3758aaac1ded47dfa0d2336332679de27d3ed711593bb7f7e6e48b5225eaaee8
 SHA512:
-  metadata.gz: 34559a0ab1375eb9b07bab0fbea3d762e94ac7282ed8868e3ab672aa816f87f6edc3273b1204c565c189201bd2a49e993477a6da525b472e95c18b804526323e
-  data.tar.gz: d7580c92099e6974287fbc8384010d3b5ed34966832ff9c1a0bda42cdeac923768fa431b84c83dee8926c3b4bc8f2b0761bdb9a4a14212870a2dde3abb89f338
+  metadata.gz: 66f0915bb0dd5ebfaab7e6f5e8b22e8b21fdfdbe0ec884afc75523340d718c34d64fcb4276ef05abab9e06d80d77c927929bfd043fb6c21c61f2d5cd39b33754
+  data.tar.gz: 296db9cf2d234aa7bb6affd3ff018f28e69ef9d38bf54b7ca5c78f6dade85f046cf63e42e15ef3b98752ff43ea99ea4e2f7bf779e38e61f5c79e6ca542bbdffb

data/lib/girl/head.rb

@@ -30,21 +30,10 @@ module Girl
   RESERVED_ROUTE = <<EOF
 0.0.0.0/8
 10.0.0.0/8
-100.64.0.0/10
 127.0.0.0/8
 169.254.0.0/16
 172.16.0.0/12
-192.0.0.0/24
-192.0.2.0/24
-192.31.196.0/24
-192.52.193.0/24
-192.88.99.0/24
 192.168.0.0/16
-192.175.48.0/24
-198.18.0.0/15
-198.51.100.0/24
-203.0.113.0/24
-240.0.0.0/4
 255.255.255.255/32
 EOF
 end

data/lib/girl/proxy_worker.rb

@@ -741,15 +741,14 @@ module Girl
     #
     def write_src( src )
       src_info = @src_infos[ src ]
-      data = src_info[ :cache ]
-      from = :cache
+      from, data = :cache, src_info[ :cache ]
 
       if data.empty?
         if src_info[ :chunks ].any?
           path = File.join( @src_chunk_dir, src_info[ :chunks ].shift )
 
           begin
-            src_info[ :cache ] = data = IO.binread( path )
+            data = src_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -757,8 +756,7 @@ module Girl
             return
           end
         else
-          data = src_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, src_info[ :wbuff ]
         end
       end
 
@@ -792,15 +790,14 @@ module Girl
     #
     def write_dst( dst )
       dst_info = @dst_infos[ dst ]
-      data = dst_info[ :cache ]
-      from = :cache
+      from, data = :cache, dst_info[ :cache ]
 
       if data.empty?
         if dst_info[ :chunks ].any?
           path = File.join( @dst_chunk_dir, dst_info[ :chunks ].shift )
 
           begin
-            dst_info[ :cache ] = data = IO.binread( path )
+            data = dst_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -808,8 +805,7 @@ module Girl
             return
           end
         else
-          data = dst_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, dst_info[ :wbuff ]
         end
       end
 
@@ -873,11 +869,12 @@ module Girl
             unless send_data( tun, data, @tun_info[ :tund_addr ] )
               return
             end
+
+            src_ext[ :last_continue_at ] = now
           end
         end
 
         @tun_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -893,8 +890,7 @@ module Girl
 
       # 取写前
       if @tun_info[ :caches ].any?
-        src_id, pack_id, data = @tun_info[ :caches ].first
-        from = :caches
+        datas = @tun_info[ :caches ]
       elsif @tun_info[ :chunks ].any?
         path = File.join( @tun_chunk_dir, @tun_info[ :chunks ].shift )
 
@@ -915,39 +911,39 @@ module Girl
           data = data[ ( 18 + pack_size )..-1 ]
         end
 
-        @tun_info[ :caches ] = caches
-        src_id, pack_id, data = caches.first
-        from = :caches
+        datas = @tun_info[ :caches ] = caches
       elsif @tun_info[ :wbuffs ].any?
-        src_id, pack_id, data = @tun_info[ :wbuffs ].first
-        from = :wbuffs
+        datas = @tun_info[ :wbuffs ]
       else
         @writes.delete( tun )
         return
       end
 
-      src_ext = @tun_info[ :src_exts ][ src_id ]
+      while datas.any?
+        src_id, pack_id, data = datas.first
+        src_ext = @tun_info[ :src_exts ][ src_id ]
 
-      if src_ext
-        if pack_id <= CONFUSE_UNTIL
-          data = @custom.encode( data )
-          # puts "debug1 encoded pack #{ pack_id }"
-        end
+        if src_ext
+          if pack_id <= CONFUSE_UNTIL
+            data = @custom.encode( data )
+            # puts "debug1 encoded pack #{ pack_id }"
+          end
 
-        data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
+          data = [ [ pack_id, src_id ].pack( 'Q>Q>' ), data ].join
 
-        unless send_data( tun, data, @tun_info[ :tund_addr ] )
-          return
+          unless send_data( tun, data, @tun_info[ :tund_addr ] )
+            return
+          end
+
+          # puts "debug2 written pack #{ pack_id }"
+          src_ext[ :relay_pack_id ] = pack_id
+          src_ext[ :wmems ][ pack_id ] = data
+          src_ext[ :send_ats ][ pack_id ] = now
+          src_ext[ :last_continue_at ] = now
         end
 
-        # puts "debug2 written pack #{ pack_id }"
-        src_ext[ :relay_pack_id ] = pack_id
-        src_ext[ :wmems ][ pack_id ] = data
-        src_ext[ :send_ats ][ pack_id ] = now
-        src_ext[ :last_continue_at ] = now
+        datas.shift
       end
-
-      @tun_info[ from ].shift
     end
 
     ##
@@ -967,7 +963,7 @@ module Girl
         return
       end
 
-      id = rand( ( 2 ** 64 ) - 1 ) + 1
+      id = rand( ( 2 ** 64 ) - 2 ) + 1
       # puts "debug1 accept a src #{ addrinfo.inspect } #{ id }"
 
       @src_infos[ src ] = {

data/lib/girl/proxyd_worker.rb

@@ -558,15 +558,14 @@ module Girl
     #
     def write_dst( dst )
       dst_info = @dst_infos[ dst ]
-      data = dst_info[ :cache ]
-      from = :cache
+      from, data = :cache, dst_info[ :cache ]
 
       if data.empty?
         if dst_info[ :chunks ].any?
           path = File.join( @dst_chunk_dir, dst_info[ :chunks ].shift )
 
           begin
-            dst_info[ :cache ] = data = IO.binread( path )
+            data = dst_info[ :cache ] = IO.binread( path )
             File.delete( path )
           rescue Errno::ENOENT => e
             puts "p#{ Process.pid } #{ Time.new } read #{ path } #{ e.class }"
@@ -574,8 +573,7 @@ module Girl
             return
           end
         else
-          data = dst_info[ :wbuff ]
-          from = :wbuff
+          from, data = :wbuff, dst_info[ :wbuff ]
         end
       end
 
@@ -609,6 +607,7 @@ module Girl
     # write tund
     #
     def write_tund( tund )
+      now = Time.new
       tund_info = @tund_infos[ tund ]
 
       if tund_info[ :is_closing ]
@@ -639,11 +638,12 @@ module Girl
             unless send_data( tund, data, tund_info[ :tun_addr ] )
               return
             end
+
+            dst_ext[ :last_continue_at ] = now
           end
         end
 
         tund_info[ :resendings ].shift
-        return
       end
 
       # 若写后达到上限，暂停取写前
@@ -659,8 +659,7 @@ module Girl
 
       # 取写前
       if tund_info[ :caches ].any?
-        dst_local_port, pack_id, data = tund_info[ :caches ].first
-        from = :caches
+        datas = tund_info[ :caches ]
       elsif tund_info[ :chunks ].any?
         path = File.join( @tund_chunk_dir, tund_info[ :chunks ].shift )
 
@@ -681,40 +680,39 @@ module Girl
           data = data[ ( 12 + pack_size )..-1 ]
         end
 
-        tund_info[ :caches ] = caches
-        dst_local_port, pack_id, data = caches.first
-        from = :caches
+        datas = tund_info[ :caches ] = caches
       elsif tund_info[ :wbuffs ].any?
-        dst_local_port, pack_id, data = tund_info[ :wbuffs ].first
-        from = :wbuffs
+        datas = tund_info[ :wbuffs ]
       else
         @writes.delete( tund )
         return
       end
 
-      dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
+      while datas.any?
+        dst_local_port, pack_id, data = datas.first
+        dst_ext = tund_info[ :dst_exts ][ dst_local_port ]
 
-      if dst_ext
-        if pack_id <= CONFUSE_UNTIL
-          data = @custom.encode( data )
-          # puts "debug1 encoded pack #{ pack_id }"
-        end
+        if dst_ext
+          if pack_id <= CONFUSE_UNTIL
+            data = @custom.encode( data )
+            # puts "debug1 encoded pack #{ pack_id }"
+          end
 
-        data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
+          data = [ [ pack_id, dst_local_port ].pack( 'Q>n' ), data ].join
 
-        unless send_data( tund, data, tund_info[ :tun_addr ] )
-          return
+          unless send_data( tund, data, tund_info[ :tun_addr ] )
+            return
+          end
+
+          # puts "debug2 written pack #{ pack_id }"
+          dst_ext[ :relay_pack_id ] = pack_id
+          dst_ext[ :wmems ][ pack_id ] = data
+          dst_ext[ :send_ats ][ pack_id ] = now
+          dst_ext[ :last_continue_at ] = now
         end
 
-        # puts "debug2 written pack #{ pack_id }"
-        now = Time.new
-        dst_ext[ :relay_pack_id ] = pack_id
-        dst_ext[ :wmems ][ pack_id ] = data
-        dst_ext[ :send_ats ][ pack_id ] = now
-        dst_ext[ :last_continue_at ] = now
+        datas.shift
       end
-
-      tund_info[ from ].shift
     end
 
     ##
@@ -810,13 +808,10 @@ module Girl
       tund_info = @tund_infos[ tund ]
 
       if from_addr != tund_info[ :tun_addr ]
-        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
+        # 通常是光猫刷新ip（端口也会变），但万一不是，为了避免脏数据注入，关闭tund
+        puts "p#{ Process.pid } #{ Time.new } from #{ addrinfo.inspect } not match tun addr #{ Addrinfo.new( tund_info[ :tun_addr ] ).inspect }"
+        set_is_closing( tund )
+        return
       end
 
       tund_info[ :last_recv_at ] = now

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.75.0'.freeze
+  VERSION = '0.80.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.75.0
+  version: 0.80.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email:
@@ -49,8 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 妹子