girl 9.1.1 → 9.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6178ab1062943992b8187decc04a6916c5aaee75aa23e259c3ba5edcdbde7c7d
-  data.tar.gz: ff195a6fb415da6f045adc4678655acdc367b2f1c8894319f19309085fb3ee9b
+  metadata.gz: 673184bfb0785b65e56e4715c2b007481ae91d16620fbc11e3f6e12c50f511b5
+  data.tar.gz: 9a37c381bbf266cac12239b479214979202a8b715a1db0c5f443f8ecd3ca046a
 SHA512:
-  metadata.gz: 4c102ea1026056ce877c50e895b10e7d054475406e8ee4e62aa4082f07270f6b89fc110cf0762a61e10c0d48d18017674b8c7d23e6e7873b8f0443ded5589a91
-  data.tar.gz: 7201e5651a8443f7a2c115e9dfbb24d84ae13cd13263f2e754e3db2993e7478f2831d784e3ed098fae0bcb534e1f23e292a5123615aedb9a8a449080fcdf4acf
+  metadata.gz: d291af3cfc1ff8813e187062a55b93ad9f0c6a52f7bd14e19c4638becd98c96451da21146a167111c5da01d2f20b6fc31711143e71d82e82bf5cf68d8e420efb
+  data.tar.gz: 9a6e13e0f756afd3a024f7c7c386fd18e5978488bd1909fd69dbabffacd25e71d8d0c286920ec86665ed69766cee1464ba1d4a8fcab94055fdf82d405392d96b

data/lib/girl/proxy.rb

@@ -23,9 +23,12 @@ module Girl
 
       conf = JSON.parse( IO.binread( config_path ), symbolize_names: true )
       puts "load #{ config_path } #{ conf.inspect }"
+      redir_host = conf[ :redir_host ]
       redir_port = conf[ :redir_port ]
       memd_port = conf[ :memd_port ]
+      relayd_host = conf[ :relayd_host ]
       relayd_port = conf[ :relayd_port ]
+      tspd_host = conf[ :tspd_host ]
       tspd_port = conf[ :tspd_port ]
       proxyd_host = conf[ :proxyd_host ]
       proxyd_port = conf[ :proxyd_port ]
@@ -55,7 +58,6 @@ module Girl
       h_src_underhalf = conf[ :h_src_underhalf ] # V
       h_dst_overflow = conf[ :h_dst_overflow ]   # W
       h_dst_underhalf = conf[ :h_dst_underhalf ] # X
-
       expire_connecting = conf[ :expire_connecting ]     # 连接多久没有建成关闭（秒）
       expire_long_after = conf[ :expire_long_after ]     # 长连接多久没有新流量关闭（秒）
       expire_proxy_after = conf[ :expire_proxy_after ]   # proxy多久没有收到流量重建（秒）
@@ -63,9 +65,12 @@ module Girl
       expire_short_after = conf[ :expire_short_after ]   # 短连接创建多久后关闭（秒）
       is_debug = conf[ :is_debug ]
 
+      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 + 1
+      relayd_host = relayd_host ? relayd_host.to_s : '0.0.0.0'
       relayd_port = relayd_port ? relayd_port.to_i : redir_port + 2
+      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
       proxyd_port = proxyd_port ? proxyd_port.to_i : 6060
@@ -141,9 +146,12 @@ module Girl
       end
 
       worker = Girl::ProxyWorker.new(
+        redir_host,
         redir_port,
         memd_port,
+        relayd_host,
         relayd_port,
+        tspd_host,
         tspd_port,
         proxyd_host,
         proxyd_port,

data/lib/girl/proxy_worker.rb

@@ -3,9 +3,12 @@ module Girl
     include Dns
 
     def initialize(
+      redir_host,
       redir_port,
       memd_port,
+      relayd_host,
       relayd_port,
+      tspd_host,
       tspd_port,
       proxyd_host,
       proxyd_port,
@@ -103,12 +106,12 @@ module Girl
       @is_client_fastopen = is_client_fastopen
       @is_server_fastopen = is_server_fastopen
 
-      new_a_redir( redir_port )
+      new_a_redir( redir_host, redir_port )
       new_a_infod( redir_port )
       new_a_memd( memd_port )
-      new_a_relayd( relayd_port )
-      new_a_rsvd( tspd_port )
-      new_a_tspd( tspd_port )
+      new_a_relayd( relayd_host, relayd_port )
+      new_a_rsvd( tspd_host, tspd_port )
+      new_a_tspd( tspd_host, tspd_port )
       new_a_proxy
     end
 
@@ -710,14 +713,14 @@ module Girl
       domain = src_info[ :destination_domain ]
       port = src_info[ :destination_port ]
 
-      if @local_ips.include?( ip ) && [ @redir_port, @tspd_port ].include?( port ) then
+      if @local_ips.include?( ip ) && [ @redir_port, @relayd_port, @tspd_port ].include?( port ) then
         puts "ignore #{ ip }:#{ port }"
         close_src( src )
         return
       end
 
-      if [ domain, ip ].include?( @proxyd_host )  then
-        # 访问远端，直连
+      if [ domain, ip ].include?( @proxyd_host ) && ![ 80, 443 ].include?( port ) then
+        # 访问远端非http端口，直连
         puts "direct #{ ip } #{ port }"
         new_a_dst( ip, src )
         return
@@ -847,12 +850,12 @@ module Girl
     end
 
     def new_a_infod( infod_port )
-      infod_ip = '127.0.0.1'
-      infod_addr = Socket.sockaddr_in( infod_port, infod_ip )
+      infod_host = '127.0.0.1'
+      infod_addr = Socket.sockaddr_in( infod_port, infod_host )
       infod = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       infod.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       infod.bind( infod_addr )
-      puts "infod bind on #{ infod_ip } #{ infod_port }"
+      puts "infod bind on #{ infod_host } #{ infod_port }"
       add_read( infod, :infod )
       info = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       @infod_addr = infod_addr
@@ -861,14 +864,14 @@ module Girl
     end
 
     def new_a_memd( memd_port )
-      memd_ip = '127.0.0.1'
+      memd_host = '127.0.0.1'
       memd = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       memd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       memd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       memd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_FASTOPEN, 5 ) if @is_server_fastopen
-      memd.bind( Socket.sockaddr_in( memd_port, memd_ip ) )
+      memd.bind( Socket.sockaddr_in( memd_port, memd_host ) )
       memd.listen( 5 )
-      puts "memd listen on #{ memd_ip } #{ memd_port }"
+      puts "memd listen on #{ memd_host } #{ memd_port }"
       add_read( memd, :memd )
     end
 
@@ -944,32 +947,31 @@ module Girl
       proxy_info
     end
 
-    def new_a_redir( redir_port )
-      redir_ip = '0.0.0.0'
+    def new_a_redir( redir_host, redir_port )
       redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       redir.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       redir.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_FASTOPEN, BACKLOG ) if @is_server_fastopen
-      redir.bind( Socket.sockaddr_in( redir_port, redir_ip ) )
+      redir.bind( Socket.sockaddr_in( redir_port, redir_host ) )
       redir.listen( BACKLOG )
-      puts "redir listen on #{ redir_ip } #{ redir_port }"
+      puts "redir listen on #{ redir_host } #{ redir_port }"
       add_read( redir, :redir )
       @redir_port = redir_port
       @redir_local_address = redir.local_address
     end
 
-    def new_a_relayd( relayd_port )
-      relayd_ip = '0.0.0.0'
+    def new_a_relayd( relayd_host, relayd_port )
       relayd = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       relayd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       relayd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       relayd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       relayd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_FASTOPEN, BACKLOG ) if @is_server_fastopen
-      relayd.bind( Socket.sockaddr_in( relayd_port, relayd_ip ) )
+      relayd.bind( Socket.sockaddr_in( relayd_port, relayd_host ) )
       relayd.listen( BACKLOG )
-      puts "relayd listen on #{ relayd_ip } #{ relayd_port }"
+      puts "relayd listen on #{ relayd_host } #{ relayd_port }"
       add_read( relayd, :relayd )
+      @relayd_port = relayd_port
     end
 
     def new_a_rsv( data, addrinfo, domain, type )
@@ -994,27 +996,25 @@ module Girl
       add_read( rsv, :rsv )
     end
 
-    def new_a_rsvd( rsvd_port )
-      rsvd_ip = '0.0.0.0'
-      rsvd_addr = Socket.sockaddr_in( rsvd_port, rsvd_ip )
+    def new_a_rsvd( rsvd_host, rsvd_port )
+      rsvd_addr = Socket.sockaddr_in( rsvd_port, rsvd_host )
       rsvd = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       rsvd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       rsvd.bind( rsvd_addr )
-      puts "rsvd bind on #{ rsvd_ip } #{ rsvd_port }"
+      puts "rsvd bind on #{ rsvd_host } #{ rsvd_port }"
       add_read( rsvd, :rsvd )
       @rsvd = rsvd
     end
 
-    def new_a_tspd( tspd_port )
-      tspd_ip = '0.0.0.0'
+    def new_a_tspd( tspd_host, tspd_port )
       tspd = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       tspd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       tspd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
       tspd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       tspd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_FASTOPEN, BACKLOG ) if @is_server_fastopen
-      tspd.bind( Socket.sockaddr_in( tspd_port, tspd_ip ) )
+      tspd.bind( Socket.sockaddr_in( tspd_port, tspd_host ) )
       tspd.listen( BACKLOG )
-      puts "tspd listen on #{ tspd_ip } #{ tspd_port }"
+      puts "tspd listen on #{ tspd_host } #{ tspd_port }"
       add_read( tspd, :tspd )
       @tspd_port = tspd_port
     end
@@ -1686,7 +1686,7 @@ module Girl
     def resolve_domain( domain, src )
       return if src.nil? || src.closed?
 
-      unless domain =~ /^[0-9a-zA-Z\-\.]{1,63}$/ then
+      unless domain =~ /^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$/ then
         # 忽略非法域名
         puts "ignore #{ domain }"
         close_src( src )

data/lib/girl/proxyd_worker.rb

@@ -170,7 +170,7 @@ module Girl
         close_dst( dst )
         return
       end
-      
+
       if !dst_info[ :overflowing ] && ( bytesize >= WBUFF_LIMIT ) then
         proxy = dst_info[ :proxy ]
         puts "add h_dst_overflow #{ im } #{ src_id } #{ domain }"
@@ -209,7 +209,7 @@ module Girl
         close_p2( p2 )
         return
       end
-      
+
       if !p2_info[ :overflowing ] && ( bytesize >= WBUFF_LIMIT ) then
         proxy = im_info[ :proxy ]
         puts "add h_p2_overflow #{ im } #{ p2_id }"
@@ -641,12 +641,12 @@ module Girl
     end
 
     def new_a_infod( infod_port )
-      infod_ip = '127.0.0.1'
-      infod_addr = Socket.sockaddr_in( infod_port, infod_ip )
+      infod_host = '127.0.0.1'
+      infod_addr = Socket.sockaddr_in( infod_port, infod_host )
       infod = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       infod.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       infod.bind( infod_addr )
-      puts "infod bind on #{ infod_ip } #{ infod_port }"
+      puts "infod bind on #{ infod_host } #{ infod_port }"
       add_read( infod, :infod )
       info = Socket.new( Socket::AF_INET, Socket::SOCK_DGRAM, 0 )
       @infod_addr = infod_addr
@@ -655,14 +655,14 @@ module Girl
     end
 
     def new_a_memd( memd_port )
-      memd_ip = '127.0.0.1'
+      memd_host = '127.0.0.1'
       memd = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       memd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       memd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       memd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_FASTOPEN, 5 ) if @is_server_fastopen
-      memd.bind( Socket.sockaddr_in( memd_port, memd_ip ) )
+      memd.bind( Socket.sockaddr_in( memd_port, memd_host ) )
       memd.listen( 5 )
-      puts "memd listen on #{ memd_ip } #{ memd_port }"
+      puts "memd listen on #{ memd_host } #{ memd_port }"
       add_read( memd, :memd )
     end
 
@@ -715,14 +715,14 @@ module Girl
     end
 
     def new_a_proxyd( proxyd_port )
-      proxyd_ip = '0.0.0.0'
+      proxyd_host = '0.0.0.0'
       proxyd = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       proxyd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1 )
       proxyd.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 ) if RUBY_PLATFORM.include?( 'linux' )
       proxyd.setsockopt( Socket::IPPROTO_TCP, Socket::TCP_FASTOPEN, BACKLOG ) if @is_server_fastopen
-      proxyd.bind( Socket.sockaddr_in( proxyd_port, proxyd_ip ) )
+      proxyd.bind( Socket.sockaddr_in( proxyd_port, proxyd_host ) )
       proxyd.listen( BACKLOG )
-      puts "proxyd listen on #{ proxyd_ip } #{ proxyd_port }"
+      puts "proxyd listen on #{ proxyd_host } #{ proxyd_port }"
       add_read( proxyd, :proxyd )
     end
 
@@ -1120,7 +1120,7 @@ module Girl
       domain = domain_port[ 0...colon_idx ]
       port = domain_port[ ( colon_idx + 1 )..-1 ].to_i
 
-      if ( domain !~ /^[0-9a-zA-Z\-\.]{1,63}$/ ) || ( domain =~ /^((0\.\d{1,3}\.\d{1,3}\.\d{1,3})|(10\.\d{1,3}\.\d{1,3}\.\d{1,3})|(127\.\d{1,3}\.\d{1,3}\.\d{1,3})|(169\.254\.\d{1,3}\.\d{1,3})|(172\.((1[6-9])|(2\d)|(3[01]))\.\d{1,3}\.\d{1,3})|(192\.168\.\d{1,3}\.\d{1,3})|(255\.255\.255\.255)|(localhost))$/ ) then
+      if ( domain !~ /^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$/ ) || ( domain =~ /^((0\.\d{1,3}\.\d{1,3}\.\d{1,3})|(10\.\d{1,3}\.\d{1,3}\.\d{1,3})|(127\.\d{1,3}\.\d{1,3}\.\d{1,3})|(169\.254\.\d{1,3}\.\d{1,3})|(172\.((1[6-9])|(2\d)|(3[01]))\.\d{1,3}\.\d{1,3})|(192\.168\.\d{1,3}\.\d{1,3})|(255\.255\.255\.255)|(localhost))$/ ) then
         # 忽略非法域名，内网地址
         puts "ignore #{ domain }"
         return
@@ -1348,7 +1348,7 @@ module Girl
       data = data[ written..-1 ]
       p2_info[ :wbuff ] = data
       bytesize = p2_info[ :wbuff ].bytesize
-      
+
       if p2_info[ :overflowing ] && ( bytesize < RESUME_BELOW ) then
         proxy = im_info[ :proxy ]
         p2_id = p2_info[ :p2_id ]
@@ -1396,7 +1396,7 @@ module Girl
           proxy_info[ :paused_dsts ].each{ | dst | add_read( dst ) }
           proxy_info[ :paused_dsts ].clear
         end
-  
+
         if proxy_info[ :paused_p2s ].any? then
           puts "proxy underhalf resume p2s #{ im } #{ proxy_info[ :paused_p2s ].size }"
           proxy_info[ :paused_p2s ].each{ | p2 | add_read( p2 ) }

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '9.1.1'.freeze
+  VERSION = '9.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 9.1.2
 platform: ruby
 authors:
 - takafan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
+date: 2024-03-12 00:00:00.000000000 Z
 dependencies: []
 description: escape evil.
 email: