intranet-core 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a43e959280a59c8d78aca617cfe1cce627a91f
-  data.tar.gz: 0c6a14aceaf6386eafdf9df74d44348f7cd4e19c
+  metadata.gz: 33d4ae0d118eb6df517196db16108065df87c47d
+  data.tar.gz: 1bc931bf597059ef00c54368e8e8548548c66fa2
 SHA512:
-  metadata.gz: e7aa8f0cf791ce22fd5098176bcc1431f6742e6268f6a244d731a211c6b28510505885d216b2b1ef8f2a2fbd4e321b5f08552c9a7d20d8673b84a34f1d0f243e
-  data.tar.gz: 5af64c4232442843117fbd865cd06c228d29ef682a647169c2f78c5dbfca9113214864ca673c8c75338ee7df4a87558fada653391565b0c77138e581c2ae77a4
+  metadata.gz: ec89f5cbf9fb1466b3c22d475380980d44c9d1a369d126c276cb41c719ecc0e193609a17eaffffd1e6f1f7ba74b6d26b95744ab06304bbaff2216d6215038204
+  data.tar.gz: e3baf947cbd08ccc04a96cbaca311030560e70e1b7cd586e6e14a16429b56df42b9c2c7eccec77f1e246a6a335d688c0f734e2d44ff1eef9c06eebc132dd22d5

data/lib/intranet/core/servlet.rb

@@ -26,12 +26,12 @@ module Intranet
         # We could use request.request_uri (which is a URI object) but its path is not normalized
         # (it may contain '../' or event start with '..'). Hence we use request.path which has been
         # normalized with HTTPUtils::normalize_path, and request.query for the URL parameters.
-        path = request.path
+        path = request.path.force_encoding('UTF-8')
         path += 'index.html' if path.end_with?('/')
 
         handle_redirections(request, path, response, '/index.html' => @builder.home_url)
 
-        status, content_type, body = @builder.do_get(path, request.query)
+        status, content_type, body = @builder.do_get(path, encode_query(request.query))
 
         raise WEBrick::HTTPStatus[status] if WEBrick::HTTPStatus.error?(status)
 
@@ -51,6 +51,13 @@ module Intranet
       rescue KeyError # rubocop:disable Lint/HandleExceptions
         # nothing to do
       end
+
+      # Reencodes the +query+ in UTF-8 strings for compatibility.
+      def encode_query(query)
+        query.map do |k, v|
+          { k.dup.force_encoding('UTF-8') => v.force_encoding('UTF-8') }
+        end.reduce({}, :merge)
+      end
     end
   end
 end

data/lib/intranet/core/version.rb

@@ -6,7 +6,7 @@ module Intranet
     NAME = 'intranet-core'
 
     # The version of the gem, according to semantic versionning.
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
 
     # The URL of the gem homepage.
     HOMEPAGE_URL = 'https://rubygems.org/gems/intranet-core'

data/spec/intranet/core_spec.rb

@@ -178,7 +178,7 @@ RSpec.describe Intranet::Core do
     end
 
     context 'given a valid and registered module' do
-      it 'should be called with the URL path and query' do
+      it 'should be called with the decoded URL path and query in UTF-8 encoding' do
         begin
           @intranet = described_class.new(Intranet::Logger.new(Intranet::Logger::FATAL))
           responder = Intranet::TestResponder.new('/index.html' => [200, 'text/html', ''])
@@ -190,25 +190,17 @@ RSpec.describe Intranet::Core do
           end
 
           socket = TCPSocket.new('localhost', @intranet.port)
-          socket.puts("GET /responder/query?var1=value1&var2=value2 HTTP/1.1\r\n" \
+          socket.puts("GET /responder/query%20t?var1=value1&var2=value2 HTTP/1.1\r\n" \
                       "Host: localhost:#{@intranet.port}\r\n\r\n")
           expect(socket.gets).to include('HTTP/1.1 200 OK')
           while (line = socket.gets.chomp) # consume HTTP response headers
             break if line.empty?
           end
           line = socket.gets.chomp
-          expect(line).to eql({ 'var1' => 'value1', 'var2' => 'value2' }.to_s)
-          socket.close
-
-          socket = TCPSocket.new('localhost', @intranet.port)
-          socket.puts("GET /responder/query?foo=bar&baz=boz HTTP/1.1\r\n" \
-                      "Host: localhost:#{@intranet.port}\r\n\r\n")
-          expect(socket.gets).to include('HTTP/1.1 200 OK')
-          while (line = socket.gets.chomp) # consume HTTP response headers
-            break if line.empty?
-          end
-          line = socket.gets.chomp
-          expect(line).to eql({ 'foo' => 'bar', 'baz' => 'boz' }.to_s)
+          expect(line).to eql(
+            'PATH=/query t (UTF-8), ' \
+            'QUERY={var1 (UTF-8) => value1 (UTF-8),var2 (UTF-8) => value2 (UTF-8)}'
+          )
         ensure
           socket.close
           Thread.kill(thread)

data/spec/test_responder/responder.rb

@@ -42,8 +42,8 @@ module Intranet
     end
 
     def generate_page(path, query)
-      if path == '/query'
-        [200, 'text/plain', query.to_s + "\r\n"]
+      if path.start_with?('/query')
+        [200, 'text/plain', dump_with_encoding(path, query)]
       else
         @responses.fetch(path)
       end
@@ -58,5 +58,13 @@ module Intranet
     def js_dependencies
       super + @extra_js
     end
+
+    private
+
+    def dump_with_encoding(path, query)
+      "PATH=#{path} (#{path.encoding}), QUERY={" +
+        query.map { |k, v| "#{k} (#{k.encoding}) => #{v} (#{v.encoding})" }.join(',') +
+        "}\r\n"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intranet-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ebling Mis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml