Ruby: Simplify ActionMailbox modeling

This commit is contained in:
Harry Maclean
2022-11-25 17:21:51 +13:00
parent 71f2d8f6d8
commit b66ea6ed72
3 changed files with 19 additions and 31 deletions

View File

@@ -30,8 +30,8 @@ module ActionMailbox {
* `ActionMailbox::Base#mail`, which is equivalent. The returned object
* contains data from the incoming email.
*/
class MailCall extends DataFlow::CallNode, Mail::Message::Range {
MailCall() {
class Mail extends DataFlow::CallNode {
Mail() {
this =
[
controller().getAnInstanceSelf().getAMethodCall("inbound_email").getAMethodCall("mail"),
@@ -41,34 +41,21 @@ module ActionMailbox {
}
/**
* Models classes from the `mail` library.
* Version: 2.7.1.
* A method call on a `Mail::Message` object which may return data from a remote source.
*/
module Mail {
/**
* An instance of `Mail::Message`.
*/
class Message extends DataFlow::Node instanceof Message::Range { }
module Message {
abstract class Range extends DataFlow::Node { }
private class RemoteContent extends DataFlow::CallNode, RemoteFlowSource::Range {
RemoteContent() {
this =
any(Mail m)
.(DataFlow::LocalSourceNode)
.getAMethodCall([
"body", "to", "from", "raw_source", "subject", "from_address",
"recipients_addresses", "cc_addresses", "bcc_addresses", "in_reply_to",
"references", "reply_to", "raw_envelope", "to_s", "encoded", "header", "bcc", "cc",
"text_part", "html_part"
])
}
/**
* A method call on a `Mail::Message` object which may return data from a remote source.
*/
class RemoteContent extends DataFlow::CallNode, RemoteFlowSource::Range {
RemoteContent() {
this.getReceiver() instanceof Message and
this.getMethodName() =
[
"body", "to", "from", "raw_source", "subject", "from_address", "recipients_addresses",
"cc_addresses", "bcc_addresses", "in_reply_to", "references", "reply_to",
"raw_envelope", "to_s", "encoded", "header", "bcc", "cc", "text_part", "html_part"
]
}
override string getSourceType() { result = "ActionMailbox" }
}
override string getSourceType() { result = "ActionMailbox" }
}
}

View File

@@ -7,7 +7,7 @@ messageInstances
| action_mailbox.rb:6:5:6:10 | call to mail |
| action_mailbox.rb:10:5:10:8 | call to mail |
| action_mailbox.rb:16:9:16:12 | call to mail |
remoteContent
remoteFlowSources
| action_mailbox.rb:3:5:3:13 | call to body |
| action_mailbox.rb:4:5:4:11 | call to to |
| action_mailbox.rb:6:5:6:13 | call to to |

View File

@@ -1,8 +1,9 @@
private import codeql.ruby.frameworks.ActionMailbox
private import codeql.ruby.DataFlow
private import codeql.ruby.dataflow.RemoteFlowSources
query predicate processMethods(ActionMailbox::Process p) { any() }
query predicate messageInstances(ActionMailbox::Mail::Message c) { any() }
query predicate messageInstances(ActionMailbox::Mail c) { any() }
query predicate remoteContent(ActionMailbox::Mail::RemoteContent r) { any() }
query predicate remoteFlowSources(RemoteFlowSource r) { any() }