angelo 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2628a86b9264d55fc6451251c051b64c6740a841
-  data.tar.gz: c8a82e5c2d5a4c770192fa43a7164fc32e0ce55c
+  metadata.gz: 7e0c3ba39f8e1f28399b3302508e5607e184306c
+  data.tar.gz: 80a96668a3b52d38d10128f849115f5a9ffc639c
 SHA512:
-  metadata.gz: 33b0be0bce186d529744010e69eeb36b01423f5fad7d351bf9a5800fac02a560253b77e4e1d0c413a17dea299ad4a9cc100b60c580cbb1dd9583550b1d028fe8
-  data.tar.gz: 615af33b3c6498f497744a7238e88bfe35a7011ff1c0c1def9ae437eba7d76d9ecb6a7f922d18ebd9e7afb2a42817ee9989d334ad64ee41051c959dcc00a8d7e
+  metadata.gz: 8692b30501f977877aca3f79246f66dcf046e9d40100577ff79afe8235e5212081c6cda1545e9dc8a78272cc1a98e9a16ce436891bc2735713f4aaac1227b068
+  data.tar.gz: 1a0a3c79e9bb12a5c49bc3af8913c4099c7b281dbd429ba2fcdbc9f32c5a606b4fcf21fd5925d25d6a678b783fcaa2152c71251c77141556553510e0bbea1430

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 changelog
 =========
 
+### 0.1.22 9 sep 2014
+
+* handle bad/malformed requests better
+
 ### 0.1.21 10 aug 2014
 
 * add forward for SSE stash from Server for tasks

data/lib/angelo/server.rb

@@ -41,6 +41,9 @@ module Angelo
       else
         route! meth, connection, request
       end
+    rescue URI::InvalidURIError => e
+      Angelo.log connection, request, nil, :bad_request
+      connection.respond :bad_request, DEFAULT_RESPONSE_HEADERS, e.message
     end
 
     def route! meth, connection, request

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

data/lib/angelo.rb

@@ -48,7 +48,7 @@ module Angelo
 
   NOT_FOUND = 'Not Found'
 
-  LOG_FORMAT = '%s - - "%s %s%s HTTP/%s" %d %s'
+  LOG_FORMAT = '%s - - "%s %s HTTP/%s" %d %s'
 
   DEFAULT_PING_TIME = 30
 
@@ -84,8 +84,7 @@ module Angelo
     Celluloid::Logger.__send__ Angelo.response_log_level, LOG_FORMAT % [
       remote_ip[],
       request.method,
-      request.path,
-      request.query_string.nil? ? nil : '?'+request.query_string,
+      request.url,
       request.version,
       Symbol === status ? HTTP::Response::SYMBOL_TO_STATUS_CODE[status] : status,
       body_size

data/test/angelo_spec.rb

@@ -97,6 +97,15 @@ describe Angelo::Base do
       r.status.must_equal 404
     end
 
+    it 'does not crash when receiving invalid uri' do
+      s = TCPSocket.new Angelo::DEFAULT_ADDR, Angelo::DEFAULT_PORT
+      s.write 'GET /?file=<SCRIPT>window.alert</SCRIPT>' + "\n\n"
+      r = s.read
+      s.close
+      assert @server.alive?
+      r.must_match /400 Bad Request/
+    end
+
   end
 
   describe 'before filter' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel