hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-01 03:35:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Python: Fix bad join

Browse Source 
Also fixed up the QLDoc
This commit is contained in:
Rasmus Lerchedahl Petersen
2021-04-20 18:54:03 +02:00
parent 9c893cb0f4
commit fc2c62350e
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/ql/src/Security/CWE-327/PyOpenSSL.qll
View File

@@ -16,7 +16,9 @@ class PyOpenSSLContextCreation extends ContextCreation, DataFlow::CallCfgNode {
exists(ControlFlowNode protocolArg, PyOpenSSL pyo |
protocolArg in [node.getArg(0), node.getArgByName("method")]
|
protocolArg = [pyo.specific_version(result), pyo.unspecific_version(result)].asCfgNode()
protocolArg =
[pyo.specific_version(result).getAUse(), pyo.unspecific_version(result).getAUse()]
.asCfgNode()
)
}
}

6
python/ql/src/Security/CWE-327/Ssl.qll
View File

@@ -14,7 +14,9 @@ class SSLContextCreation extends ContextCreation, DataFlow::CallCfgNode {
exists(ControlFlowNode protocolArg, Ssl ssl |
protocolArg in [node.getArg(0), node.getArgByName("protocol")]
|
protocolArg = [ssl.specific_version(result), ssl.unspecific_version(result)].asCfgNode()
protocolArg =
[ssl.specific_version(result).getAUse(), ssl.unspecific_version(result).getAUse()]
.asCfgNode()
)
or
not exists(node.getAnArg()) and
@@ -188,7 +190,7 @@ class Ssl extends TlsLibrary {
override DataFlow::CallCfgNode insecure_connection_creation(ProtocolVersion version) {
result = API::moduleImport("ssl").getMember("wrap_socket").getACall() and
this.specific_version(version) = result.getArgByName("ssl_version") and
this.specific_version(version).getAUse() = result.getArgByName("ssl_version") and
version.isInsecure()
}

28
python/ql/src/Security/CWE-327/TlsLibraryModel.qll
View File

@@ -91,26 +91,26 @@ abstract class TlsLibrary extends string {
/** Gets a name, which is a member of `version_constants`, that can be used to specify the protocol family `family`. */
abstract string unspecific_version_name(ProtocolFamily family);
/** The module or class holding the version constants. */
/** Gets an API node representing the module or class holding the version constants. */
abstract API::Node version_constants();
/** A dataflow node representing a specific protocol version. */
DataFlow::Node specific_version(ProtocolVersion version) {
result = version_constants().getMember(specific_version_name(version)).getAUse()
/** Gets an API node representing a specific protocol version. */
API::Node specific_version(ProtocolVersion version) {
result = version_constants().getMember(specific_version_name(version))
}
/** Gets a dataflow node representing the protocol family `family`. */
DataFlow::Node unspecific_version(ProtocolFamily family) {
result = version_constants().getMember(unspecific_version_name(family)).getAUse()
/** Gets an API node representing the protocol family `family`. */
API::Node unspecific_version(ProtocolFamily family) {
result = version_constants().getMember(unspecific_version_name(family))
}
/** The creation of a context with a default protocol. */
/** Gets a creation of a context with a default protocol. */
abstract ContextCreation default_context_creation();
/** The creation of a context with a specific protocol. */
/** Gets a creation of a context with a specific protocol. */
abstract ContextCreation specific_context_creation();
/** The creation of a context with a specific protocol version, known to be insecure. */
/** Gets a creation of a context with a specific protocol version, known to be insecure. */
ContextCreation insecure_context_creation(ProtocolVersion version) {
result in [specific_context_creation(), default_context_creation()] and
result.getProtocol() = version and
@@ -123,15 +123,15 @@ abstract class TlsLibrary extends string {
result.getProtocol() = family
}
/** A connection is created in an insecure manner, not from a context. */
/** Gets a dataflow node representing a connection being created in an insecure manner, not from a context. */
abstract DataFlow::Node insecure_connection_creation(ProtocolVersion version);
/** A connection is created from a context. */
/** Gets a dataflow node representing a connection being created from a context. */
abstract ConnectionCreation connection_creation();
/** A context is being restricted on which protocols it can accepts. */
/** Gets a dataflow node representing a context being restricted on which protocols it can accepts. */
abstract ProtocolRestriction protocol_restriction();
/** A context is being relaxed on which protocols it can accepts. */
/** Gets a dataflow node representing a context being relaxed on which protocols it can accepts. */
abstract ProtocolUnrestriction protocol_unrestriction();
}