Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ def deserialize_path_params(raw_params)
# @param [Hash] raw_headers Raw headers
# @return [Hash] Deserialized headers according to OpenAPI schema
def deserialize_headers(raw_headers)
return raw_headers if raw_headers.nil? || raw_headers.empty?

raw_headers = raw_headers.transform_keys do |name|
@parameters.find { |param| param.in == 'header' && param.name.casecmp?(name.to_s) }&.name || name
end
deserialize_params_by_location(raw_headers, 'header')
end

Expand Down
16 changes: 16 additions & 0 deletions test/middleware/request_validation_open_api_3_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,22 @@ def app
end
end

it 'deserializes header arrays regardless of the case used in the schema' do
parameter = { 'name' => 'X-Ids', 'in' => 'header', 'required' => true, 'schema' => { 'type' => 'array', 'items' => { 'type' => 'integer' } }, }
check_parameter = lambda { |env|
assert_equal [1, 2], env['committee.headers']['X-Ids']
refute env['committee.headers'].key?('X-IDS')
assert_equal '1,2', env['HTTP_X_IDS']
[200, {}, []]
}
@app = new_rack_app_with_lambda(check_parameter, schema: query_param_schema(parameter))

header 'X-Ids', '1,2'
get '/events'

assert_equal 200, last_response.status
end

describe ':accept_request_filter' do
[
{ description: 'when not specified, includes everything', accept_request_filter: nil, expected: { status: 400 } },
Expand Down
11 changes: 11 additions & 0 deletions test/schema_validator/open_api_3/parameter_deserializer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,17 @@
assert_equal({ 'X-Filter' => { 'role' => 'admin', 'status' => 'active' } }, result)
end

it 'matches header names without regard to case' do
raw_headers = { 'x-filter' => 'role,admin,status,active', 'X-Other' => 'untouched' }
param = create_param('X-Filter', 'header', 'simple', false, 'object', { 'role' => 'string', 'status' => 'string' })
deserializer = create_deserializer([param])

result = deserializer.deserialize_headers(raw_headers)

assert_equal({ 'X-Filter' => { 'role' => 'admin', 'status' => 'active' }, 'X-Other' => 'untouched' }, result)
assert_equal 'role,admin,status,active', raw_headers['x-filter']
end

it 'handles empty params gracefully' do
raw_params = {}
param = create_param('filter', 'query', 'form', true, 'object', { 'role' => 'string' })
Expand Down
Loading