From fef2932f56f662ba575daf04a2a4e50017f6b69a Mon Sep 17 00:00:00 2001 From: Alex Ford Date: Thu, 26 Oct 2023 17:04:51 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Harry Maclean --- ruby/ql/src/queries/modeling/internal/Summaries.qll | 4 ++-- ruby/ql/src/queries/modeling/internal/Types.qll | 2 +- ruby/scripts/generate_model.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ruby/ql/src/queries/modeling/internal/Summaries.qll b/ruby/ql/src/queries/modeling/internal/Summaries.qll index f793103dd2c..6d1d265cab2 100644 --- a/ruby/ql/src/queries/modeling/internal/Summaries.qll +++ b/ruby/ql/src/queries/modeling/internal/Summaries.qll @@ -31,7 +31,7 @@ module Summaries { predicate summaryModel(string type, string path, string input, string output) { exists(DataFlow::MethodNode methodNode, API::Node paramNode | methodNode.getLocation().getFile() instanceof Util::RelevantFile and - paramNode.getAValueReachableFromSource() = methodNode.getAReturnNode() and + flow(paramNode.asSource(), methodNode.getAReturnNode()) and paramNode = getAnyParameterNode(methodNode) | Util::pathToMethod(methodNode, type, path) and @@ -59,7 +59,7 @@ module Summaries { } /** - * Holds if calls to `(type, path)`, the value referred to by `input` + * Holds if in calls to `(type, path)`, the value referred to by `input` * can flow to the value referred to by `output`. * * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving steps, diff --git a/ruby/ql/src/queries/modeling/internal/Types.qll b/ruby/ql/src/queries/modeling/internal/Types.qll index f29d0eda454..6f83f2f524b 100644 --- a/ruby/ql/src/queries/modeling/internal/Types.qll +++ b/ruby/ql/src/queries/modeling/internal/Types.qll @@ -13,7 +13,7 @@ private import Util as Util */ module Types { /** - * Holds `node` should be seen as having the given `type`. + * Holds if `node` should be seen as having the given `type`. */ private predicate valueHasTypeName(DataFlow::LocalSourceNode node, string type) { node.getLocation().getFile() instanceof Util::RelevantFile and diff --git a/ruby/scripts/generate_model.py b/ruby/scripts/generate_model.py index 6361ebe3a0c..c418a5f8134 100755 --- a/ruby/scripts/generate_model.py +++ b/ruby/scripts/generate_model.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # This script generates a data extensions model for a given library in codeql database form # Currently only typeModels and summaryModels are generated @@ -37,7 +37,7 @@ def parse_args(): "-w", "--overwrite", action="store_true", - help="if provided, use this command to invoke codeql", + help="if provided, overwrite the file if it already exists", ) return parser.parse_args()