Fix handling of ServerTiming quoting.

Author: ioquatix

lib/protocol/http/header/server_timing.rb

@@ -26,8 +26,8 @@ class ServerTiming < Split
 				ParseError = Class.new(Error)
 
 				# https://www.w3.org/TR/server-timing/
-				METRIC = /\A(?<name>[a-zA-Z0-9][a-zA-Z0-9_\-]*)(;(?<params>.*))?\z/
-				PARAM = /(?<key>dur|desc)=(?<value>[^;,]+|"[^"]*")/
+				METRIC = /\A(?<name>[a-zA-Z0-9][a-zA-Z0-9_\-]*)(;(?<parameters>.*))?\z/
+				PARAMETER = /(?<key>dur|desc)=((?<value>#{TOKEN})|(?<quoted_value>#{QUOTED_STRING}))/
 
 				# A single metric in the Server-Timing header.
 				Metric = Struct.new(:name, :duration, :description) do
@@ -58,22 +58,19 @@ def metrics
 					self.map do |value|
 						if match = value.match(METRIC)
 							name = match[:name]
-							params = match[:params] || ""
+							parameters = match[:parameters] || ""
 
 							duration = nil
 							description = nil
 
-							params.scan(PARAM) do |key, param_value|
+							parameters.scan(PARAMETER) do |key, value, quoted_value|
+								value = QuotedString.unquote(quoted_value) if quoted_value
+								
 								case key
 								when "dur"
-									duration = param_value.to_f
+									duration = value.to_f
 								when "desc"
-									# Remove quotes if present
-									if param_value.start_with?('"') && param_value.end_with?('"')
-										description = param_value[1..-2]
-									else
-										description = param_value
-									end
+									description = value
 								end
 							end
 

test/protocol/http/header/server_timing.rb

@@ -35,6 +35,16 @@
 		end
 	end
 
+	with 'db;dur="53.2"' do
+		it "can parse metric with quoted duration" do
+			metrics = header.metrics
+			expect(metrics.size).to be == 1
+			expect(metrics.first.name).to be == "db"
+			expect(metrics.first.duration).to be == 53.2
+			expect(metrics.first.description).to be_nil
+		end
+	end
+	
 	with 'cache;desc="Redis lookup"' do
 		it "can parse metric with description" do
 			metrics = header.metrics
@@ -54,6 +64,15 @@
 		end
 	end
 
+	with 'app;dur="12.7";desc="Application logic"' do
+		it "can parse metric with quoted duration and quoted description" do
+			metrics = header.metrics
+			expect(metrics.first.name).to be == "app"
+			expect(metrics.first.duration).to be == 12.7
+			expect(metrics.first.description).to be == "Application logic"
+		end
+	end
+	
 	with "db;dur=45.3, app;dur=12.7;desc=\"Application logic\", cache;desc=\"Cache miss\"" do
 		it "can parse multiple metrics" do
 			metrics = header.metrics