girl 3.7.0 → 4.2.0

data/lib/girl/resolv_custom.rb

@@ -1,7 +1,7 @@
-require 'girl/custom_dns_query'
+require 'girl/custom'
 
 module Girl
   class ResolvCustom
-    include CustomDnsQuery
+    include Custom
   end
 end

data/lib/girl/resolvd_worker.rb

@@ -5,7 +5,7 @@ module Girl
     # initialize
     #
     def initialize( resolvd_port, nameserver )
-      @resolv_custom = Girl::ResolvCustom.new
+      @custom = Girl::ResolvCustom.new
       @nameserver_addr = Socket.sockaddr_in( 53, nameserver )
       @roles = ConcurrentHash.new     # :resolvd / :dst
       @reads = []
@@ -162,7 +162,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( READ_SIZE )
+      dotr.read_nonblock( 65535 )
 
       if @closing_dsts.any? then
         @closing_dsts.each { | dst | close_dst( dst ) }
@@ -176,7 +176,7 @@ module Girl
     def read_resolvd( resolvd )
       data, addrinfo, rflags, *controls = resolvd.recvmsg
       # puts "debug1 resolvd recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
-      data = @resolv_custom.decode( data )
+      data = @custom.decode( data )
       new_a_dst( addrinfo.to_sockaddr, data )
     end
 
@@ -187,7 +187,7 @@ module Girl
       data, addrinfo, rflags, *controls = dst.recvmsg
       # puts "debug1 dst recvmsg #{ addrinfo.ip_unpack.inspect } #{ data.inspect }"
       dst_info = @dst_infos[ dst ]
-      data = @resolv_custom.encode( data )
+      data = @custom.encode( data )
       send_data( @resolvd, dst_info[ :src_addr ], data )
       close_dst( dst )
     end

data/lib/girl/ssl.rb

@@ -44,26 +44,13 @@ module Girl
       puts title
       puts "redir port #{ redir_port } worker count #{ worker_count }"
 
-      now = Time.new
-      name = OpenSSL::X509::Name.new
-      key = OpenSSL::PKey::RSA.new 2048
-      cert = OpenSSL::X509::Certificate.new
-      cert.version = 2
-      cert.serial = 0
-      cert.not_before = now
-      cert.not_after = now + 365 * 24 * 60 * 60
-      cert.public_key = key.public_key
-      cert.subject = name
-      cert.issuer = name
-      cert.sign key, OpenSSL::Digest.new('SHA1')
-
       $0 = title
       workers = []
 
       worker_count.times do | i |
         workers << fork do
           $0 = 'girl ssl worker'
-          worker = Girl::SslWorker.new( redir_port, cert, key )
+          worker = Girl::SslWorker.new( redir_port )
 
           Signal.trap( :TERM ) do
             puts "w#{ i } exit"

data/lib/girl/ssl_worker.rb

@@ -4,7 +4,8 @@ module Girl
     ##
     # initialize
     #
-    def initialize( redir_port, cert, key )
+    def initialize( redir_port )
+      @redir_port = redir_port
       @reads = []
       @writes = []
       @closing_srcs = []
@@ -12,15 +13,15 @@ module Girl
       @paused_dsts = []
       @resume_srcs = []
       @resume_dsts = []
-      @roles = ConcurrentHash.new            # sock => :dotr / :redir / :src / :dst
-      @src_infos = ConcurrentHash.new        # src => {}
-      @dst_infos = ConcurrentHash.new        # dst => {}
-      @resolv_caches = ConcurrentHash.new    # domain => [ ip, created_at ]
+      @roles = ConcurrentHash.new         # sock => :dotr / :redir / :src / :dst
+      @src_infos = ConcurrentHash.new     # src => {}
+      @dst_infos = ConcurrentHash.new     # dst => {}
+      @resolv_caches = ConcurrentHash.new # domain => [ ip, created_at ]
 
       dotr, dotw = IO.pipe
       @dotw = dotw
       add_read( dotr, :dotr )
-      new_a_redir( redir_port, cert, key )
+      new_a_redir
     end
 
     ##
@@ -65,7 +66,7 @@ module Girl
     # quit!
     #
     def quit!
-      # puts "debug1 exit"
+      # puts "debug exit"
       exit
     end
 
@@ -84,6 +85,7 @@ module Girl
     # add dst wbuff
     #
     def add_dst_wbuff( dst, data )
+      return if dst.closed?
       dst_info = @dst_infos[ dst ]
       dst_info[ :wbuff ] << data
       add_write( dst )
@@ -155,7 +157,7 @@ module Girl
       # +----+-----+-------+------+----------+----------+
       redir_ip, redir_port = @redir_local_address.ip_unpack
       data = [ [ 5, 0, 0, 1 ].pack( 'C4' ), IPAddr.new( redir_ip ).hton, [ redir_port ].pack( 'n' ) ].join
-      # puts "debug1 add src.wbuff socks5 conn reply #{ data.inspect }"
+      # puts "debug add src.wbuff socks5 conn reply #{ data.inspect }"
       add_src_wbuff( src, data )
     end
 
@@ -167,7 +169,7 @@ module Girl
       src_info[ :rbuff ] << data
 
       if src_info[ :rbuff ].bytesize >= WBUFF_LIMIT then
-        # puts "debug1 src.rbuff full"
+        # puts "debug src.rbuff full"
         add_closing_src( src )
       end
     end
@@ -206,20 +208,15 @@ module Girl
     #
     def close_read_dst( dst )
       return if dst.closed?
-      # puts "debug1 close read dst"
+      # puts "debug close read dst"
       dst.close_read
       @reads.delete( dst )
 
       if dst.closed? then
-        # puts "debug1 delete dst info"
         @writes.delete( dst )
         @roles.delete( dst )
-        dst_info = @dst_infos.delete( dst )
-      else
-        dst_info = @dst_infos[ dst ]
+        del_dst_info( dst )
       end
-
-      dst_info
     end
 
     ##
@@ -227,19 +224,27 @@ module Girl
     #
     def close_read_src( src )
       return if src.closed?
-      # puts "debug1 close read src"
+      # puts "debug close read src"
       src_info = @src_infos[ src ]
       src_info[ :close_read ] = true
 
       if src_info[ :close_write ] then
-        # puts "debug1 delete src info"
         close_sock( src )
-        src_info = @src_infos.delete( src )
+        del_src_info( src )
       else
         @reads.delete( src )
       end
+    end
 
-      src_info
+    ##
+    # close redir
+    #
+    def close_redir( redir )
+      return if redir.closed?
+      redir.close
+      @roles.delete( redir )
+      @reads.delete( redir )
+      @src_infos.each { | src, _ | close_src( src ) }
     end
 
     ##
@@ -257,14 +262,14 @@ module Girl
     #
     def close_src( src )
       return if src.closed?
-      # puts "debug1 close src"
+      # puts "debug close src"
       close_sock( src )
-      src_info = @src_infos.delete( src )
+      src_info = del_src_info( src )
       dst = src_info[ :dst ]
 
       if dst then
         close_sock( dst )
-        @dst_infos.delete( dst )
+        del_dst_info( dst )
       end
     end
 
@@ -273,20 +278,15 @@ module Girl
     #
     def close_write_dst( dst )
       return if dst.closed?
-      # puts "debug1 close write dst"
+      # puts "debug close write dst"
       dst.close_write
       @writes.delete( dst )
 
       if dst.closed? then
-        # puts "debug1 delete dst info"
         @reads.delete( dst )
         @roles.delete( dst )
-        dst_info = @dst_infos.delete( dst )
-      else
-        dst_info = @dst_infos[ dst ]
+        del_dst_info( dst )
       end
-
-      dst_info
     end
 
     ##
@@ -294,18 +294,37 @@ module Girl
     #
     def close_write_src( src )
       return if src.closed?
-      # puts "debug1 close write src"
+      # puts "debug close write src"
       src_info = @src_infos[ src ]
       src_info[ :close_write ] = true
 
       if src_info[ :close_read ] then
-        # puts "debug1 delete src info"
         close_sock( src )
-        src_info = @src_infos.delete( src )
+        del_src_info( src )
       else
         @writes.delete( src )
       end
+    end
+
+    ##
+    # del dst info
+    #
+    def del_dst_info( dst )
+      # puts "debug delete dst info"
+      dst_info = @dst_infos.delete( dst )
+      @paused_dsts.delete( dst )
+      @resume_dsts.delete( dst )
+      dst_info
+    end
 
+    ##
+    # del src info
+    #
+    def del_src_info( src )
+      # puts "debug delete src info"
+      src_info = @src_infos.delete( src )
+      @paused_srcs.delete( src )
+      @resume_srcs.delete( src )
       src_info
     end
 
@@ -324,7 +343,7 @@ module Girl
             expire_after = src_info[ :dst ] ? EXPIRE_AFTER : EXPIRE_NEW
 
             if ( now - last_recv_at >= expire_after ) && ( now - last_sent_at >= expire_after ) then
-              puts "p#{ Process.pid } #{ Time.new } expire src #{ expire_after } #{ src_info[ :destination_domain ] }"
+              puts "p#{ Process.pid } #{ Time.new } expire src #{ expire_after } #{ src_info[ :id ] } #{ src_info[ :destination_domain ] }"
               add_closing_src( src )
 
               unless src_info[ :rbuff ].empty? then
@@ -345,29 +364,24 @@ module Girl
           sleep CHECK_RESUME_INTERVAL
 
           @paused_srcs.each do | src |
-            if src.closed? then
-              add_resume_src( src )
-            else
-              src_info = @src_infos[ src ]
-              dst = src_info[ :dst ]
+            src_info = @src_infos[ src ]
+            dst = src_info[ :dst ]
 
-              if dst then
-                dst_info = @dst_infos[ dst ]
+            if dst && !dst.closed? then
+              dst_info = @dst_infos[ dst ]
 
-                if dst_info[ :wbuff ].size < RESUME_BELOW then
-                  puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
-                  add_resume_src( src )
-                end
+              if dst_info[ :wbuff ].size < RESUME_BELOW then
+                puts "p#{ Process.pid } #{ Time.new } resume direct src #{ src_info[ :destination_domain ] }"
+                add_resume_src( src )
               end
             end
           end
 
           @paused_dsts.each do | dst |
-            if dst.closed? then
-              add_resume_dst( dst )
-            else
-              dst_info = @dst_infos[ dst ]
-              src = dst_info[ :src ]
+            dst_info = @dst_infos[ dst ]
+            src = dst_info[ :src ]
+
+            if src && !src.closed? then
               src_info = @src_infos[ src ]
 
               if src_info[ :wbuff ].size < RESUME_BELOW then
@@ -389,7 +403,6 @@ module Girl
       domain = src_info[ :destination_domain ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], ip_info.ip_address )
       dst = Socket.new( ip_info.ipv4? ? Socket::AF_INET : Socket::AF_INET6, Socket::SOCK_STREAM, 0 )
-      dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
 
       begin
         dst.connect_nonblock( destination_addr )
@@ -402,7 +415,7 @@ module Girl
         return
       end
 
-      # puts "debug1 a new dst #{ dst.local_address.inspect }"
+      # puts "debug a new dst #{ dst.local_address.inspect }"
       dst_info = {
         src: src,            # 对应src
         domain: domain,      # 目的地
@@ -420,20 +433,32 @@ module Girl
     ##
     # new a redir
     #
-    def new_a_redir( redir_port, cert, key )
-      redir = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      redir.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      redir.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
-      redir.bind( Socket.sockaddr_in( redir_port, '0.0.0.0' ) )
-      redir.listen( 127 )
-
-      @redir_local_address = redir.local_address
+    def new_a_redir
+      pre = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
+      pre.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
+      pre.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+      pre.bind( Socket.sockaddr_in( @redir_port, '0.0.0.0' ) )
+      @redir_local_address = pre.local_address
+      puts "p#{ Process.pid } #{ Time.new } pre bind on #{ @redir_port } local address #{ pre.local_address.inspect }"
+
+      now = Time.new
+      name = OpenSSL::X509::Name.new
+      key = OpenSSL::PKey::RSA.new 1024
+      cert = OpenSSL::X509::Certificate.new
+      cert.version = 2
+      cert.serial = 0
+      cert.not_before = now
+      cert.not_after = now + 365 * 24 * 60 * 60
+      cert.public_key = key.public_key
+      cert.subject = name
+      cert.issuer = name
+      cert.sign key, OpenSSL::Digest.new('SHA1')
       context = OpenSSL::SSL::SSLContext.new
+      context.security_level = 1
       context.add_certificate( cert, key )
-      redir = OpenSSL::SSL::SSLServer.new redir, context
-
-      puts "p#{ Process.pid } #{ Time.new } redir listen on #{ redir_port }"
+      redir = OpenSSL::SSL::SSLServer.new pre, context
+      redir.listen( 127 )
+      puts "p#{ Process.pid } #{ Time.new } redir listening"
       add_read( redir, :redir )
     end
 
@@ -454,12 +479,12 @@ module Girl
         ip_info, created_at = resolv_cache
 
         if Time.new - created_at < RESOLV_CACHE_EXPIRE then
-          # puts "debug1 #{ domain } hit resolv cache #{ ip_info.inspect }"
+          # puts "debug #{ domain } hit resolv cache #{ ip_info.inspect }"
           new_a_dst( src, ip_info )
           return
         end
 
-        # puts "debug1 expire #{ domain } resolv cache"
+        # puts "debug expire #{ domain } resolv cache"
         @resolv_caches.delete( domain )
       end
 
@@ -509,7 +534,7 @@ module Girl
     # read dotr
     #
     def read_dotr( dotr )
-      dotr.read_nonblock( READ_SIZE )
+      dotr.read_nonblock( 65535 )
 
       if @closing_srcs.any? then
         @closing_srcs.each { | src | close_src( src ) }
@@ -539,14 +564,32 @@ module Girl
     # read redir
     #
     def read_redir( redir )
+      accepted = false
+
+      Thread.new do
+        sleep 1
+
+        unless accepted then
+          puts "p#{ Process.pid } #{ Time.new } accept timeout"
+          close_redir( redir )
+          new_a_redir
+        end
+      end
+
       begin
         src = redir.accept
+      rescue SystemExit => e
+        puts "p#{ Process.pid } #{ Time.new } redir accept #{ e.class }"
+        close_redir( redir )
+        return
       rescue Exception => e
         puts "p#{ Process.pid } #{ Time.new } redir accept #{ e.class }"
+        puts e.full_message
         return
       end
 
-      # puts "debug1 accept a src"
+      accepted = true
+      # puts "debug accept a src"
 
       @src_infos[ src ] = {
         proxy_proto: :uncheck,   # :uncheck / :socks5
@@ -577,17 +620,19 @@ module Girl
         return
       end
 
+      src_info = @src_infos[ src ]
+
       begin
-        data = src.read_nonblock( READ_SIZE )
+        data = src.read_nonblock( 65535 )
       rescue IO::WaitReadable
         return
       rescue Errno::EINTR => e
         puts e.class
         return
       rescue Exception => e
-        # puts "debug1 read src #{ e.class }"
-        src_info = close_read_src( src )
+        # puts "debug read src #{ e.class }"
         dst = src_info[ :dst ]
+        close_read_src( src )
 
         if dst then
           set_dst_closing_write( dst )
@@ -605,7 +650,7 @@ module Girl
           "p#{ Process.pid } #{ Time.new } unknown data #{ data.inspect }"
         end
 
-        # puts "debug1 socks5 #{ data.inspect }"
+        # puts "debug socks5 #{ data.inspect }"
 
         # https://tools.ietf.org/html/rfc1928
         #
@@ -633,7 +678,7 @@ module Girl
         src_info[ :proxy_proto ] = :socks5
         src_info[ :proxy_type ] = :negotiation
       when :checking then
-        # puts "debug1 add src rbuff before resolved #{ data.inspect }"
+        # puts "debug add src rbuff before resolved #{ data.inspect }"
         src_info[ :rbuff ] << data
       when :negotiation then
         # +----+-----+-------+------+----------+----------+
@@ -641,11 +686,11 @@ module Girl
         # +----+-----+-------+------+----------+----------+
         # | 1  |  1  | X'00' |  1   | Variable |    2     |
         # +----+-----+-------+------+----------+----------+
-        # puts "debug1 negotiation #{ data.inspect }"
+        # puts "debug negotiation #{ data.inspect }"
         ver, cmd, rsv, atyp = data[ 0, 4 ].unpack( 'C4' )
 
         if cmd == 1 then
-          # puts "debug1 socks5 CONNECT"
+          # puts "debug socks5 CONNECT"
 
           if atyp == 1 then
             destination_host, destination_port = data[ 4, 6 ].unpack( 'Nn' )
@@ -654,7 +699,7 @@ module Girl
             destination_ip = destination_addrinfo.ip_address
             src_info[ :destination_domain ] = destination_ip
             src_info[ :destination_port ] = destination_port
-            # puts "debug1 IP V4 address #{ destination_addrinfo.ip_unpack.inspect }"
+            # puts "debug IP V4 address #{ destination_addrinfo.ip_unpack.inspect }"
             new_a_dst( src, destination_addrinfo )
           elsif atyp == 3 then
             domain_len = data[ 4 ].unpack( 'C' ).first
@@ -664,7 +709,7 @@ module Girl
               port = data[ ( 5 + domain_len ), 2 ].unpack( 'n' ).first
               src_info[ :destination_domain ] = domain
               src_info[ :destination_port ] = port
-              # puts "debug1 DOMAINNAME #{ domain } #{ port }"
+              # puts "debug DOMAINNAME #{ domain } #{ port }"
               resolve_domain( src, domain )
             end
           end
@@ -675,12 +720,9 @@ module Girl
         dst = src_info[ :dst ]
 
         if dst then
-          unless dst.closed? then
-            # puts "debug2 add dst.wbuff #{ data.bytesize }"
-            add_dst_wbuff( dst, data )
-          end
+          add_dst_wbuff( dst, data )
         else
-          # puts "debug1 dst not ready, save data to src.rbuff"
+          # puts "debug add src.rbuff #{ data.bytesize }"
           add_src_rbuff( src, data )
         end
       end
@@ -695,21 +737,22 @@ module Girl
         return
       end
 
+      dst_info = @dst_infos[ dst ]
+      src = dst_info[ :src ]
+
       begin
-        data = dst.read_nonblock( READ_SIZE )
+        data = dst.read_nonblock( 65535 )
       rescue IO::WaitReadable, Errno::EINTR
         print 'r'
         return
       rescue Exception => e
-        # puts "debug1 read dst #{ e.class }"
-        dst_info = close_read_dst( dst )
-        src = dst_info[ :src ]
+        # puts "debug read dst #{ e.class }"
+        close_read_dst( dst )
         set_src_closing_write( src )
         return
       end
 
-      dst_info = @dst_infos[ dst ]
-      src = dst_info[ :src ]
+      # puts "debug read dst #{ data.bytesize }"
       add_src_wbuff( src, data )
     end
 
@@ -744,7 +787,7 @@ module Girl
         print 'w'
         return
       rescue Exception => e
-        # puts "debug1 write src #{ e.class }"
+        # puts "debug write src #{ e.class }"
         close_write_src( src )
 
         if dst then
@@ -754,7 +797,6 @@ module Girl
         return
       end
 
-      # puts "debug2 written src #{ written }"
       data = data[ written..-1 ]
       src_info[ :wbuff ] = data
     end
@@ -790,7 +832,7 @@ module Girl
         print 'w'
         return
       rescue Exception => e
-        # puts "debug1 write dst #{ e.class }"
+        # puts "debug write dst #{ e.class }"
         close_write_dst( dst )
         close_read_src( src )
         return