girl 0.58.1 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3499680dcc958bbb7fe5a1a1774a78d67441c9f4ac3f6a1a3662533814efbdd3
-  data.tar.gz: 2dc867c3105d9d111e98a8be41ab3bb10a86ed883e35d684a85c5d52b7534953
+  metadata.gz: f3597360a30c0ba1226ed9fdeef1faf10687bbfc48ac58c07c063c5e6888dd50
+  data.tar.gz: 7d7429c890f3090c53b57c61587a4f03351d4e68775e310acd174baf91adfa74
 SHA512:
-  metadata.gz: efb0dde6e8508b3596490230ecc95413c3e2d0154af963106e25fff87c77e1ffbee8e758d3b52593360885ab3a7f9a49349804e64359c817bcb99cc6dcf0508a
-  data.tar.gz: 36760b372618934b90c09649ff600fcf60935637af90ca16b4fb5b34777b183181717b41dc573b533c76b116aa68077c23ecc2ff216f38b1baad2b6efd2d1623
+  metadata.gz: f0e09919d82be7c07a3342199af626487cdde4527e799609ec561fc9bef29929a616a075dbc10ce31656c00c7c5aab4311223edbf7ea45cf70e9798f0bc5f20e
+  data.tar.gz: 979e305bb9c5f9e846271ff9d9c1bb01438ca6714e96a95ab7b588493968aa5d25dccfda5ee4d36d288570034e655ac0c113a4e935fcc3410be23d091d74ea56

data/lib/girl/proxy.rb

@@ -99,7 +99,7 @@ module Girl
           raise "not found direct file #{ direct_path }"
         end
 
-        directs = ( RESERVED_ROUTE.split( "\n" ) + IO.binread( direct_path ).split( "\n" ) ).map { | line | IPAddr.new( line.strip ) }
+        directs = ( [ Addrinfo.ip( proxyd_host ).ip_address ] + RESERVED_ROUTE.split( "\n" ) + IO.binread( direct_path ).split( "\n" ) ).map { | line | IPAddr.new( line.strip ) }
       end
 
       remotes = []
@@ -163,35 +163,39 @@ module Girl
       puts "im #{ im }"
       puts "worker count #{ worker_count }"
 
-      $0 = title
-      workers = []
+      if RUBY_PLATFORM.include?( 'linux' )
+        $0 = title
+        workers = []
 
-      worker_count.times do | i |
-        workers << fork do
-          $0 = 'girl proxy worker'
-          worker = Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im )
+        worker_count.times do | i |
+          workers << fork do
+            $0 = 'girl proxy worker'
+            worker = Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im )
 
-          Signal.trap( :TERM ) do
-            puts "w#{ i } exit"
-            worker.quit!
-          end
+            Signal.trap( :TERM ) do
+              puts "w#{ i } exit"
+              worker.quit!
+            end
 
-          worker.looping
+            worker.looping
+          end
         end
-      end
 
-      Signal.trap( :TERM ) do
-        puts 'trap TERM'
-        workers.each do | pid |
-          begin
-            Process.kill( :TERM, pid )
-          rescue Errno::ESRCH => e
-            puts e.class
+        Signal.trap( :TERM ) do
+          puts 'trap TERM'
+          workers.each do | pid |
+            begin
+              Process.kill( :TERM, pid )
+            rescue Errno::ESRCH => e
+              puts e.class
+            end
           end
         end
-      end
 
-      Process.waitall
+        Process.waitall
+      else
+        Girl::ProxyWorker.new( proxy_port, proxyd_host, proxyd_port, directs, remotes, src_chunk_dir, dst_chunk_dir, tun_chunk_dir, im ).looping
+      end
     end
 
   end

data/lib/girl/proxy_worker.rb

@@ -217,6 +217,12 @@ module Girl
     # resolve domain
     #
     def resolve_domain( src, domain )
+      if ( /\A(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\Z/ =~ domain ) && domain.split( '.' ).all? { | part | part.to_i < 256 }
+        # puts "debug1 #{ domain } is a ip"
+        deal_with_destination_ip( src, domain )
+        return
+      end
+
       if @remotes.any? { | remote | ( domain.size >= remote.size ) && ( domain[ ( remote.size * -1 )..-1 ] == remote ) }
         # puts "debug1 #{ domain } hit remotes"
         new_a_src_ext( src )
@@ -238,6 +244,9 @@ module Girl
         @resolv_caches.delete( domain )
       end
 
+      src_info = @src_infos[ src ]
+      src_info[ :proxy_type ] = :checking
+
       Thread.new do
         begin
           ip_info = Addrinfo.ip( domain )
@@ -283,8 +292,12 @@ module Girl
     def new_a_proxy( proxy_port )
       proxy = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
       proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEADDR, 1 )
-      proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
-      proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+
+      if RUBY_PLATFORM.include?( 'linux' )
+        proxy.setsockopt( Socket::SOL_SOCKET, Socket::SO_REUSEPORT, 1 )
+        proxy.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      end
+
       proxy.bind( Socket.sockaddr_in( proxy_port, '0.0.0.0' ) )
       proxy.listen( 511 )
       puts "p#{ Process.pid } #{ Time.new } proxy listen on #{ proxy_port }"
@@ -334,7 +347,10 @@ module Girl
       src_info = @src_infos[ src ]
       destination_addr = Socket.sockaddr_in( src_info[ :destination_port ], destination_ip )
       dst = Socket.new( Socket::AF_INET, Socket::SOCK_STREAM, 0 )
-      dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+
+      if RUBY_PLATFORM.include?( 'linux' )
+        dst.setsockopt( Socket::SOL_TCP, Socket::TCP_NODELAY, 1 )
+      end
 
       begin
         dst.connect_nonblock( destination_addr )
@@ -369,11 +385,11 @@ module Girl
         datas = src_info[ :rbuffs ]
 
         if datas.empty?
-          # HTTP/1.1 CONNECT
+          # CONNECT
           # puts "debug1 add src wbuff http ok"
           add_src_wbuff( src, HTTP_OK )
         else
-          # HTTP/1.1 not CONNECT
+          # not CONNECT
           # puts "debug1 add src rbuffs to dst wbuff"
 
           datas.each do | data |
@@ -434,6 +450,27 @@ module Girl
       add_src_wbuff( src, data )
     end
 
+    ##
+    # sub http request
+    #
+    def sub_http_request( data )
+      lines = data.split( "\r\n" )
+
+      if lines.empty?
+        return [ data, nil ]
+      end
+
+      method, url, proto = lines.first.split( ' ' )
+
+      if proto && url && proto[ 0, 4 ] == 'HTTP' && url[ 0, 7 ] == 'http://'
+        domain_and_port = url.split( '/' )[ 2 ]
+        data = data.sub( "http://#{ domain_and_port }", '' )
+        # puts "debug1 subed #{ data.inspect } #{ domain_and_port }"
+      end
+
+      [ data, domain_and_port ]
+    end
+
     ##
     # add tun ctlmsg
     #
@@ -460,7 +497,7 @@ module Girl
         spring = @tun_info[ :chunks ].size > 0 ? ( @tun_info[ :spring ] + 1 ) : 0
         filename = "#{ Process.pid }-#{ @tun_info[ :port ] }.#{ spring }"
         chunk_path = File.join( @tun_chunk_dir, filename )
-        wbuffs = @tun_info[ :wbuffs ].map{ | _src_addr, _data | [ _src_addr, _data.bytesize.pack( 'n' ), _data ].join }
+        wbuffs = @tun_info[ :wbuffs ].map{ | _src_addr, _data | [ _src_addr, [ _data.bytesize ].pack( 'n' ), _data ].join }
 
         begin
           IO.binwrite( chunk_path, wbuffs.join )
@@ -939,8 +976,8 @@ module Girl
       src_addr = addrinfo.to_sockaddr
       @src_infos[ src ] = {
         src_addr: src_addr,      # src地址
-        proxy_proto: :unchecked, # :http / :socks5
-        proxy_type: :unchecked,  # :unchecked / :direct / :tunnel / :negotiation / :udp
+        proxy_proto: :uncheck,   # :uncheck / :http / :socks5
+        proxy_type: :uncheck,    # :uncheck / :checking / :direct / :tunnel / :negotiation
         dst: nil,                # :direct的场合，对应的dst
         destination_domain: nil, # 目的地域名
         destination_port: nil,   # 目的地端口
@@ -977,63 +1014,84 @@ module Girl
       proxy_type = src_info[ :proxy_type ]
 
       case proxy_type
-      when :unchecked
+      when :uncheck
         if data[ 0, 7 ] == 'CONNECT'
-          # puts "debug1 HTTP/1.1 CONNECT"
+          # puts "debug1 CONNECT"
+          domain_and_port = data.split( "\r\n" )[ 0 ].split( ' ' )[ 1 ]
 
-          connect_to = data.split( "\r\n" )[ 0 ].split( ' ' )[ 1 ]
-          domain, port = connect_to.split( ':' )
-          port = port.to_i
-        else
-          # https://tools.ietf.org/html/rfc1928
-          if data[ 0 ].unpack( 'C' ).first == 5
-            # +----+----------+----------+
-            # |VER | NMETHODS | METHODS  |
-            # +----+----------+----------+
-            # | 1  |    1     | 1 to 255 |
-            # +----+----------+----------+
-            # puts "debug1 socks5 #{ data.inspect }"
-            nmethods = data[ 1 ].unpack( 'C' ).first
-            methods = data[ 2, nmethods ].unpack( 'C*' )
-
-            unless methods.include?( 0 )
-              puts "p#{ Process.pid } #{ Time.new } miss method 00"
-              set_is_closing( src )
-              return
-            end
-
-            # +----+--------+
-            # |VER | METHOD |
-            # +----+--------+
-            # | 1  |   1    |
-            # +----+--------+
-            data2 = [ 5, 0 ].pack( 'CC' )
-            add_src_wbuff( src, data2 )
+          unless domain_and_port
+            puts "p#{ Process.pid } #{ Time.new } CONNECT miss domain"
+            set_is_closing( src )
+            return
+          end
+        elsif data[ 0 ].unpack( 'C' ).first == 5
+          # puts "debug1 socks5 #{ data.inspect }"
 
-            src_info[ :proxy_proto ] = :socks5
-            src_info[ :proxy_type ] = :negotiation
+          # https://tools.ietf.org/html/rfc1928
+          #
+          # +----+----------+----------+
+          # |VER | NMETHODS | METHODS  |
+          # +----+----------+----------+
+          # | 1  |    1     | 1 to 255 |
+          # +----+----------+----------+
+          nmethods = data[ 1 ].unpack( 'C' ).first
+          methods = data[ 2, nmethods ].unpack( 'C*' )
+
+          unless methods.include?( 0 )
+            puts "p#{ Process.pid } #{ Time.new } miss method 00"
+            set_is_closing( src )
             return
           end
 
-          # puts "debug1 HTTP/1.1 not CONNECT"
-          line = data.split( "\r\n" ).find { | _line | _line[ 0, 6 ] == 'Host: ' }
+          # +----+--------+
+          # |VER | METHOD |
+          # +----+--------+
+          # | 1  |   1    |
+          # +----+--------+
+          data2 = [ 5, 0 ].pack( 'CC' )
+          add_src_wbuff( src, data2 )
+
+          src_info[ :proxy_proto ] = :socks5
+          src_info[ :proxy_type ] = :negotiation
+
+          return
+        else
+          # puts "debug1 not CONNECT #{ data.inspect }"
+          host_line = data.split( "\r\n" ).find { | _line | _line[ 0, 6 ] == 'Host: ' }
 
-          unless line
-            # puts "debug1 not found Host #{ data.inspect }"
+          unless host_line
+            # puts "debug1 not found host line"
             set_is_closing( src )
             return
           end
 
-          domain, port = line.split( ' ' )[ 1 ].split( ':' )
-          port = port ? port.to_i : 80
+          data, domain_and_port = sub_http_request( data )
+
+          unless domain_and_port
+            # puts "debug1 not HTTP"
+            domain_and_port = host_line.split( ' ' )[ 1 ]
+
+            unless domain_and_port
+              puts "p#{ Process.pid } #{ Time.new } Host line miss domain"
+              set_is_closing( src )
+              return
+            end
+          end
+
           src_info[ :rbuffs ] << data
         end
 
+        domain, port = domain_and_port.split( ':' )
+        port = port ? port.to_i : 80
+
         src_info[ :proxy_proto ] = :http
         src_info[ :destination_domain ] = domain
         src_info[ :destination_port ] = port
 
         resolve_domain( src, domain )
+      when :checking
+        # puts "debug1 add src rbuff while checking #{ data.inspect }"
+        src_info[ :rbuffs ] << data
       when :negotiation
         # +----+-----+-------+------+----------+----------+
         # |VER | CMD |  RSV  | ATYP | DST.ADDR | DST.PORT |
@@ -1068,7 +1126,7 @@ module Girl
             end
           end
         else
-          # puts "debug1 cmd #{ cmd } not implement"
+          puts "p#{ Process.pid } #{ Time.new } socks5 cmd #{ cmd } not implement"
         end
       when :tunnel
         src_addr = src_info[ :src_addr ]
@@ -1087,6 +1145,10 @@ module Girl
             return
           end
 
+          if src_info[ :rbuffs ].any?
+            data, _ = sub_http_request( data )
+          end
+
           add_tun_wbuff( src_addr, data )
         else
           # puts "debug1 remote dst not ready, save data to src rbuff"
@@ -1102,6 +1164,10 @@ module Girl
             return
           end
 
+          if src_info[ :rbuffs ].any?
+            data, _ = sub_http_request( data )
+          end
+
           add_dst_wbuff( dst, data )
         else
           # puts "debug1 dst not ready, save data to src rbuff"
@@ -1197,11 +1263,11 @@ module Girl
             datas = src_info[ :rbuffs ]
 
             if datas.empty?
-              # HTTP/1.1 CONNECT
+              # CONNECT
               # puts "debug1 add src wbuff http ok"
               add_src_wbuff( src, HTTP_OK )
             else
-              # HTTP/1.1 not CONNECT
+              # not CONNECT
               # puts "debug1 add src rbuffs to tun wbuffs"
 
               datas.each do | _data |

data/lib/girl/version.rb

@@ -1,3 +1,3 @@
 module Girl
-  VERSION = '0.58.1'.freeze
+  VERSION = '0.62.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: girl
 version: !ruby/object:Gem::Version
-  version: 0.58.1
+  version: 0.62.0
 platform: ruby
 authors:
 - takafan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies: []
 description: while internet is evil, here's a girl.
 email: