Commit 4db8ea3

authored

Add graphql.server.resolver to known WAF addresses (DataDog#6350)

1 parent 1878db6 commit 4db8ea3Copy full SHA for 4db8ea3

File tree

-1

lines changed

dd-java-agent/appsec/src
- main/java/com/datadog/appsec/event/data
  - KnownAddresses.java
- test/groovy/com/datadog/appsec/event/data
  - KnownAddressesSpecification.groovy

-1

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ public interface KnownAddresses {`
`101`	`101`	`// XXX: Not really used yet, but it's a known address and we should not treat it as unknown.`
`102`	`102`	`Address<Object> GRAPHQL_SERVER_ALL_RESOLVERS = new Address<>("graphql.server.all_resolvers");`
`103`	`103`
	`104`	`+ // XXX: Not really used yet, but it's a known address and we should not treat it as unknown.`
	`105`	`+ Address<Object> GRAPHQL_SERVER_RESOLVER = new Address<>("graphql.server.resolver");`
	`106`	`+`
`104`	`107`	`Address<String> USER_ID = new Address<>("usr.id");`
`105`	`108`
`106`	`109`	`Address<Map<String, Object>> WAF_CONTEXT_PROCESSOR = new Address<>("waf.context.processor");`
`@@ -153,6 +156,8 @@ static Address<?> forName(String name) {`
`153`	`156`	`return GRPC_SERVER_REQUEST_METADATA;`
`154`	`157`	`case "graphql.server.all_resolvers":`
`155`	`158`	`return GRAPHQL_SERVER_ALL_RESOLVERS;`
	`159`	`+ case "graphql.server.resolver":`
	`160`	`+ return GRAPHQL_SERVER_RESOLVER;`
`156`	`161`	`case "usr.id":`
`157`	`162`	`return USER_ID;`
`158`	`163`	`case "waf.context.processor":`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,15 @@ class KnownAddressesSpecification extends Specification {`
`31`	`31`	`'grpc.server.request.message',`
`32`	`32`	`'grpc.server.request.metadata',`
`33`	`33`	`'graphql.server.all_resolvers',`
	`34`	`+ 'graphql.server.resolver',`
`34`	`35`	`'usr.id',`
`35`	`36`	`'waf.context.processor',`
`36`	`37`	`]`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`void 'number of known addresses is expected number'() {`
`40`	`41`	`expect:`
`41`		`- Address.instanceCount() == 25`
	`42`	`+ Address.instanceCount() == 26`
`42`	`43`	`KnownAddresses.WAF_CONTEXT_PROCESSOR.serial == Address.instanceCount() - 1`
`43`	`44`	`}`
`44`	`45`	`}`

Comments

(0)