Unverified Commit 4beac5f1 authored by Dj's avatar Dj Committed by GitHub
Browse files

Allow expected content-type to ignore parameters (#3724) 

Fixes: #3471

## Motivation and Context
An issue was raised about a mobile client that appends "; charset=utf-8"
to the Content-Type when using restJson1. The [latest
RFC](https://www.rfc-editor.org/rfc/rfc8259) for "application/json" does
not register a charset parameter, but indicates it is reasonable to
accept it.

## Description
This change loosens the validation of the expected content type to allow
all parameters.

## Testing
* Tests for each protocol were added to
[smithy](https://github.com/smithy-lang/smithy/pull/2296)
* ran the runtime and codegen tests
* Added test for rest-xml, as smithy-rs does not currently run the
smithy tests.

## Checklist
<!--- If a checkbox below is not applicable, then please DELETE it
rather than leaving it unchecked -->
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the
smithy-rs codegen or runtime crates
- [x] I have updated `CHANGELOG.next.toml` if I made changes to the AWS
SDK, generated SDK code, or SDK runtime crates

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._
parent 5498a180

CHANGELOG.next.toml

+8 −0
Original line number Diff line number Diff line
@@ -15,3 +15,11 @@ message = "A feature, `aws-lambda`, has been added to generated SDKs to re-expor 
references = ["smithy-rs#3643"]

meta = { "breaking" = false, "bug" = true, "tada" = false, "target" = "server" }

author = "drganjoo"



[[smithy-rs]]

message = """

Content-Type header validation now ignores parameter portion of media types.

"""

references = ["smithy-rs#3471","smithy-rs#3724"]

meta = { "breaking" = false, "tada" = false, "bug" = true, target = "server" }

authors = ["djedward"]

codegen-core/common-test-models/rest-xml-extras.smithy

0 → 100644
+53 −0
Original line number Diff line number Diff line 
$version: "2.0"



namespace aws.protocoltests.restxml



use aws.api#service

use aws.protocols#restXml

use smithy.test#httpRequestTests



/// A REST XML service that sends XML requests and responses.

@service(sdkId: "Rest Xml Protocol")

@restXml

@title("Sample Rest Xml Protocol Service")

service RestXmlExtras {

	version: "2024-04-15",

	operations: [

		ContentTypeParameters

	]

}



/// The example tests how servers must support requests

/// containing a `Content-Type` header with parameters.

@http(uri: "/ContentTypeParameters", method: "PUT")

operation ContentTypeParameters {

	input: ContentTypeParametersInput,

	output: ContentTypeParametersOutput

}



apply ContentTypeParameters @httpRequestTests([

	{

		id: "RestXmlMustSupportParametersInContentType",

		documentation: "A server should ignore parameters added to the content type",

		protocol: restXml,

		method: "PUT",

		headers: {

			"Content-Type": "application/xml; charset=utf-8"

		},

		uri: "/ContentTypeParameters",

		body: "<ContentTypeParametersInput><value>5</value></ContentTypeParametersInput>",

		bodyMediaType: "application/xml",

		params: {

			value: 5,

		},

		appliesTo: "server"

	}

])



@input

structure ContentTypeParametersInput {

	value: Integer,

}



@output

structure ContentTypeParametersOutput {}

codegen-server-test/build.gradle.kts

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ val allCodegenTests = "../codegen-core/common-test-models".let { commonModels -> 
            "pokemon-service-awsjson-server-sdk",

            imports = listOf("$commonModels/pokemon-awsjson.smithy", "$commonModels/pokemon-common.smithy"),

        ),

        CodegenTest(

            "aws.protocoltests.restxml#RestXmlExtras",

            "rest_xml_extras",

            imports = listOf("$commonModels/rest-xml-extras.smithy"),

        ),

    )

}

rust-runtime/Cargo.lock

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ version = "0.60.3" 


[[package]]

name = "aws-smithy-http-server"

version = "0.62.0"

version = "0.62.1"

dependencies = [

 "aws-smithy-http 0.60.9",

 "aws-smithy-json 0.60.7",

rust-runtime/aws-smithy-http-server/Cargo.toml

+2 −2
Original line number Diff line number Diff line 
[package]

name = "aws-smithy-http-server"

version = "0.62.0"

version = "0.62.1"

authors = ["Smithy Rust Server <smithy-rs-server@amazon.com>"]

edition = "2021"

license = "Apache-2.0"
@@ -29,7 +29,7 @@ http = "0.2" 
http-body = "0.4"

hyper = { version = "0.14.26", features = ["server", "http1", "http2", "tcp", "stream"] }

lambda_http = { version = "0.8.0", optional = true }

mime = "0.3.4"

mime = "0.3.17"

nom = "7"

once_cell = "1.13"

pin-project-lite = "0.2"