mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added HTTP_MEDIA_TYPE (maybe it will just replace the HTTP_CONTENT_TYPE later)

Browse Source 
renamed .media_type as .simple_type for now
  allow more than one parameters
This commit is contained in:
Jocelyn Fiat
2012-03-23 18:39:19 +01:00
parent 5c98d7ba4e
commit bcccfb22ed
4 changed files with 351 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

294
library/protocol/http/src/http_content_type.e
View File

@@ -1,32 +1,6 @@
note note
description: "[ description: "[
CGI Meta variable define the CONTENT_TYPE entity This class is to represent the CONTENT_TYPE value
This class is to represent it as an object
the Internet Media Type [9] of the attached entity if the type
was provided via a "Content-type" field in the wgi_request header,
or if the server can determine it in the absence of a supplied
"Content-type" field. The syntax is the same as for the HTTP
"Content-Type" header field.
CONTENT_TYPE = "" | media-type
media-type = type "/" subtype *( ";" parameter)
type = token
subtype = token
parameter = attribute "=" value
attribute = token
value = token | quoted-string
The type, subtype, and parameter attribute names are not
case-sensitive. Parameter values MAY be case sensitive. Media
types and their use in HTTP are described in section 3.7 of
the HTTP/1.1 specification [8].
Example:
application/x-www-form-urlencoded
application/x-www-form-urlencoded; charset=UTF8
]" ]"
date: "$Date$" date: "$Date$"
revision: "$Revision$" revision: "$Revision$"
@@ -35,276 +9,16 @@ class
HTTP_CONTENT_TYPE HTTP_CONTENT_TYPE
inherit inherit
DEBUG_OUTPUT HTTP_MEDIA_TYPE
create create
make, make,
make_from_content_type_header make_from_string
convert convert
make_from_content_type_header ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8}), make_from_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8}),
string: {READABLE_STRING_8} string: {READABLE_STRING_8}
feature {NONE} -- Initialization
make (a_type, a_subtype: READABLE_STRING_8)
-- Create Current based on `a_type/a_subtype'
require
not a_type.is_empty
not a_subtype.is_empty
do
type := a_type
subtype := a_subtype
ensure
has_no_error: not has_error
end
make_from_content_type_header (s: READABLE_STRING_8)
-- Create Current from `s'
-- if `s' does not respect the expected syntax, has_error is True
local
t: STRING_8
i,n: INTEGER
p: INTEGER
pn,pv: STRING_8
do
-- Ignore starting space (should not be any)
from
i := 1
n := s.count
until
i > n or not s[i].is_space
loop
i := i + 1
end
if i < n then
-- Look for semi colon as parameter separation
p := s.index_of (';', i)
if p > 0 then
t := s.substring (i, p - 1)
-- Skip eventual space
i := p + 1
from
until
i > n or not s[i].is_space
loop
i := i + 1
end
if i < n then
p := s.index_of ('=', i)
if p > 0 then
pn := s.substring (i, p - 1)
pv := s.substring (p + 1, n)
pv.right_adjust
if pv.count > 0 and pv [1] = '%"' then
if pv [pv.count] = '%"' then
pv := pv.substring (2, pv.count - 1)
else
has_error := True
-- missing closing double quote.
end
end
if not has_error then
set_parameter (pn, pv)
end
else
-- expecting: attribute "=" value
has_error := True
end
end
else
t := s.substring (i, n)
end
-- Remove eventual trailing space
t.right_adjust
-- Extract type and subtype
p := t.index_of ('/', 1)
if p = 0 then
has_error := True
type := t
subtype := ""
else
subtype := t.substring (p + 1, t.count)
type := t
t.keep_head (p - 1)
end
else
has_error := True
type := ""
subtype := type
end
ensure
not has_error implies (create {HTTP_CONTENT_TYPE}.make_from_content_type_header (string)).same_string (string)
end
feature -- Access
has_error: BOOLEAN
-- Current has error?
--| Mainly in relation with `make_from_content_type_header'
type: READABLE_STRING_8
-- Main type
subtype: READABLE_STRING_8
-- Sub type
has_parameter: BOOLEAN
-- Has Current a parameter?
do
Result := parameter_information /= Void
end
parameter (a_name: READABLE_STRING_8): detachable READABLE_STRING_8
-- Value for eventual parameter named `a_name'.
do
if has_parameter and then parameter_name.same_string (a_name) then
Result := parameter_value
end
end
parameter_name: READABLE_STRING_8
-- Parameter's name if any.
require
has_parameter: has_parameter
do
if attached parameter_information as l_info then
Result := l_info.name
else
Result := ""
check has_parameter: False end
end
end
parameter_value: READABLE_STRING_8
-- Parameter's value if any.
require
has_parameter: has_parameter
do
if attached parameter_information as l_info then
Result := l_info.value
else
Result := ""
check has_parameter: False end
end
end
feature -- Conversion
string: READABLE_STRING_8
-- String representation of type/subtype; attribute=value
local
res: like internal_string
do
res := internal_string
if res = Void then
create res.make_from_string (media_type)
if has_parameter then
res.append_character (';')
res.append_character (' ')
res.append (parameter_name)
res.append_character ('=')
res.append_character ('%"')
res.append (parameter_value)
res.append_character ('%"')
end
internal_string := res
end
Result := res
end
media_type: READABLE_STRING_8
-- String representation of type/subtype
local
res: like internal_media_type
s: like subtype
do
res := internal_media_type
if res = Void then
create res.make_from_string (type)
s := subtype
if not s.is_empty then
check has_error: has_error end
-- Just in case not is_valid, we keep in `type' the original string
res.append_character ('/')
res.append (s)
end
internal_media_type := res
end
Result := res
end
feature {NONE} -- Internal
internal_string: detachable STRING_8
internal_media_type: detachable STRING_8
feature -- Status report
same_as (other: HTTP_CONTENT_TYPE): BOOLEAN
do
Result := other.type.same_string (other.type) and then
other.subtype.same_string (other.subtype)
if Result then
Result := has_parameter = other.has_parameter
if has_parameter then
Result := parameter_name.same_string (other.parameter_name) and then
parameter_value.same_string (other.parameter_value)
end
end
end
same_media_type (s: READABLE_STRING_8): BOOLEAN
do
Result := media_type.same_string (s)
end
same_string (s: READABLE_STRING_8): BOOLEAN
do
Result := string.same_string (s)
end
feature -- Element change
set_parameter (a_name: like parameter_name; a_value: like parameter_value)
-- Set parameter for `a_name' to `a_value'
do
parameter_information := [a_name, a_value]
internal_string := Void
end
remove_parameter
-- Remove parameter
do
parameter_information := Void
internal_string := Void
end
feature {NONE} -- Implementation
parameter_information: detachable TUPLE [name: READABLE_STRING_8; value: READABLE_STRING_8]
feature -- Status report
debug_output: STRING
-- String that should be displayed in debugger to represent `Current'.
do
if type /= Void and subtype /= Void then
Result := type + "/" + subtype
if attached parameter_information as p_info then
Result.append ("; " + p_info.name + "=" + "%"" + p_info.value + "%"")
end
else
Result := ""
end
end
invariant
has_parameter implies parameter_name /= Void and parameter_value /= Void
type_and_subtype_not_empty: not has_error implies not type.is_empty and not subtype.is_empty
note note
copyright: "2011-2012, Jocelyn Fiat, Eiffel Software and others" copyright: "2011-2012, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"

343
library/protocol/http/src/http_media_type.e Normal file
View File

@@ -0,0 +1,343 @@
note
description: "[
This class is to represent a media type
the Internet Media Type [9] of the attached entity if the type
was provided via a "Content-type" field in the wgi_request header,
or if the server can determine it in the absence of a supplied
"Content-type" field. The syntax is the same as for the HTTP
"Content-Type" header field.
CONTENT_TYPE = "" | media-type
media-type = type "/" subtype *( ";" parameter)
type = token
subtype = token
parameter = attribute "=" value
attribute = token
value = token | quoted-string
The type, subtype, and parameter attribute names are not
case-sensitive. Parameter values MAY be case sensitive. Media
types and their use in HTTP are described in section 3.7 of
the HTTP/1.1 specification [8].
Example:
application/x-www-form-urlencoded
application/x-www-form-urlencoded; charset=UTF8
]"
date: "$Date$"
revision: "$Revision$"
class
HTTP_MEDIA_TYPE
inherit
DEBUG_OUTPUT
create
make,
make_from_string
convert
make_from_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8}),
string: {READABLE_STRING_8}
feature {NONE} -- Initialization
make (a_type, a_subtype: READABLE_STRING_8)
-- Create Current based on `a_type/a_subtype'
require
not a_type.is_empty
not a_subtype.is_empty
do
type := a_type
subtype := a_subtype
ensure
has_no_error: not has_error
end
make_from_string (s: READABLE_STRING_8)
-- Create Current from `s'
-- if `s' does not respect the expected syntax, has_error is True
local
t: STRING_8
i,n: INTEGER
p: INTEGER
do
-- Ignore starting space (should not be any)
from
i := 1
n := s.count
until
i > n or not s[i].is_space
loop
i := i + 1
end
if i < n then
-- Look for semi colon as parameter separation
p := s.index_of (';', i)
if p > 0 then
t := s.substring (i, p - 1)
i := p + 1
p := s.index_of (';', i)
if p = 0 then
add_parameter_from_string (s, i, n)
i := n
else
add_parameter_from_string (s, i, p - 1)
i := p + 1
end
else
t := s.substring (i, n)
end
-- Remove eventual trailing space
t.right_adjust
-- Extract type and subtype
p := t.index_of ('/', 1)
if p = 0 then
has_error := True
type := t
subtype := ""
else
subtype := t.substring (p + 1, t.count)
type := t
t.keep_head (p - 1)
end
else
has_error := True
type := ""
subtype := type
end
ensure
not has_error implies (create {HTTP_CONTENT_TYPE}.make_from_string (string)).same_string (string)
end
feature -- Access
has_error: BOOLEAN
-- Current has error?
--| Mainly in relation with `make_from_string'
type: READABLE_STRING_8
-- Main type
subtype: READABLE_STRING_8
-- Sub type
has_parameter (a_name: READABLE_STRING_8): BOOLEAN
-- Has Current a parameter?
do
if attached parameters as plst then
Result := plst.has (a_name)
end
end
parameter (a_name: READABLE_STRING_8): detachable READABLE_STRING_8
-- Value for eventual parameter named `a_name'.
do
if attached parameters as plst then
Result := plst.item (a_name)
end
end
parameters: detachable HASH_TABLE [READABLE_STRING_8, READABLE_STRING_8]
feature -- Conversion
string: READABLE_STRING_8
-- String representation of type/subtype; attribute=value
local
res: like internal_string
do
res := internal_string
if res = Void then
create res.make_from_string (simple_type)
if attached parameters as plst then
across
plst as p
loop
res.append_character (';')
res.append_character (' ')
res.append (p.key)
res.append_character ('=')
res.append_character ('%"')
res.append (p.item)
res.append_character ('%"')
end
end
internal_string := res
end
Result := res
end
simple_type: READABLE_STRING_8
-- String representation of type/subtype
local
res: like internal_simple_type
s: like subtype
do
res := internal_simple_type
if res = Void then
create res.make_from_string (type)
s := subtype
if not s.is_empty then
check has_error: has_error end
-- Just in case not is_valid, we keep in `type' the original string
res.append_character ('/')
res.append (s)
end
internal_simple_type := res
end
Result := res
end
feature {NONE} -- Internal
internal_string: detachable STRING_8
internal_simple_type: detachable STRING_8
feature -- Status report
same_as (other: HTTP_CONTENT_TYPE): BOOLEAN
local
plst,oplst: like parameters
do
Result := other.type.same_string (other.type) and then
other.subtype.same_string (other.subtype)
if Result then
plst := parameters
oplst := other.parameters
if plst = oplst then
elseif plst = Void then
Result := False -- since oplst /= Void
elseif oplst /= Void and then plst.count = oplst.count then
across
plst as p
until
not Result
loop
Result := attached oplst.item (p.key) as op_value and then p.item.same_string (op_value)
end
else
Result := False
end
end
end
same_media_type (s: READABLE_STRING_8): BOOLEAN
do
Result := simple_type.same_string (s)
end
same_string (s: READABLE_STRING_8): BOOLEAN
do
Result := string.same_string (s)
end
feature -- Element change
add_parameter (a_name: READABLE_STRING_8; a_value: READABLE_STRING_8)
-- Set parameter for `a_name' to `a_value'
local
plst: like parameters
do
plst := parameters
if plst = Void then
create plst.make (1)
parameters := plst
end
plst.force (a_value, a_name)
internal_string := Void
end
remove_parameter (a_name: READABLE_STRING_8)
-- Remove parameter
do
if attached parameters as plst then
plst.prune (a_name)
if plst.is_empty then
parameters := Void
end
end
internal_string := Void
end
feature {NONE} -- Implementation
add_parameter_from_string (s: READABLE_STRING_8; start_index, end_index: INTEGER)
local
pn,pv: STRING_8
i: INTEGER
p: INTEGER
err: BOOLEAN
do
-- Skip spaces
from
i := start_index
until
i > end_index or not s[i].is_space
loop
i := i + 1
end
if i < end_index then
p := s.index_of ('=', i)
if p > 0 and p < end_index then
pn := s.substring (i, p - 1)
pv := s.substring (p + 1, end_index)
pv.right_adjust
if pv.count > 0 and pv [1] = '%"' then
if pv [pv.count] = '%"' then
pv := pv.substring (2, pv.count - 1)
else
err := True
-- missing closing double quote.
end
end
if not err then
add_parameter (pn, pv)
end
else
-- expecting: attribute "=" value
err := True
end
end
has_error := has_error or err
end
feature -- Status report
debug_output: STRING
-- String that should be displayed in debugger to represent `Current'.
do
if type /= Void and subtype /= Void then
Result := type + "/" + subtype
if attached parameters as plst then
across
plst as p
loop
Result.append ("; " + p.key + "=" + "%"" + p.item + "%"")
end
end
else
Result := ""
end
end
invariant
type_and_subtype_not_empty: not has_error implies not type.is_empty and not subtype.is_empty
note
copyright: "2011-2012, Jocelyn Fiat, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
5949 Hollister Ave., Goleta, CA 93117 USA
Telephone 805-685-1006, Fax 805-685-6869
Website http://www.eiffel.com
Customer support http://support.eiffel.com
]"
end

2
library/server/wsf/src/mime/wsf_multipart_form_data_handler.e
View File

@@ -62,7 +62,7 @@ feature {NONE} -- Implementation: Form analyzer
is_crlf: BOOLEAN is_crlf: BOOLEAN
do do
l_boundary := a_content_type.parameter ("boundary") l_boundary := a_content_type.parameter ("boundary")
if l_boundary /= Void then if l_boundary /= Void and then not l_boundary.is_empty then
p := s.substring_index (l_boundary, 1) p := s.substring_index (l_boundary, 1)
if p > 1 then if p > 1 then
l_boundary_prefix := s.substring (1, p - 1) l_boundary_prefix := s.substring (1, p - 1)

6
library/server/wsf/tests/src/test_wsf_request_mime_handler.e
View File

@@ -48,8 +48,8 @@ feature -- Tests
["PATH_INFO", "/foo"] ["PATH_INFO", "/foo"]
>> >>
create ct.make_from_content_type_header ({HTTP_MIME_TYPES}.multipart_form_data) create ct.make_from_string ({HTTP_MIME_TYPES}.multipart_form_data)
ct.set_parameter ("boundary", "__=_the_boundary_1332296477_1804289383_=__") ct.add_parameter ("boundary", "__=_the_boundary_1332296477_1804289383_=__")
create h.make create h.make
h.put_content_type (ct) h.put_content_type (ct)
@@ -64,7 +64,7 @@ Content-Disposition: form-data; name="password"
EWFpassword EWFpassword
--__=_the_boundary_1332296477_1804289383_=__-- --__=_the_boundary_1332296477_1804289383_=__--
]" ]"
h.put_content_length (b.count) h.put_content_length (b.count)
--| Case #1 --| Case #1