hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Java: Refactor RsaWithoutOaep.

Browse Source
This commit is contained in:
Anders Schack-Mulligen
2023-03-15 10:37:54 +01:00
parent b3b5c2c767
commit 6408d7cbbe
3 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
java/ql/lib/semmle/code/java/security/RsaWithoutOaepQuery.qll
View File

@@ -4,8 +4,12 @@ import java
import Encryption
import semmle.code.java.dataflow.DataFlow
/** A configuration for finding RSA ciphers initialized without using OAEP padding. */
class RsaWithoutOaepConfig extends DataFlow::Configuration {
/**
* DEPRECATED: Use `RsaWithoutOaepFlow` instead.
*
* A configuration for finding RSA ciphers initialized without using OAEP padding.
*/
deprecated class RsaWithoutOaepConfig extends DataFlow::Configuration {
RsaWithoutOaepConfig() { this = "RsaWithoutOaepConfig" }
override predicate isSource(DataFlow::Node src) {
@@ -21,3 +25,21 @@ class RsaWithoutOaepConfig extends DataFlow::Configuration {
exists(CryptoAlgoSpec cr | sink.asExpr() = cr.getAlgoSpec())
}
}
private module RsaWithoutOaepConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) {
exists(CompileTimeConstantExpr specExpr, string spec |
specExpr.getStringValue() = spec and
specExpr = src.asExpr() and
spec.matches("RSA/%") and
not spec.matches("%OAEP%")
)
}
predicate isSink(DataFlow::Node sink) {
exists(CryptoAlgoSpec cr | sink.asExpr() = cr.getAlgoSpec())
}
}
/** Flow for finding RSA ciphers initialized without using OAEP padding. */
module RsaWithoutOaepFlow = DataFlow::Make<RsaWithoutOaepConfig>;

6
java/ql/src/Security/CWE/CWE-780/RsaWithoutOaep.ql
View File

@@ -12,9 +12,9 @@
import java
import semmle.code.java.security.RsaWithoutOaepQuery
import DataFlow::PathGraph
import RsaWithoutOaepFlow::PathGraph
from RsaWithoutOaepConfig conf, DataFlow::PathNode source, DataFlow::PathNode sink
where conf.hasFlowPath(source, sink)
from RsaWithoutOaepFlow::PathNode source, RsaWithoutOaepFlow::PathNode sink
where RsaWithoutOaepFlow::hasFlowPath(source, sink)
select source, source, sink, "This specification is used to $@ without OAEP padding.", sink,
"initialize an RSA cipher"

10
java/ql/test/query-tests/security/CWE-780/RsaWithoutOaepTest.ql
View File

@@ -3,12 +3,10 @@ import TestUtilities.InlineExpectationsTest
import TestUtilities.InlineFlowTest
import semmle.code.java.security.RsaWithoutOaepQuery
class EnableLegacy extends EnableLegacyConfiguration {
EnableLegacy() { exists(this) }
}
class HasFlowTest extends InlineFlowTest {
override DataFlow::Configuration getTaintFlowConfig() { result instanceof RsaWithoutOaepConfig }
override predicate hasValueFlow(DataFlow::Node src, DataFlow::Node sink) { none() }
override DataFlow::Configuration getValueFlowConfig() { none() }
override predicate hasTaintFlow(DataFlow::Node src, DataFlow::Node sink) {
RsaWithoutOaepFlow::hasFlow(src, sink)
}
}