Fix merge conflicts during rebase

This commit is contained in:
Arthur Baars
2021-08-11 16:17:09 +02:00
committed by Dave Bartolomeo
parent 0afcb9cc86
commit ac2c315839
115 changed files with 232 additions and 232 deletions

View File

@@ -1,9 +1,9 @@
private import codeql_ruby.AST
private import codeql_ruby.Concepts
private import codeql_ruby.controlflow.CfgNodes
private import codeql_ruby.DataFlow
private import codeql_ruby.dataflow.RemoteFlowSources
private import codeql_ruby.ast.internal.Module
private import codeql.ruby.AST
private import codeql.ruby.Concepts
private import codeql.ruby.controlflow.CfgNodes
private import codeql.ruby.DataFlow
private import codeql.ruby.dataflow.RemoteFlowSources
private import codeql.ruby.ast.internal.Module
private import ActionController
predicate inActionViewContext(AstNode n) {

View File

@@ -11,7 +11,7 @@
// This is an implementation of the Rubocop rule
// https://github.com/rubocop/rubocop-performance/blob/master/lib/rubocop/cop/performance/detect.rb
import ruby
import codeql_ruby.dataflow.SSA
import codeql.ruby.dataflow.SSA
/** A call that extracts the first or last element of a list. */
class EndCall extends MethodCall {

View File

@@ -8,7 +8,7 @@
*/
import codeql.IDEContextual
import codeql_ruby.AST
import codeql.ruby.AST
external string selectedSourceFile();

View File

@@ -8,8 +8,8 @@
*/
import codeql.IDEContextual
import codeql_ruby.AST
import codeql_ruby.ast.Variable
import codeql.ruby.AST
import codeql.ruby.ast.Variable
external string selectedSourceFile();

View File

@@ -8,8 +8,8 @@
*/
private import codeql.IDEContextual
private import codeql_ruby.AST
private import codeql_ruby.printAst
private import codeql.ruby.AST
private import codeql.ruby.printAst
/**
* The source file to generate an AST from.

View File

@@ -6,7 +6,7 @@
*/
import ruby
import codeql_ruby.Diagnostics
import codeql.ruby.Diagnostics
/** Gets the SARIF severity to associate an error. */
int getSeverity() { result = 2 }

View File

@@ -7,7 +7,7 @@
*/
import ruby
import codeql_ruby.Diagnostics
import codeql.ruby.Diagnostics
from File f
where

View File

@@ -13,11 +13,11 @@
*/
import ruby
import codeql_ruby.Concepts
import codeql_ruby.DataFlow
import codeql_ruby.dataflow.BarrierGuards
import codeql_ruby.dataflow.RemoteFlowSources
import codeql_ruby.TaintTracking
import codeql.ruby.Concepts
import codeql.ruby.DataFlow
import codeql.ruby.dataflow.BarrierGuards
import codeql.ruby.dataflow.RemoteFlowSources
import codeql.ruby.TaintTracking
import DataFlow::PathGraph
class SQLInjectionConfiguration extends TaintTracking::Configuration {

View File

@@ -14,9 +14,9 @@
* external/cwe/cwe-400
*/
import codeql_ruby.regexp.ExponentialBackTracking
import codeql_ruby.regexp.ReDoSUtil
import codeql_ruby.regexp.RegExpTreeView
import codeql.ruby.regexp.ExponentialBackTracking
import codeql.ruby.regexp.ReDoSUtil
import codeql.ruby.regexp.RegExpTreeView
from RegExpTerm t, string pump, State s, string prefixMsg
where hasReDoSResult(t, pump, s, prefixMsg)

View File

@@ -11,9 +11,9 @@
*/
import ruby
import codeql_ruby.DataFlow
import codeql.ruby.DataFlow
import DataFlow::PathGraph
import codeql_ruby.ApiGraphs
import codeql.ruby.ApiGraphs
bindingset[p]
int world_permission(int p) { result = p.bitAnd(7) }

View File

@@ -13,10 +13,10 @@
*/
import ruby
import codeql_ruby.DataFlow
import codeql.ruby.DataFlow
import DataFlow::PathGraph
import codeql_ruby.TaintTracking
import codeql_ruby.controlflow.CfgNodes
import codeql.ruby.TaintTracking
import codeql.ruby.controlflow.CfgNodes
bindingset[char, fraction]
predicate fewer_characters_than(StringLiteral str, string char, float fraction) {

View File

@@ -8,7 +8,7 @@
*/
import ruby
import codeql_ruby.Diagnostics
import codeql.ruby.Diagnostics
select count(File f |
exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())

View File

@@ -8,7 +8,7 @@
*/
import ruby
import codeql_ruby.Diagnostics
import codeql.ruby.Diagnostics
select count(File f |
not exists(ExtractionError e | e.getLocation().getFile() = f) and exists(f.getRelativePath())

View File

@@ -11,7 +11,7 @@
*/
import ruby
import codeql_ruby.dataflow.SSA
import codeql.ruby.dataflow.SSA
class RelevantLocalVariableWriteAccess extends LocalVariableWriteAccess {
RelevantLocalVariableWriteAccess() {

View File

@@ -11,7 +11,7 @@
*/
import ruby
import codeql_ruby.dataflow.SSA
import codeql.ruby.dataflow.SSA
class RelevantLocalVariableReadAccess extends LocalVariableReadAccess {
RelevantLocalVariableReadAccess() {

View File

@@ -11,7 +11,7 @@
*/
import ruby
import codeql_ruby.dataflow.SSA
import codeql.ruby.dataflow.SSA
class RelevantParameterVariable extends LocalVariable {
RelevantParameterVariable() {