Skip to content

Commit 358617f

Browse files
committed
Move CORS misconfiguration query from experimental to Security
1 parent 6c00cea commit 358617f

File tree

13 files changed

+12
-11
lines changed

13 files changed

+12
-11
lines changed

javascript/ql/src/experimental/Security/CWE-942/Apollo.qll renamed to javascript/ql/lib/semmle/javascript/frameworks/Apollo.qll

File renamed without changes.

javascript/ql/src/experimental/Security/CWE-942/Cors.qll renamed to javascript/ql/lib/semmle/javascript/frameworks/Cors.qll

File renamed without changes.

javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationCustomizations.qll renamed to javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
import javascript
8-
import Cors::Cors
9-
import Apollo::Apollo
8+
private import semmle.javascript.frameworks.Apollo
9+
private import semmle.javascript.frameworks.Cors
1010

1111
/** Module containing sources, sinks, and sanitizers for overly permissive CORS configurations. */
1212
module CorsPermissiveConfiguration {
@@ -105,7 +105,7 @@ module CorsPermissiveConfiguration {
105105
*/
106106
class CorsApolloServer extends Sink, DataFlow::ValueNode {
107107
CorsApolloServer() {
108-
exists(ApolloServer agql |
108+
exists(Apollo::ApolloServer agql |
109109
this =
110110
agql.getOptionArgument(0, "cors").getALocalSource().getAPropertyWrite("origin").getRhs()
111111
)
@@ -125,7 +125,7 @@ module CorsPermissiveConfiguration {
125125
* An express route setup configured with the `cors` package.
126126
*/
127127
class CorsConfiguration extends DataFlow::MethodCallNode {
128-
Cors corsConfig;
128+
Cors::Cors corsConfig;
129129

130130
CorsConfiguration() {
131131
exists(Express::RouteSetup setup | this = setup |
@@ -136,6 +136,6 @@ module CorsPermissiveConfiguration {
136136
}
137137

138138
/** Gets the expression that configures `cors` on this route setup. */
139-
Cors getCorsConfiguration() { result = corsConfig }
139+
Cors::Cors getCorsConfiguration() { result = corsConfig }
140140
}
141141
}

javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfigurationQuery.qll renamed to javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationQuery.qll

File renamed without changes.

javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.qhelp renamed to javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.qhelp

File renamed without changes.

javascript/ql/src/experimental/Security/CWE-942/CorsPermissiveConfiguration.ql renamed to javascript/ql/src/Security/CWE-942/CorsPermissiveConfiguration.ql

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @name overly CORS configuration
2+
* @name Permissive CORS configuration
33
* @description Misconfiguration of CORS HTTP headers allows CSRF attacks.
44
* @kind path-problem
55
* @problem.severity error
@@ -11,11 +11,12 @@
1111
*/
1212

1313
import javascript
14-
import CorsPermissiveConfigurationQuery
15-
import CorsPermissiveConfigurationFlow::PathGraph
14+
import semmle.javascript.security.CorsPermissiveConfigurationQuery as CorsQuery
15+
import CorsQuery::CorsPermissiveConfigurationFlow::PathGraph
1616

1717
from
18-
CorsPermissiveConfigurationFlow::PathNode source, CorsPermissiveConfigurationFlow::PathNode sink
19-
where CorsPermissiveConfigurationFlow::flowPath(source, sink)
18+
CorsQuery::CorsPermissiveConfigurationFlow::PathNode source,
19+
CorsQuery::CorsPermissiveConfigurationFlow::PathNode sink
20+
where CorsQuery::CorsPermissiveConfigurationFlow::flowPath(source, sink)
2021
select sink.getNode(), source, sink, "CORS Origin misconfiguration due to a $@.", source.getNode(),
2122
"too permissive or user controlled value"

javascript/ql/src/experimental/Security/CWE-942/examples/CorsPermissiveConfigurationBad.js renamed to javascript/ql/src/Security/CWE-942/examples/CorsPermissiveConfigurationBad.js

File renamed without changes.

javascript/ql/src/experimental/Security/CWE-942/examples/CorsPermissiveConfigurationGood.js renamed to javascript/ql/src/Security/CWE-942/examples/CorsPermissiveConfigurationGood.js

File renamed without changes.

javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.qlref

Lines changed: 0 additions & 1 deletion
This file was deleted.

javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected renamed to javascript/ql/test/query-tests/Security/CWE-942/CorsPermissiveConfiguration.expected

File renamed without changes.

0 commit comments

Comments
 (0)