Skip to content

Automodel: Apply negative characteristics only to endpoints of the right kind. #15326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jan 17, 2024
Merged

Automodel: Apply negative characteristics only to endpoints of the right kind. #15326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8e429bd
Rename `isSinkCandidate` (and a related predicate) to `isCandidate`.
Jan 11, 2024
a6d996b
Add an example of a missed source candidate.
Jan 11, 2024
03ca244
Associate endpoints with their potential endpoint types and check the…
Jan 11, 2024
bcf4f4f
Drop a conjunct which is now spurious.
Jan 11, 2024
ff4555a
Get rid of negative sink types.
Jan 11, 2024
6e9c90a
Properly distinguish negative source and sink characteristics.
Jan 11, 2024
9f443d4
Make `Unexploitable*Characteristic` more precise.
Jan 12, 2024
76b8430
Share some code.
Jan 12, 2024
06ba5ea
Eliminate `GetCallable` modules and use `getCallable` instead.
Jan 12, 2024
ea26e21
Extend negative characteristics for exceptions to source models.
Jan 12, 2024
45ca301
Rename a predicate.
Jan 12, 2024
bb63fcd
Refactor to avoid bad join order.
Jan 12, 2024
919330f
Some more performance refactoring.
Jan 12, 2024
68cf9ac
Remove a few `getExtensibleType` checks which are now unnecessary.
Jan 15, 2024
3befce9
When checking whether an endpoint has already been modelled, make sur…
Jan 15, 2024
fee4407
Autoformat.
Jan 15, 2024
90a4552
Fix omittable exists.
Jan 15, 2024
8614d7b
Address review feedback.
Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,18 @@ abstract private class ApplicationModeEndpoint extends TApplicationModeEndpoint
else none() // if both exist, it would be a summaryModel (not yet supported)
}

/**
* Gets a potential type of this endpoint to make sure that sources are
* associated with source types and sinks with sink types.
*/
AutomodelEndpointTypes::EndpointType getAPotentialType() {
this.getExtensibleType() = "sourceModel" and
result instanceof AutomodelEndpointTypes::SourceType
or
this.getExtensibleType() = "sinkModel" and
result instanceof AutomodelEndpointTypes::SinkType
}

abstract string toString();
}

Expand Down
12 changes: 12 additions & 0 deletions java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ abstract class FrameworkModeEndpoint extends TFrameworkModeEndpoint {

abstract string getExtensibleType();

/**
* Gets a potential type of this endpoint to make sure that sources are
* associated with source types and sinks with sink types.
*/
AutomodelEndpointTypes::EndpointType getAPotentialType() {
this.getExtensibleType() = "sourceModel" and
result instanceof AutomodelEndpointTypes::SourceType
or
this.getExtensibleType() = "sinkModel" and
result instanceof AutomodelEndpointTypes::SinkType
}

string toString() { result = this.asTop().toString() }

Location getLocation() { result = this.asTop().getLocation() }
Expand Down
11 changes: 7 additions & 4 deletions java/ql/automodel/src/AutomodelSharedCharacteristics.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ signature module CandidateSig {
* An endpoint is a potential candidate for modeling. This will typically be bound to the language's
* DataFlow node class, or a subtype thereof.
*/
class Endpoint;
class Endpoint {
EndpointType getAPotentialType();
}

/**
* A related location for an endpoint. This will typically be bound to the supertype of all AST nodes (eg., `Top`).
Expand Down Expand Up @@ -122,9 +124,10 @@ module SharedCharacteristics<CandidateSig Candidate> {
*
* A candidate is an endpoint that cannot be excluded from `endpointType` based on its characteristics.
*/
predicate isCandidate(Candidate::Endpoint candidateSink, Candidate::EndpointType sinkType) {
not sinkType instanceof Candidate::NegativeEndpointType and
not exists(getAnExcludingCharacteristic(candidateSink, sinkType))
predicate isCandidate(Candidate::Endpoint endpoint, Candidate::EndpointType endpointType) {
not endpointType instanceof Candidate::NegativeEndpointType and
endpointType = endpoint.getAPotentialType() and
not exists(getAnExcludingCharacteristic(endpoint, endpointType))
}

/**
Expand Down