MIME type -> content type

smowton · owen-mc · commit 9335e095a92b · 2021-06-08T15:05:28.000+01:00
This matches the terminology used elsewhere
diff --git a/java/ql/src/semmle/code/java/frameworks/JaxWS.qll b/java/ql/src/semmle/code/java/frameworks/JaxWS.qll
@@ -255,19 +255,19 @@ class MessageBodyReaderRead extends Method {
   }
 }
 
-/** An `@Produces` annotation that describes which MIME types can be produced by this resource. */
+/** An `@Produces` annotation that describes which content types can be produced by this resource. */
 class JaxRSProducesAnnotation extends JaxRSAnnotation {
   JaxRSProducesAnnotation() { getType().hasQualifiedName("javax.ws.rs", "Produces") }
 
   /**
-   * Gets a declared MIME type that can be produced by this resource.
+   * Gets a declared content type that can be produced by this resource.
    */
-  string getADeclaredMimeType() {
+  string getADeclaredContentType() {
     result = getAValue().(CompileTimeConstantExpr).getStringValue()
     or
     exists(Field jaxMediaType |
       // Accesses to static fields on `MediaType` class do not have constant strings in the database
-      // so convert the field name to a mime type string
+      // so convert the field name to a content type string
       jaxMediaType.getDeclaringType().hasQualifiedName("javax.ws.rs.core", "MediaType") and
       jaxMediaType.getAnAccess() = getAValue() and
       // e.g. MediaType.TEXT_PLAIN => text/plain
@@ -276,7 +276,7 @@ class JaxRSProducesAnnotation extends JaxRSAnnotation {
   }
 }
 
-/** An `@Consumes` annotation that describes MIME types can be consumed by this resource. */
+/** An `@Consumes` annotation that describes content types can be consumed by this resource. */
 class JaxRSConsumesAnnotation extends JaxRSAnnotation {
   JaxRSConsumesAnnotation() { getType().hasQualifiedName("javax.ws.rs", "Consumes") }
 }
diff --git a/java/ql/src/semmle/code/java/security/XSS.qll b/java/ql/src/semmle/code/java/security/XSS.qll
@@ -102,7 +102,7 @@ private class DefaultXssSink extends XssSink {
     |
       not exists(resourceMethod.getProducesAnnotation())
       or
-      resourceMethod.getProducesAnnotation().getADeclaredMimeType() = "text/plain"
+      resourceMethod.getProducesAnnotation().getADeclaredContentType() = "text/plain"
     )
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -255,19 +255,19 @@ class MessageBodyReaderRead extends Method {`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
`258`		-/** An `@Produces` annotation that describes which MIME types can be produced by this resource. */
	`258`	+/** An `@Produces` annotation that describes which content types can be produced by this resource. */
`259`	`259`	`class JaxRSProducesAnnotation extends JaxRSAnnotation {`
`260`	`260`	`JaxRSProducesAnnotation() { getType().hasQualifiedName("javax.ws.rs", "Produces") }`
`261`	`261`
`262`	`262`	`/**`
`263`		`- * Gets a declared MIME type that can be produced by this resource.`
	`263`	`+ * Gets a declared content type that can be produced by this resource.`
`264`	`264`	`*/`
`265`		`- string getADeclaredMimeType() {`
	`265`	`+ string getADeclaredContentType() {`
`266`	`266`	`result = getAValue().(CompileTimeConstantExpr).getStringValue()`
`267`	`267`	`or`
`268`	`268`	`exists(Field jaxMediaType \|`
`269`	`269`	// Accesses to static fields on `MediaType` class do not have constant strings in the database
`270`		`- // so convert the field name to a mime type string`
	`270`	`+ // so convert the field name to a content type string`
`271`	`271`	`jaxMediaType.getDeclaringType().hasQualifiedName("javax.ws.rs.core", "MediaType") and`
`272`	`272`	`jaxMediaType.getAnAccess() = getAValue() and`
`273`	`273`	`// e.g. MediaType.TEXT_PLAIN => text/plain`
`@@ -276,7 +276,7 @@ class JaxRSProducesAnnotation extends JaxRSAnnotation {`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
`279`		-/** An `@Consumes` annotation that describes MIME types can be consumed by this resource. */
	`279`	+/** An `@Consumes` annotation that describes content types can be consumed by this resource. */
`280`	`280`	`class JaxRSConsumesAnnotation extends JaxRSAnnotation {`
`281`	`281`	`JaxRSConsumesAnnotation() { getType().hasQualifiedName("javax.ws.rs", "Consumes") }`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private class DefaultXssSink extends XssSink {`
`102`	`102`	`\|`
`103`	`103`	`not exists(resourceMethod.getProducesAnnotation())`
`104`	`104`	`or`
`105`		`- resourceMethod.getProducesAnnotation().getADeclaredMimeType() = "text/plain"`
	`105`	`+ resourceMethod.getProducesAnnotation().getADeclaredContentType() = "text/plain"`
`106`	`106`	`)`
`107`	`107`	`}`
`108`	`108`	`}`