hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 08:45:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow jax-rs path annotation inheritance

Browse Source
This commit is contained in:
Owen Mansel-Chan
2024-12-09 16:23:30 +00:00
parent de1b374e0e
commit 9cc614ac2d
7 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/ql/test/library-tests/frameworks/JaxWs/JakartaRs1.java
View File

@@ -156,12 +156,12 @@ class NotAResourceClass1Jakarta {
class NotAResourceClass2Jakarta {
}
class ExtendsJakartaRs1 extends JakartaRs1 {
class ExtendsJakartaRs1 extends JakartaRs1 { // $ RootResourceClass
@Override
int Get() { // $ ResourceMethod
return 1;
}
@Override
@QueryParam("") // $ InjectionAnnotation
void Post() {
@@ -189,12 +189,12 @@ class ExtendsJakartaRs1 extends JakartaRs1 {
}
@Produces(MediaType.TEXT_XML) // $ ProducesAnnotation=text/xml
class ExtendsJakartaRs1WithProducesAnnotation extends JakartaRs1 {
class ExtendsJakartaRs1WithProducesAnnotation extends JakartaRs1 { // Not a root resource class because it has a JAX-RS annotation
@Override
int Get() { // $ ResourceMethod=text/xml
return 2;
}
@Override
@QueryParam("") // $ InjectionAnnotation
void Post() {
@@ -212,4 +212,4 @@ class ExtendsJakartaRs1WithProducesAnnotation extends JakartaRs1 {
@Override
void Options() { // $ ResourceMethod=text/xml
}
}
}

4
java/ql/test/library-tests/frameworks/JaxWs/JakartaRs3.java
View File

@@ -24,7 +24,7 @@ import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.MessageBodyReader;
class ExtendsJakartaRs3 extends JakartaRs3 {
class ExtendsJakartaRs3 extends JakartaRs3 { // $ RootResourceClass
@Override
public int Get() { // $ ResourceMethod
return 1;
@@ -57,7 +57,7 @@ class ExtendsJakartaRs3 extends JakartaRs3 {
}
@Produces(MediaType.TEXT_XML) // $ ProducesAnnotation=text/xml
class ExtendsJakartaRs3WithProducesAnnotation extends JakartaRs3 {
class ExtendsJakartaRs3WithProducesAnnotation extends JakartaRs3 { // Not a root resource class because it has a JAX-RS annotation
@Override
public int Get() { // $ ResourceMethod=text/xml
return 2;

34
java/ql/test/library-tests/frameworks/JaxWs/JakartaRs4.java
View File

@@ -27,17 +27,17 @@ import jakarta.ws.rs.ext.MessageBodyReader;
// This is not a resource class because it doesn't have a @Path annotation.
// Note that inheritance of class or interface annotations is not supported in
// JAX-RS.
public class JakartaRs4 implements JakartaRsInterface {
public JakartaRs4() {
public class JakartaRs4 implements JakartaRsInterface { // $ RootResourceClass
public JakartaRs4() { // $ InjectableConstructor
}
@Override
public int Get() { // $ ResourceMethod
return 1;
public int Get() { // $ ResourceMethod ResourceMethodOnResourceClass
return 1; // $ XssSink
}
@Override
public void Post() { // $ ResourceMethod
public void Post() { // $ ResourceMethod ResourceMethodOnResourceClass
}
@Produces("application/json") // $ ProducesAnnotation=application/json
@@ -52,11 +52,11 @@ public class JakartaRs4 implements JakartaRsInterface {
}
@Override
public void Options() { // $ ResourceMethod
public void Options() { // $ ResourceMethod ResourceMethodOnResourceClass
}
@Override
public void Head() { // $ ResourceMethod
public void Head() { // $ ResourceMethod ResourceMethod ResourceMethodOnResourceClass
}
@@ -65,21 +65,21 @@ public class JakartaRs4 implements JakartaRsInterface {
return null;
}
public class NonRootResourceClassJakarta {
public class NonRootResourceClassJakarta { // $ NonRootResourceClass
@GET
int Get() { // $ ResourceMethod
return 0;
int Get() { // $ ResourceMethod ResourceMethodOnResourceClass
return 0; // $ XssSink
}
@Produces("text/html") // $ ProducesAnnotation=text/html
@POST
boolean Post() { // $ ResourceMethod=text/html
return false;
boolean Post() { // $ ResourceMethod=text/html ResourceMethodOnResourceClass
return false; // $ XssSink
}
@Produces(MediaType.TEXT_PLAIN) // $ ProducesAnnotation=text/plain
@DELETE
double Delete() { // $ ResourceMethod=text/plain
double Delete() { // $ ResourceMethod=text/plain ResourceMethodOnResourceClass
return 0.0;
}
@@ -90,13 +90,13 @@ public class JakartaRs4 implements JakartaRsInterface {
@GET
@Path("")
NotAResourceClass1Jakarta NotASubResourceLocator1() { // $ ResourceMethod
return null; //
NotAResourceClass1Jakarta NotASubResourceLocator1() { // $ ResourceMethod ResourceMethodOnResourceClass
return null; // $ XssSink
}
@GET
NotAResourceClass2Jakarta NotASubResourceLocator2() { // $ ResourceMethod
return null; //
NotAResourceClass2Jakarta NotASubResourceLocator2() { // $ ResourceMethod ResourceMethodOnResourceClass
return null; // $ XssSink
}
NotAResourceClass2Jakarta NotASubResourceLocator3() {

10
java/ql/test/library-tests/frameworks/JaxWs/JaxRs1.java
View File

@@ -156,12 +156,12 @@ class NotAResourceClass1 {
class NotAResourceClass2 {
}
class ExtendsJaxRs1 extends JaxRs1 {
class ExtendsJaxRs1 extends JaxRs1 { // $ RootResourceClass
@Override
int Get() { // $ ResourceMethod
return 1;
}
@Override
@QueryParam("") // $ InjectionAnnotation
void Post() {
@@ -189,12 +189,12 @@ class ExtendsJaxRs1 extends JaxRs1 {
}
@Produces(MediaType.TEXT_XML) // $ ProducesAnnotation=text/xml
class ExtendsJaxRs1WithProducesAnnotation extends JaxRs1 {
class ExtendsJaxRs1WithProducesAnnotation extends JaxRs1 { // Not a root resource class because it has a JAX-RS annotation
@Override
int Get() { // $ ResourceMethod=text/xml
return 2;
}
@Override
@QueryParam("") // $ InjectionAnnotation
void Post() {
@@ -212,4 +212,4 @@ class ExtendsJaxRs1WithProducesAnnotation extends JaxRs1 {
@Override
void Options() { // $ ResourceMethod=text/xml
}
}
}

4
java/ql/test/library-tests/frameworks/JaxWs/JaxRs3.java
View File

@@ -24,7 +24,7 @@ import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.MessageBodyReader;
class ExtendsJaxRs3 extends JaxRs3 {
class ExtendsJaxRs3 extends JaxRs3 { // $ RootResourceClass
@Override
public int Get() { // $ ResourceMethod
return 1;
@@ -57,7 +57,7 @@ class ExtendsJaxRs3 extends JaxRs3 {
}
@Produces(MediaType.TEXT_XML) // $ ProducesAnnotation=text/xml
class ExtendsJaxRs3WithProducesAnnotation extends JaxRs3 {
class ExtendsJaxRs3WithProducesAnnotation extends JaxRs3 { // Not a root resource class because it has a JAX-RS annotation
@Override
public int Get() { // $ ResourceMethod=text/xml
return 2;

34
java/ql/test/library-tests/frameworks/JaxWs/JaxRs4.java
View File

@@ -27,17 +27,17 @@ import javax.ws.rs.ext.MessageBodyReader;
// This is not a resource class because it doesn't have a @Path annotation.
// Note that inheritance of class or interface annotations is not supported in
// JAX-RS.
public class JaxRs4 implements JaxRsInterface {
public JaxRs4() {
public class JaxRs4 implements JaxRsInterface { // $ RootResourceClass
public JaxRs4() { // $ InjectableConstructor
}
@Override
public int Get() { // $ ResourceMethod
return 1;
public int Get() { // $ ResourceMethod ResourceMethodOnResourceClass
return 1; // $ XssSink
}
@Override
public void Post() { // $ ResourceMethod
public void Post() { // $ ResourceMethod ResourceMethodOnResourceClass
}
@Produces("application/json") // $ ProducesAnnotation=application/json
@@ -52,11 +52,11 @@ public class JaxRs4 implements JaxRsInterface {
}
@Override
public void Options() { // $ ResourceMethod
public void Options() { // $ ResourceMethod ResourceMethodOnResourceClass
}
@Override
public void Head() { // $ ResourceMethod
public void Head() { // $ ResourceMethod ResourceMethodOnResourceClass
}
@@ -65,21 +65,21 @@ public class JaxRs4 implements JaxRsInterface {
return null;
}
public class NonRootResourceClass {
public class NonRootResourceClass { // $ NonRootResourceClass
@GET
int Get() { // $ ResourceMethod
return 0;
int Get() { // $ ResourceMethod ResourceMethodOnResourceClass
return 0; // $ XssSink
}
@Produces("text/html") // $ ProducesAnnotation=text/html
@POST
boolean Post() { // $ ResourceMethod=text/html
return false;
boolean Post() { // $ ResourceMethod=text/html ResourceMethodOnResourceClass
return false; // $ XssSink
}
@Produces(MediaType.TEXT_PLAIN) // $ ProducesAnnotation=text/plain
@DELETE
double Delete() { // $ ResourceMethod=text/plain
double Delete() { // $ ResourceMethod=text/plain ResourceMethodOnResourceClass
return 0.0;
}
@@ -90,13 +90,13 @@ public class JaxRs4 implements JaxRsInterface {
@GET
@Path("")
NotAResourceClass1 NotASubResourceLocator1() { // $ ResourceMethod
return null; //
NotAResourceClass1 NotASubResourceLocator1() { // $ ResourceMethod ResourceMethodOnResourceClass
return null; // $ XssSink
}
@GET
NotAResourceClass2 NotASubResourceLocator2() { // $ ResourceMethod
return null; //
NotAResourceClass2 NotASubResourceLocator2() { // $ ResourceMethod ResourceMethodOnResourceClass
return null; // $ XssSink
}
NotAResourceClass2 NotASubResourceLocator3() {