Added support for chunked transfer-encoding response.

Implemented correctly the redirection support for NET_HTTP_CLIENT... Added the possibility to use HTTP/1.0 . Splitted the manual tests that were using during development. First step to redesign and clean the new code.
2015-09-10 23:05:56 +02:00
parent 9cd0f0b117
commit 29c4931dc0
8 changed files with 425 additions and 202 deletions
--- a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
+++ b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
@@ -61,6 +61,7 @@ feature -- Execution
 			l_upload_data: detachable READABLE_STRING_8
 			l_upload_filename: detachable READABLE_STRING_GENERAL
 			l_headers: like headers
+			l_is_http_1_0: BOOLEAN
 		do
 			if not retried then
 				curl := session.curl
@@ -70,6 +71,10 @@ feature -- Execution

 				ctx := context

+				if ctx /= Void then
+					l_is_http_1_0 := attached ctx.http_version as l_http_version and then l_http_version.same_string ("HTTP/1.0")
+				end
+
 				--| Configure cURL session
 				initialize_curl_session (ctx, curl, curl_easy, curl_handle)

@@ -84,7 +89,11 @@ feature -- Execution
 					io.put_new_line
 				end
 				curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_url, l_url)
-
+				if l_is_http_1_0 then
+					curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_http_version, {CURL_OPT_CONSTANTS}.curl_http_version_1_0)
+				else
+					curl_easy.setopt_integer (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_http_version, {CURL_OPT_CONSTANTS}.curl_http_version_none)
+				end
 				l_headers := headers

 				-- Context
--- a/library/network/http_client/src/spec/socket/net_http_client_request.e
+++ b/library/network/http_client/src/spec/socket/net_http_client_request.e
@@ -31,6 +31,7 @@ feature -- Access
 	response: HTTP_CLIENT_RESPONSE
 			-- <Precursor>
 		local
+			redirection_response: detachable like response
 			l_uri: URI
 			l_host: READABLE_STRING_8
 			l_request_uri: STRING
@@ -43,7 +44,6 @@ feature -- Access
 			l_location: detachable READABLE_STRING_8
 			l_port: INTEGER
 			l_authorization: HTTP_AUTHORIZATION
-			l_session: NET_HTTP_CLIENT_SESSION
 			l_platform: STRING
 			l_useragent: STRING
 			l_upload_data: detachable READABLE_STRING_8
@@ -55,9 +55,14 @@ feature -- Access
 			l_mime_type_mapping: HTTP_FILE_EXTENSION_MIME_MAPPING
 			l_mime_type: STRING
 			l_fn_extension: READABLE_STRING_GENERAL
-			l_i: INTEGER
+			l_prev_header: READABLE_STRING_8
+			l_boundary: READABLE_STRING_8
+			l_is_http_1_0: BOOLEAN
 		do
 			ctx := context
+			if ctx /= Void then
+				l_is_http_1_0 := attached ctx.http_version as l_http_version and then l_http_version.same_string ("HTTP/1.0")
+			end
 			create Result.make (url)

 			create l_form_string.make_empty
@@ -129,22 +134,23 @@ feature -- Access
 					l_form_data := ctx.form_parameters
 					check non_empty_form_data: not l_form_data.is_empty end
 					if l_upload_data = Void and l_upload_filename = Void then
-						-- Send as form-urlencoded
+							-- Send as form-urlencoded
 						headers.extend ("application/x-www-form-urlencoded", "Content-Type")
 						l_upload_data := ctx.form_parameters_to_url_encoded_string
-						headers.extend (l_upload_data.count.out, "Content-Length")
+						headers.force (l_upload_data.count.out, "Content-Length")

 					else
-						-- create form
-						headers.extend ("multipart/form-data; boundary=----------------------------5eadfcf3bb3e", "Content-Type")
-						if attached l_form_data then
+							-- create form
+						l_boundary := new_mime_boundary
+						headers.extend ("multipart/form-data; boundary=" + l_boundary, "Content-Type")
+						if l_form_data /= Void then
 							headers.extend ("*/*", "Accept")
 							from
 								l_form_data.start
 							until
 								l_form_data.after
 							loop
-								l_form_string.append ("------------------------------5eadfcf3bb3e")
+								l_form_string.append (l_boundary)
 								l_form_string.append (http_end_of_header_line)
 								l_form_string.append ("Content-Disposition: form-data; name=")
 								l_form_string.append ("%"" + l_form_data.key_for_iteration + "%"")
@@ -155,8 +161,8 @@ feature -- Access
 								l_form_data.forth
 							end

-							if  l_upload_filename /= Void then
-								-- get file extension, otherwise set default
+							if l_upload_filename /= Void then
+									-- get file extension, otherwise set default
 								l_mime_type := "application/octet-stream"
 								create l_mime_type_mapping.make_default
 								l_fn_extension := l_upload_filename.tail (l_upload_filename.count - l_upload_filename.last_index_of ('.', l_upload_filename.count))
@@ -164,7 +170,7 @@ feature -- Access
 									l_mime_type := mime
 								end

-								l_form_string.append ("------------------------------5eadfcf3bb3e")
+								l_form_string.append (l_boundary)
 								l_form_string.append (http_end_of_header_line)
 								l_form_string.append ("Content-Disposition: form-data; name=%"" + l_upload_filename.as_string_32 + "%"")
 							    l_form_string.append ("; filename=%"" + l_upload_filename + "%"")
@@ -182,7 +188,7 @@ feature -- Access
 									end
 								l_form_string.append (http_end_of_header_line)
 							end
-							l_form_string.append ("------------------------------5eadfcf3bb3e--")
+							l_form_string.append (l_boundary + "--") --| end

 							l_upload_data := l_form_string
 							headers.extend (l_upload_data.count.out, "Content-Length")
@@ -212,7 +218,7 @@ feature -- Access
 				end
 			end

-			-- handle put requests
+				-- handle put requests
 			if request_method.is_case_insensitive_equal ("PUT") then
 				if ctx /= Void then
 					if ctx.has_upload_filename then
@@ -227,11 +233,9 @@ feature -- Access

 					end
 				end
-
-
 			end

-			-- Connect			
+				-- Connect			
 			create socket.make_client_by_port (l_port, l_host)
 			socket.set_timeout (timeout)
 			socket.set_connect_timeout (connect_timeout)
@@ -241,7 +245,11 @@ feature -- Access
 				s.append_character (' ')
 				s.append (l_request_uri)
 				s.append_character (' ')
-				s.append (Http_version)
+				if l_is_http_1_0 then
+					s.append ("HTTP/1.0")
+				else
+					s.append ("HTTP/1.1")
+				end
 				s.append (Http_end_of_header_line)

 				s.append (Http_host_header)
@@ -275,7 +283,7 @@ feature -- Access
 						until
 							l_upload_file.after
 						loop
-							l_upload_file.read_line
+							l_upload_file.read_line_thread_aware
 							s.append (l_upload_file.last_string)
 						end
 					end
@@ -283,65 +291,29 @@ feature -- Access

 				socket.put_string (s)

-				-- Get header message
-				from
-					l_content_length := -1
-					create l_message.make_empty
-					socket.read_line
-					s := socket.last_string
-				until
-					s.same_string ("%R") or not socket.is_readable
-				loop
-					l_message.append (s)
-					l_message.append_character ('%N')
-						-- Search for Content-Length is not yet set.
-					if
-						l_content_length = -1 and then -- Content-Length is not yet found.
-						s.starts_with_general ("Content-Length:")
-					then
-						i := s.index_of (':', 1)
-						check has_colon: i > 0 end
-						s.remove_head (i)
-						s.right_adjust -- Remove trailing %R
-						if s.is_integer then
-							l_content_length := s.to_integer
-						end
-					elseif
-						l_location = Void and then
-						s.starts_with_general ("Location:")
-					then
-						i := s.index_of (':', 1)
-						check has_colon: i > 0 end
-						s.remove_head (i)
-						s.left_adjust -- Remove startung spaces
-						s.right_adjust -- Remove trailing %R
-						l_location := s
-					elseif s.starts_with_general ("Set-Cookie:") then
-						i := s.index_of (':', 1)
-						s.remove_head (i)
-						s.left_adjust
-						s.right_adjust
-						session.set_cookie (s)
-					end
-						-- Next iteration
-					socket.read_line
-					s := socket.last_string
+					--| Get response.
+					--| Get header message
+				create l_message.make_empty
+				read_header_from_socket (socket, l_message)
+				l_prev_header := Result.raw_header
+				Result.set_raw_header (l_message.string)
+				l_content_length := -1
+				if attached Result.header ("Content-Length") as s_len and then s_len.is_integer then
+					l_content_length := s_len.to_integer
+				end
+				l_location := Result.header ("Location")
+				if attached Result.header ("Set-Cookies") as s_cookies then
+					session.set_cookie (s_cookies)
 				end
 				l_message.append (http_end_of_header_line)

 					-- Get content if any.
-				if
-					l_content_length > 0 and
-					socket.is_readable
-				then
-					socket.read_stream_thread_aware (l_content_length)
-					if socket.bytes_read /= l_content_length then
-						check full_content_read: False end
-					end
-					l_message.append (socket.last_string)
-				end
-
+				append_socket_content_to (Result, socket, l_content_length, l_message)
+					-- Restore previous header
+				Result.set_raw_header (l_prev_header)
+					-- Set message
 				Result.set_response_message (l_message, context)
+
 					-- Get status code.
 				if attached Result.status_line as l_status_line then
 					if l_status_line.starts_with ("HTTP/") then
@@ -364,12 +336,15 @@ feature -- Access
 					end
 				end

-				-- follow redirect
+					-- follow redirect
 				if l_location /= Void then
 					if current_redirects < max_redirects then
 						current_redirects := current_redirects + 1
-						url := l_location
-						Result := response
+						initialize (l_location, ctx)
+						redirection_response := response
+						redirection_response.add_redirection (Result.status_line, Result.raw_header, Result.body)
+						Result := redirection_response
+--						Result.add_redirection (redirection_response.status_line, redirection_response.raw_header, redirection_response.body)
 					end
 				end

@@ -378,6 +353,108 @@ feature -- Access
 				Result.set_error_message ("Could not connect")
 			end
 		end
+
+feature {NONE} -- Helpers		
+
+	read_header_from_socket (a_socket: NETWORK_STREAM_SOCKET; a_output: STRING)
+			-- Get header from `a_socket' into `a_output'.
+		local
+			s: READABLE_STRING_8
+		do
+			if a_socket.is_readable then
+				from
+					s := ""
+				until
+					s.same_string ("%R") or not a_socket.is_readable
+				loop
+					a_socket.read_line_thread_aware
+					s := a_socket.last_string
+					if s.same_string ("%R") then
+							-- Reach end of header
+--						a_output.append (http_end_of_header_line)
+					else
+						a_output.append (s)
+						a_output.append_character ('%N')
+					end
+				end
+			end
+		end
+
+	append_socket_content_to (a_response: HTTP_CLIENT_RESPONSE; a_socket: NETWORK_STREAM_SOCKET; a_len: INTEGER; a_buffer: STRING)
+			-- Get content from `a_socket' and append it to `a_buffer'.
+			-- If `a_len' is negative, try to get as much as possible,
+			-- this is probably HTTP/1.0 without any Content-Length.
+		local
+			s: STRING_8
+			n,pos: INTEGER
+			hexa2int: HEXADECIMAL_STRING_TO_INTEGER_CONVERTER
+		do
+			if a_socket.is_readable then
+				if a_len >= 0 then
+					a_socket.read_stream_thread_aware (a_len)
+					s := a_socket.last_string
+					check full_content_read: a_socket.bytes_read = a_len end
+					a_buffer.append (s)
+				else
+					if attached a_response.header ("Transfer-Encoding") as l_enc and then l_enc.is_case_insensitive_equal ("chunked") then
+						from
+							create hexa2int.make
+							n := 1
+						until
+							n = 0 or not a_socket.is_readable
+						loop
+							a_socket.read_line_thread_aware -- Read chunk info
+							s := a_socket.last_string
+							s.right_adjust
+							pos := s.index_of (';', 1)
+							if pos > 0 then
+								s.keep_head (pos - 1)
+							end
+							if s.is_empty then
+								n := 0
+							else
+								hexa2int.parse_string_with_type (s, hexa2int.type_integer)
+								if hexa2int.parse_successful then
+									n := hexa2int.parsed_integer
+								else
+									n := 0
+								end
+							end
+							if n > 0 then
+								a_socket.read_stream_thread_aware (n)
+								check a_socket.bytes_read = n end
+								a_buffer.append (a_socket.last_string)
+								a_socket.read_character
+								check a_socket.last_character = '%R' end
+								a_socket.read_character
+								check a_socket.last_character = '%N' end
+							end
+						end
+					else
+							-- HTTP/1.0
+						from
+							n := 1_024
+						until
+							n < 1_024 or not a_socket.is_readable
+						loop
+							a_socket.read_stream_thread_aware (1_024)
+							s := a_socket.last_string
+							n := a_socket.bytes_read
+							a_buffer.append (s)
+						end
+					end
+				end
+			end
+		end
+
+	new_mime_boundary: STRING
+			-- New MIME boundary.
+		do
+				-- FIXME: better boundary creation
+			Result := "----------------------------5eadfcf3bb3e"
+		end
+
+invariant
 note
 	copyright: "2011-2015, Jocelyn Fiat, Javier Velilla, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"