girl 0.79.0 → 0.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0715fdbe86cdb5337e31fc9fb79d110468d8d041a34806a8d75eeb5a235b723
-  data.tar.gz: 839d97ba88a903a3950082b8ed68ce8a9d03f1870bd910307bdbf76ac9057f48
+  metadata.gz: 7758f3ee995f864831703ae7f9615dba9f0280ebcb10130f29c24f8f862c43c8
+  data.tar.gz: 3758aaac1ded47dfa0d2336332679de27d3ed711593bb7f7e6e48b5225eaaee8
 SHA512:
-  metadata.gz: 7bec7fd4e3de14f55c88cc1adff7f0f51e5f154601322c55e391d7401290a34455d547dc5fc38fa0fbc2cfe5abb77d1feb53acc6225d3202d945c4a4ea803e8c
-  data.tar.gz: f3df7300a53d259ad6c5a91c67edd7d2b7a160fd1c33700266377e6e075c31cc6522c5af3765700d35f2b8db13ac012c74d674655b4bfab988b5f579deb30d0a
+  metadata.gz: 66f0915bb0dd5ebfaab7e6f5e8b22e8b21fdfdbe0ec884afc75523340d718c34d64fcb4276ef05abab9e06d80d77c927929bfd043fb6c21c61f2d5cd39b33754
+  data.tar.gz: 296db9cf2d234aa7bb6affd3ff018f28e69ef9d38bf54b7ca5c78f6dade85f046cf63e42e15ef3b98752ff43ea99ea4e2f7bf779e38e61f5c79e6ca542bbdffb

data/lib/girl/proxyd_worker.rb

@@ -808,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.79.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.79.0
+  version: 0.80.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 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: