girl 9.2.1 → 9.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f284c4b3e52a5727149b6770981eb2fd1e49728c4704e8a6d104f1dd98a3fe64
-  data.tar.gz: 92a817464bc772630cb1313b51564aa46ae03c4baccaad8fa5cbcf6b7f7f910f
+  metadata.gz: f4ee7503a62e9790a615f594b369ce5170dad38f21e21c7918805b5376ae1e9b
+  data.tar.gz: b73cd2f06a84c49b0e620bb2f340073a2ed146cfbb78ef68cfa7cb69c67133f2
 SHA512:
-  metadata.gz: c9df850fb2724b3e0b3c31646908f4b4f29217b47147f5cd080bbf8112ce7054a63f989ee7b0e92343ad1898aec964a56c361b2ff959f1f8d5413bb1ff34e19c
-  data.tar.gz: c98ebd0b3624bcd6828c3cb538e4caf9d8fa7a0b7a030944c1f64a2e4805ee94a0ee2145d9be6c0826351579d7233508a607a510d116bf31f786974275497c44
+  metadata.gz: 5b98f165da508bec146215eb392ffb5124c495cb4b8e6b8019396f5924403f73ddcae47c97fa2e38927ce632553306347a4c728ae7d2d1231f3a35541e8d179c
+  data.tar.gz: 6f48f78bf0de89cfc3ccd96fe8045e10709ff16bff5757d8e74f9765fc0974a6e093a2079f0e202d6a0c8f0435debc0e13dc60b707607fc3a7960229d88400de

data/lib/girl/proxy.rb

@@ -22,6 +22,8 @@ module Girl
       redir_host = conf[:redir_host]
       redir_port = conf[:redir_port]
       memd_port = conf[:memd_port]
+      rsvd_host = conf[:rsvd_host]
+      rsvd_port = conf[:rsvd_port]
       tspd_host = conf[:tspd_host]
       tspd_port = conf[:tspd_port]
       proxyd_host = conf[:proxyd_host]
@@ -30,7 +32,7 @@ module Girl
       nameserver = conf[:nameserver]
       im = conf[:im]
       direct_path = conf[:direct_path]
-      remote_path = conf[:remote_path]
+      white_path = conf[:white_path]
       appd_host = conf[:appd_host]
       appd_port = conf[:appd_port]
       head_len = conf[:head_len]                       # 头长度
@@ -59,6 +61,8 @@ module Girl
       redir_host = redir_host ? redir_host.to_s : '0.0.0.0'
       redir_port = redir_port ? redir_port.to_i : 6666
       memd_port = memd_port ? memd_port.to_i : redir_port + 2
+      rsvd_host = rsvd_host ? rsvd_host.to_s : '0.0.0.0'
+      rsvd_port = rsvd_port ? rsvd_port.to_i : 53
       tspd_host = tspd_host ? tspd_host.to_s : '0.0.0.0'
       tspd_port = tspd_port ? tspd_port.to_i : 7777
       raise "missing proxyd host" unless proxyd_host
@@ -74,11 +78,18 @@ module Girl
         directs = (RESERVED_ROUTE.split("\n") + IO.binread(direct_path).split("\n")).map{|line| IPAddr.new(line.strip)}
       end
 
-      remotes = []
+      whites = []
 
-      if remote_path
-        raise "not found remote file #{remote_path}" unless File.exist?(remote_path)
-        remotes = IO.binread(remote_path).split("\n").map{|line| line.strip}
+      if white_path
+        raise "not found white file #{white_path}" unless File.exist?(white_path)
+
+        IO.binread(white_path).split("\n").each do |line|
+          domain = line.split(' ').first
+
+          if domain && (domain[0] != '#') && !whites.include?(domain)
+            whites << domain
+          end
+        end
       end
 
       appd_host = appd_host ? appd_host.to_s : '127.0.0.1'
@@ -118,7 +129,7 @@ module Girl
       puts "girl proxy #{Girl::VERSION} #{im} #{redir_port} #{tspd_port}"
       puts "#{proxyd_host} #{proxyd_port} #{appd_host} #{appd_port} #{nameservers.inspect} #{is_client_fastopen} #{is_server_fastopen}"
       puts "#{direct_path} #{directs.size} directs"
-      puts "#{remote_path} #{remotes.size} remotes"
+      puts "#{white_path} #{whites.size} whites"
 
       if %w[darwin linux].any?{|plat| RUBY_PLATFORM.include?(plat)}
         Process.setrlimit(:NOFILE, RLIMIT)
@@ -129,6 +140,8 @@ module Girl
         redir_host,
         redir_port,
         memd_port,
+        rsvd_host,
+        rsvd_port,
         tspd_host,
         tspd_port,
         proxyd_host,
@@ -137,7 +150,7 @@ module Girl
         nameservers,
         im,
         directs,
-        remotes,
+        whites,
         appd_host,
         appd_port,
         head_len,

data/lib/girl/proxy_worker.rb

@@ -6,6 +6,8 @@ module Girl
       redir_host,
       redir_port,
       memd_port,
+      rsvd_host,
+      rsvd_port,
       tspd_host,
       tspd_port,
       proxyd_host,
@@ -14,7 +16,7 @@ module Girl
       nameservers,
       im,
       directs,
-      remotes,
+      whites,
       appd_host,
       appd_port,
       head_len,
@@ -47,7 +49,8 @@ module Girl
       @nameserver_addrs = nameservers.map{|n| Socket.sockaddr_in(53, n)}
       @im = im
       @directs = directs
-      @remotes = remotes
+      @whites = whites
+      @unknowns = []
       @local_ips = Socket.ip_address_list.select{|info| info.ipv4?}.map{|info| info.ip_address}
       @update_roles = [:dns, :dst, :mem, :p1, :src, :rsv] # 参与淘汰的角色
       @updates_limit = 1008  # 淘汰池上限，1015(mac) - [info infod memd proxy redir rsvd tspd]
@@ -97,7 +100,7 @@ module Girl
       new_a_redir(redir_host, redir_port)
       new_a_infod(redir_port)
       new_a_memd(memd_port)
-      new_a_rsvd(tspd_host, tspd_port)
+      new_a_rsvd(rsvd_host, rsvd_port)
       new_a_tspd(tspd_host, tspd_port)
       new_a_proxy
       new_a_big
@@ -1209,9 +1212,11 @@ module Girl
         resolv_caches: @resolv_caches.sort,
         response_caches: @response_caches.sort.map{|a| [a[0], a[1][2], a[1][3]]},
         response6_caches: @response6_caches.sort.map{|a| [a[0], a[1][2], a[1][3]]},
+        unknowns: @unknowns,
         sizes: {
           directs: @directs.size,
-          remotes: @remotes.size,
+          whites: @whites.size,
+          unknowns: @unknowns.size,
           reads: @reads.size,
           writes: @writes.size,
           roles: @roles.size,
@@ -1439,8 +1444,9 @@ module Girl
         end
       end
 
-      if @remotes.any?{|r| domain.include?(r)}
+      if @whites.all?{|white| (domain.size < white.size) || (domain[(white.size * -1)..-1] != white)}
         if type == 1
+          @unknowns << domain unless @unknowns.include?(domain)
           check_expire_nears
           near_id = rand((2 ** 64) - 2) + 1
           @near_infos[near_id] = {
@@ -1454,11 +1460,11 @@ module Girl
           msg = "#{@h_query}#{[near_id, type].pack('Q>C')}#{domain}"
           add_proxy_wbuff(pack_a_chunk(msg))
         end
-        
-        return
+      else
+        new_a_rsv(data, addrinfo, domain, type)
       end
 
-      new_a_rsv(data, addrinfo, domain, type)
+      
     end
 
     def read_src(src)
@@ -1721,7 +1727,8 @@ module Girl
         return
       end
 
-      if @remotes.any?{|remote| (domain.size >= remote.size) && (domain[(remote.size * -1)..-1] == remote)}
+      if @whites.all?{|white| (domain.size < white.size) || (domain[(white.size * -1)..-1] != white)}
+        @unknowns << domain unless @unknowns.include?(domain)
         set_remote(src)
         return
       end

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '9.2.1'.freeze
+  VERSION = '9.2.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.2.3
 platform: ruby
 authors:
 - takafan