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

merging develop

Browse Source
This commit is contained in:
Sophie Mori 2016-11-04 11:32:31 -04:00
commit 01a2f08250
10 changed files with 76 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Core/src/org/sleuthkit/autopsy/core/Installer.java
View File

@ -64,12 +64,54 @@ public class Installer extends ModuleInstall {
//Note: if shipping with a different CRT version, this will only print a warning
//and try to use linker mechanism to find the correct versions of libs.
//We should update this if we officially switch to a new version of CRT/compiler
System.loadLibrary("msvcr100"); //NON-NLS
System.loadLibrary("msvcp100"); //NON-NLS
System.loadLibrary("api-ms-win-core-console-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-datetime-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-debug-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-errorhandling-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-file-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-file-l1-2-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-file-l2-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-handle-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-heap-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-interlocked-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-libraryloader-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-localization-l1-2-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-memory-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-namedpipe-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-processenvironment-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-processthreads-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-processthreads-l1-1-1"); //NON-NLS
System.loadLibrary("api-ms-win-core-profile-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-rtlsupport-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-string-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-synch-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-synch-l1-2-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-sysinfo-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-timezone-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-core-util-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-conio-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-convert-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-environment-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-filesystem-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-heap-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-locale-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-math-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-multibyte-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-private-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-process-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-runtime-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-stdio-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-string-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-time-l1-1-0"); //NON-NLS
System.loadLibrary("api-ms-win-crt-utility-l1-1-0"); //NON-NLS
logger.log(Level.INFO, "MSVCR100 and MSVCP100 libraries loaded"); //NON-NLS
System.loadLibrary("ucrtbase"); //NON-NLS
System.loadLibrary("vcruntime140"); //NON-NLS
System.loadLibrary("msvcp140"); //NON-NLS
logger.log(Level.INFO, "Visual C Runtime libraries loaded"); //NON-NLS
} catch (UnsatisfiedLinkError e) {
logger.log(Level.SEVERE, "Error loading MSVCR100 and MSVCP100 libraries, ", e); //NON-NLS
logger.log(Level.SEVERE, "Error loading Visual C Runtime libraries, ", e); //NON-NLS
}
try {

33
Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java
View File

@ -147,6 +147,14 @@ final public class Accounts implements AutopsyVisitableItem {
*/
private abstract class ObservingChildren<X> extends Children.Keys<X> {
/**
* Override of default constructor to force lazy creation of nodes, by
* concrete instances of ObservingChildren
*/
ObservingChildren() {
super(true);
}
/**
* Create of keys used by this Children object to represent the child
* nodes.
@ -1036,8 +1044,8 @@ final public class Accounts implements AutopsyVisitableItem {
private BINNode(BinResult bin) {
super(Children.LEAF);
setChildren(Children.createLazy(CreditCardNumberFactory::new));
this.bin = bin;
setChildren(Children.createLazy(CreditCardNumberFactory::new));
setName(getBinRangeString());
updateDisplayName();
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/bank.png"); //NON-NLS
@ -1356,18 +1364,27 @@ final public class Accounts implements AutopsyVisitableItem {
*/
if (newStatus == BlackboardArtifact.ReviewStatus.REJECTED && showRejected == false) {
List<Node> siblings = Arrays.asList(node.getParentNode().getChildren().getNodes());
int indexOf = siblings.indexOf(node);
//there is no previous for the first node, so instead we select the next one
Node sibling = indexOf > 0
? siblings.get(indexOf - 1)
: siblings.get(indexOf + 1);
createPath = NodeOp.createPath(sibling, null);
if (siblings.size() > 1) {
int indexOf = siblings.indexOf(node);
//there is no previous for the first node, so instead we select the next one
Node sibling = indexOf > 0
? siblings.get(indexOf - 1)
: siblings.get(Integer.max(indexOf + 1, siblings.size() - 1));
createPath = NodeOp.createPath(sibling, null);
} else {
/* if there are no other siblings to select,
* just return null, but note we need to filter
* this out of stream below */
return null;
}
} else {
createPath = NodeOp.createPath(node, null);
}
//for the reselect to work we need to strip off the first part of the path.
return Arrays.copyOfRange(createPath, 1, createPath.length);
}).collect(Collectors.toList());
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
//change status of selected artifacts
final Collection<? extends BlackboardArtifact> artifacts = Utilities.actionsGlobalContext().lookupAll(BlackboardArtifact.class);

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSingleKeywordSearchPanel.java
View File

@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
* types of ad hoc single keyword searches. The first option is a standard
* Lucene query for one or more terms, with or without wildcards and explicit
* Boolean operators, or a phrase. The second option is a Lucene query for a
* substring of a single rerm. The third option is a regex query using first the
* substring of a single term. The third option is a regex query using first the
* terms component, followed by standard Lucene queries for any terms found.
*
* The toolbar uses a different font from the rest of the application,

89
build-windows.xml
View File

@ -43,68 +43,40 @@
<!-- copy 64-bit dlls into the installer folder -->
<target name="copyWinTskLibs64ToBaseDir" if="win64.TskLib.exists">
<fileset dir="${win64.TskLib.path}" id="win64dlls">
<include name="libewf.dll" />
<include name="libvmdk.dll"/>
<include name="libvhdi.dll"/>
<include name="zlib.dll"/>
<include name="*.dll" />
<exclude name="libtsk_jni.dll"/>
</fileset>
<fileset dir="${win64.TskLib.postgres_path}" id="postgres64dlls">
<include name="libeay32.dll"/>
<include name="ssleay32.dll"/>
<include name="libintl-8.dll"/>
<include name="libiconv-2.dll"/>
<include name="libpq.dll"/>
<include name="msvcr120.dll"/>
</fileset>
<copy todir="${amd64}" overwrite="true">
<fileset refid="win64dlls" />
<fileset refid="postgres64dlls" />
</copy>
<copy todir="${x86_64}" overwrite="true">
<fileset refid="win64dlls" />
<fileset refid="postgres64dlls" />
</copy>
</target>
<!-- copy 32-bit dlls into the installer folder -->
<target name="copyWinTskLibs32ToBaseDir" if="win32.TskLib.exists">
<fileset dir="${win32.TskLib.path}" id="win32dlls">
<include name="zlib.dll" />
<include name="libvmdk.dll"/>
<include name="libvhdi.dll"/>
<include name="libewf.dll"/>
<include name="*.dll" />
<exclude name="libtsk_jni.dll"/>
</fileset>
<fileset dir="${win32.TskLib.postgres_path}" id="postgres32dlls">
<include name="libeay32.dll"/>
<include name="ssleay32.dll"/>
<include name="libintl-8.dll"/>
<include name="libiconv-2.dll"/>
<include name="libpq.dll"/>
<include name="msvcr120.dll"/>
</fileset>
<copy todir="${i386}" overwrite="true">
<fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy>
<copy todir="${x86}" overwrite="true">
<fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy>
<copy todir="${i586}" overwrite="true">
<fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy>
<copy todir="${i686}" overwrite="true">
<fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy>
</target>
@ -115,57 +87,4 @@
<antcall target="copyWinTskLibs64ToBaseDir" inheritRefs="true" />
</target>
<!-- CRT LIBS TO ZIP - gets called from build.xml -->
<target name="copyLibsToZip" depends="copyCRT32ToZIP,copyCRT64ToZIP"/>
<target name="copyCRT32ToZIP">
<!-- verify we have the 32-bit dlls -->
<property name="CRT32.path" value="${thirdparty.dir}/crt/win32"/>
<available file="${CRT32.path}" property="crtFound"/>
<fail unless="crtFound" message="32-bit CRT not found in the thirdparty repo in path: ${CRT32.path}"/>
<!-- copy them from third party -->
<property name="zip-lib-path" value="${zip-tmp}/${app.name}/${app.name}/modules/lib/"/>
<fileset dir="${CRT32.path}" id="crt32dlls">
<include name="*.dll"/>
</fileset>
<copy todir="${zip-lib-path}/x86" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
<copy todir="${zip-lib-path}/i386" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
<copy todir="${zip-lib-path}/i586" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
<copy todir="${zip-lib-path}/i686" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
</target>
<target name="copyCRT64ToZIP">
<!-- Verify we have the 64-bit -->
<property name="CRT64.path" value="${thirdparty.dir}/crt/win64"/>
<available file="${CRT64.path}" property="crtFound"/>
<fail unless="crtFound" message="64-bit CRT not found in the thirdparty repo in path: ${CRT64.path}"/>
<!-- Copy the libs -->
<property name="zip-lib-path" value="${zip-tmp}/${app.name}/${app.name}/modules/lib/"/>
<fileset dir="${CRT64.path}" id="crt64dlls">
<include name="*.dll"/>
</fileset>
<copy todir="${zip-lib-path}/x86_64" overwrite="true">
<fileset refid="crt64dlls"/>
</copy>
<copy todir="${zip-lib-path}/amd64" overwrite="true">
<fileset refid="crt64dlls"/>
</copy>
</target>
</project>

2
build.xml
View File

@ -92,8 +92,6 @@
</then>
</if>
<antcall target="copyLibsToZip"/>
<property name="app.property.file" value="${zip-tmp}/${app.name}/etc/${app.name}.conf" />
<!-- for Japanese localized version add option: -Duser.language=ja -->
<property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />

9
thirdparty/crt/update.bat vendored
View File

@ -1,9 +0,0 @@
REM Updates the 32-bit and 64-bit VS Runtime dlls
REM Needs to be run from a 64-bit command prompt
REM Otherwise Windows will put 32-bit dlls in system32
copy c:\windows\system32\msvcr100.dll win64
copy c:\windows\system32\msvcp100.dll win64
copy c:\windows\system32\msvcr120.dll win64
copy c:\windows\sysWoW64\msvcr100.dll win32
copy c:\windows\sysWow64\msvcp100.dll win32
copy c:\windows\sysWow64\msvcr120.dll win32

BIN
thirdparty/crt/win32/msvcp100.dll vendored
View File

Binary file not shown.

BIN
thirdparty/crt/win32/msvcr100.dll vendored
View File

Binary file not shown.

BIN
thirdparty/crt/win64/msvcp100.dll vendored
View File

Binary file not shown.

BIN
thirdparty/crt/win64/msvcr100.dll vendored
View File

Binary file not shown.