| Dec | JAN | Feb |
| 06 | ||
| 2025 | 2026 | 2027 |
COLLECTED BY
Collection: Save Page Now
To see all available qualifiers, see our documentation.
Sign in /
owen-mc
commented
Sorry, something went wrong.
owen-mc
requested a review
from a team
as a code owner
github-actions
bot
added
the
Java
label
owen-mc
force-pushed
the
java/model/apache-collections-subpackages
branch
from
c1a9f91to612966c Compare
owen-mc
marked this pull request as draft
smowton
left a comment
Sorry, something went wrong.
| ".bidimap;AbstractSortedBidiMapDecorator;true;AbstractSortedBidiMapDecorator;;;MapValue of Argument[0];MapValue of Argument[-1];value", | ||
| ".bidimap;DualHashBidiMap;true;DualHashBidiMap;;;MapKey of Argument[0];MapKey of Argument[-1];value", | ||
| ".bidimap;DualHashBidiMap;true;DualHashBidiMap;;;MapValue of Argument[0];MapValue of Argument[-1];value", | ||
| ".bidimap;DualHashBidiMap;true;DualHashBidiMap;;;MapKey of Argument[1];MapValue of Argument[-1];value", |
smowton
createBidiMap methods too, though they're protected so don't matter much (but we are covering protected constructors, so might want to pick them up for consistency)
Sorry, something went wrong.
atorralba
left a comment
•
edited
.collection and .iterators packages.
About wrapper classes, I was wondering if we could model their "proxying" aspect and @joefarebrother mentioned that maybe that could be fixed using synthetic fields, which theoretically would enable backtracking side effects to the wrapped collection, e.g.
List a = new ArrayList(); WrappedList b = wrap(a); b.add(source()); sink(a.get(0));But it adds a significant amount of effort, since all inherited methods from the wrapped class hierarchy would need to be remodeled, so I don't know if it's worth it.
Sorry, something went wrong.
| ".iterators;PeekingIterator;true;peekingIterator;;;Element of Argument[0];Element of ReturnValue;value", | ||
| ".iterators;PeekingIterator;true;peek;;;Element of Argument[-1];ReturnValue;value", | ||
| ".iterators;PeekingIterator;true;element;;;Element of Argument[-1];ReturnValue;value", | ||
| ".iterators;PermutationIterator;true;PermutationIterator;;;Element of Argument[0];Element of Element of Argument[-1];value", |
atorralba
Sorry, something went wrong.
| ".list;AbstractLinkedList;true;removeLast;;;Element of Argument[-1];ReturnValue;value", | ||
| ".list;AbstractLinkedList;true;updateNode;;;Argument[1];Element of Argument[-1];value", | ||
| ".list;AbstractLinkedList;true;updateNode;;;Argument[1];Element of Argument[0];value", | ||
| ".list;AbstractLinkedList;true;createNode;;;Argument[0];Element of ReturnValue;value", |
bmuskalla
Subclasses can override this to record the change). I think that's fair to assume this flow for all subclasses. Good to know for the model generator
Sorry, something went wrong.
owen-mc
AbstractLinkedList in a slightly less precise way than you might expect. I have conflated the contents of any particular node with the contents of all the nodes. The problem this solves is that from any node you can get to any other node using next and previous (and I expect these methods to be commonly used).
Sorry, something went wrong.
owen-mc
Sorry, something went wrong.
| ".list;AbstractLinkedList;true;updateNode;;;Argument[1];Element of Argument[0];value", | ||
| ".list;AbstractLinkedList;true;createNode;;;Argument[0];Element of ReturnValue;value", | ||
| ".list;AbstractLinkedList;true;addNodeBefore;;;Argument[1];Element of Argument[-1];value", | ||
| ".list;AbstractLinkedList;true;addNodeBefore;;;Argument[1];Element of Argument[0];value", |
bmuskalla
Argument[0] as it only defines the insertion point
Sorry, something went wrong.
owen-mc
Sorry, something went wrong.
| ".list;AbstractLinkedList;true;addNodeBefore;;;Argument[1];Element of Argument[-1];value", | ||
| ".list;AbstractLinkedList;true;addNodeBefore;;;Argument[1];Element of Argument[0];value", | ||
| ".list;AbstractLinkedList;true;addNodeAfter;;;Argument[1];Element of Argument[-1];value", | ||
| ".list;AbstractLinkedList;true;addNodeAfter;;;Argument[1];Element of Argument[0];value", |
bmuskalla
Sorry, something went wrong.
owen-mc
Sorry, something went wrong.
| ".list;AbstractLinkedList;true;addNodeAfter;;;Argument[1];Element of Argument[-1];value", | ||
| ".list;AbstractLinkedList;true;addNodeAfter;;;Argument[1];Element of Argument[0];value", | ||
| ".list;AbstractLinkedList;true;addNode;;;Element of Argument[0];Element of Argument[-1];value", | ||
| ".list;AbstractLinkedList;true;addNode;;;Element of Argument[0];Element of Argument[1];value", |
bmuskalla
Argument[1]. From the code, it does touch the linked nodes next/previous fields but that's no value flow
Sorry, something went wrong.
owen-mc
Sorry, something went wrong.
| ".list;AbstractLinkedList;true;addNode;;;Element of Argument[0];Element of Argument[-1];value", | ||
| ".list;AbstractLinkedList;true;addNode;;;Element of Argument[0];Element of Argument[1];value", | ||
| ".list;AbstractLinkedList;true;getNode;;;Element of Argument[-1];Element of ReturnValue;value", | ||
| ".list;AbstractLinkedList;true;createSubListIterator;;;Element of Argument[-1];Element of ReturnValue;value", |
bmuskalla
Sorry, something went wrong.
owen-mc
arg[0]. It does risk creating FPs.
Sorry, something went wrong.
owen-mc
Sorry, something went wrong.
| ".map;CompositeMap;true;CompositeMap;(Map,Map);;MapValue of Argument[0];MapValue of Argument[-1];value", | ||
| ".map;CompositeMap;true;CompositeMap;(Map,Map);;MapKey of Argument[1];MapKey of Argument[-1];value", | ||
| ".map;CompositeMap;true;CompositeMap;(Map,Map);;MapValue of Argument[1];MapValue of Argument[-1];value", | ||
| ".map;CompositeMap;true;CompositeMap;(Map,Map,MapMutator);;MapKey of Argument[0];MapKey of Argument[-1];value", |
bmuskalla
MapMutator should be handled as taint
Sorry, something went wrong.
owen-mc
MapMutator was intended to be used to decide which of the array of maps to do the mutation operation on, which we don't care about in our model.
Sorry, something went wrong.
| ".map;MultiValueMap;true;multiValueMap;;;Element of MapValue of Argument[0];Element of MapValue of ReturnValue;value", | ||
| ".map;MultiValueMap;true;getCollection;;;Element of MapValue of Argument[-1];Element of ReturnValue;value", | ||
| ".map;MultiValueMap;true;putAll;;;Argument[0];MapKey of Argument[-1];value", | ||
| ".map;MultiValueMap;true;putAll;;;Element of Argument[1];Element of MapValue of Argument[-1];value", |
bmuskalla
| ".map;MultiValueMap;true;putAll;;;Element of Argument[1];Element of MapValue of Argument[-1];value", | |
| ".map;MultiValueMap;true;putAll;;;Element of Argument[0];Element of MapValue of Argument[-1];value", |
Sorry, something went wrong.
owen-mc
putAll(K key, Collection<V> values) method here, not putAll(Map<? extends K,?> map) (which is inherited from Map). I'll explicitly give the signature to make this clearer.
Sorry, something went wrong.
| ".properties;AbstractPropertiesFactory;true;load;(Reader);;Argument[0];ReturnValue;taint", | ||
| ".properties;AbstractPropertiesFactory;true;load;(String);;Argument[0];ReturnValue;taint", | ||
| ".properties;AbstractPropertiesFactory;true;load;(URI);;Argument[0];ReturnValue;taint", | ||
| ".properties;AbstractPropertiesFactory;true;load;(URL);;Argument[0];ReturnValue;taint" |
bmuskalla
SortedProperties. I couldn't find (yet) where we model Properties to account for that
Sorry, something went wrong.
owen-mc
SortedProperties? I don't think we model Properties for data flow at the moment. We probably should. We do model Dictionary, which is a superclass of it.
Sorry, something went wrong.
| /** | ||
| * Value-propagating models for the package `org.apache.commons.collections4.multiset`. | ||
| */ | ||
| private class ApacheMultiSetModel extends SummaryModelCsv { |
bmuskalla
MultiSet with methods like uniqueSet
Sorry, something went wrong.
owen-mc
ApacheCollectionsModel.
Sorry, something went wrong.
owen-mc
force-pushed
the
java/model/apache-collections-subpackages
branch
from
78a3b1btocd07422 Compare
Model java.lang.Object.clone() better for access paths.
3d1d491
Model value flow for Element, MapKey and MapValue. This assumes that clone() is a shallow copy.
Model the remaining subpackages in Apache Commons Collections
fd0fb94
Address problems highlighted by generating tests
e1750ad
Address review comments
3b678bf
Do not modelled protected static inner classes
cb0f82c
Do not model some protected methods
9b12980
Miscellaneous model fixes
f69787a
Add automatically generated tests
a20acfe
Also update test.ql to use the new InlineFlowTest.
Fix errors in generated tests that stop compilation
53ee465
Make concrete subclasses of abstract classes
15161d8
Fix up automatically generated tests
0a92b04
Add tests for non-public abstract classes
c51fb00
Remove redundant casts
768203b
Minor improvement to existing tests
e1101e5
Fix existing models for MapUtils
342c148
Merge new and old tests
cf03bd8
# Conflicts: # java/ql/test/library-tests/frameworks/apache-collections/TestNew.java
Fix up old tests for new helper functions
e6df816
Generate stubs
29db42c
Fix stub
bdd78d2
owen-mc
force-pushed
the
java/model/apache-collections-subpackages
branch
from
cd07422tobdd78d2 Compare
|
I've now added the tests (and stubs). I fixed some errors in models which became obvious on the way (including in old models for this package). I had to force-push because I rebased on main to get some improvements to helper utilities, but I haven't changed the original four commits at all, so they shouldn't need to be re-reviewed. |
Sorry, something went wrong.
owen-mc
marked this pull request as ready for review
Add a change note
787f36f
github-actions
bot
added
the
documentation
label
Remove models that are no longer required
39a12a8
smowton
approved these changes
smowton
merged commit 413ac4e
into
github:main
owen-mc
deleted the
java/model/apache-collections-subpackages
branch
Successfully merging this pull request may close these issues.
