mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-19 11:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6935 from sleuthkit/release-4.19.0

Browse Source 
Merge Release 4.19.0 branch into develop
This commit is contained in:
Richard Cordovano 2021-04-22 11:59:39 -04:00 committed by GitHub
commit ad82d35aca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/timeline/EventsModel.java
View File

@ -55,6 +55,7 @@ import org.sleuthkit.autopsy.timeline.events.TagsAddedEvent;
import org.sleuthkit.autopsy.timeline.events.TagsDeletedEvent; import org.sleuthkit.autopsy.timeline.events.TagsDeletedEvent;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterState; import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.FilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterState; import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.RootFilterState;
import org.sleuthkit.autopsy.timeline.ui.filtering.datamodel.SqlFilterState;
import org.sleuthkit.autopsy.timeline.utils.CacheLoaderImpl; import org.sleuthkit.autopsy.timeline.utils.CacheLoaderImpl;
import org.sleuthkit.autopsy.timeline.utils.FilterUtils; import org.sleuthkit.autopsy.timeline.utils.FilterUtils;
import org.sleuthkit.autopsy.timeline.zooming.EventsModelParams; import org.sleuthkit.autopsy.timeline.zooming.EventsModelParams;
@ -222,8 +223,7 @@ public final class EventsModel {
* @param rootFilterState A root filter state object. * @param rootFilterState A root filter state object.
*/ */
synchronized void addDataSourceFilters(RootFilterState rootFilterState) { synchronized void addDataSourceFilters(RootFilterState rootFilterState) {
DataSourcesFilter dataSourcesFilter = rootFilterState.getDataSourcesFilterState().getFilter(); datasourceIDsToNamesMap.entrySet().forEach(entry -> rootFilterState.getDataSourcesFilterState().addSubFilterState(new SqlFilterState<>(newDataSourceFilter(entry))));
datasourceIDsToNamesMap.entrySet().forEach(entry -> dataSourcesFilter.addSubFilter(newDataSourceFilter(entry)));
} }
/** /**

2
Core/src/org/sleuthkit/autopsy/timeline/ui/ViewFrame.java
View File

@ -588,7 +588,7 @@ final public class ViewFrame extends BorderPane {
long startMillis = filteredEvents.getTimeRange().getStartMillis(); long startMillis = filteredEvents.getTimeRange().getStartMillis();
long endMillis = filteredEvents.getTimeRange().getEndMillis(); long endMillis = filteredEvents.getTimeRange().getEndMillis();
if (minTime > 0 && maxTime > minTime) { if ( maxTime > minTime) {
Platform.runLater(() -> { Platform.runLater(() -> {
startPicker.localDateTimeProperty().removeListener(startListener); startPicker.localDateTimeProperty().removeListener(startListener);
endPicker.localDateTimeProperty().removeListener(endListener); endPicker.localDateTimeProperty().removeListener(endListener);

2
Core/src/org/sleuthkit/autopsy/timeline/ui/filtering/datamodel/CompoundFilterState.java
View File

@ -110,7 +110,7 @@ public class CompoundFilterState<SubFilterType extends TimelineFilter, FilterTyp
* @param newSubFilterState The new filter state to be added as a subfilter * @param newSubFilterState The new filter state to be added as a subfilter
* state. * state.
*/ */
protected void addSubFilterState(FilterState< ? extends SubFilterType> newSubFilterState) { public void addSubFilterState(FilterState< ? extends SubFilterType> newSubFilterState) {
SubFilterType filter = newSubFilterState.getFilter(); SubFilterType filter = newSubFilterState.getFilter();
if (getSubFilterStates().stream().map(FilterState::getFilter).noneMatch(filter::equals)) { if (getSubFilterStates().stream().map(FilterState::getFilter).noneMatch(filter::equals)) {

7
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java
View File

@ -283,7 +283,9 @@ final class ChromeCacheExtractor {
return; return;
} }
processCacheFolder(indexFile); if (indexFile.getSize() > 0) {
processCacheFolder(indexFile);
}
} }
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
@ -1039,6 +1041,9 @@ final class ChromeCacheExtractor {
this.data = new byte [length]; this.data = new byte [length];
ByteBuffer buf = cacheFileCopy.getByteBuffer(); ByteBuffer buf = cacheFileCopy.getByteBuffer();
int dataOffset = DATAFILE_HDR_SIZE + cacheAddress.getStartBlock() * cacheAddress.getBlockSize(); int dataOffset = DATAFILE_HDR_SIZE + cacheAddress.getStartBlock() * cacheAddress.getBlockSize();
if (dataOffset > buf.capacity()) {
return;
}
buf.position(dataOffset); buf.position(dataOffset);
buf.get(data, 0, length); buf.get(data, 0, length);