Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Sleuthkit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IRT
Sleuthkit
Commits
8b7c0e9a
Commit
8b7c0e9a
authored
6 years ago
by
Kelly Kelly
Browse files
Options
Downloads
Patches
Plain Diff
modified the getAccountWithResources SQL
parent
cfa46159
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java
+37
-18
37 additions, 18 deletions
...va/src/org/sleuthkit/datamodel/CommunicationsManager.java
with
37 additions
and
18 deletions
bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java
+
37
−
18
View file @
8b7c0e9a
...
@@ -662,13 +662,24 @@ public List<AccountDeviceInstance> getAccountDeviceInstancesWithRelationships(Co
...
@@ -662,13 +662,24 @@ public List<AccountDeviceInstance> getAccountDeviceInstancesWithRelationships(Co
CommunicationsFilter
.
RelationshipTypeFilter
.
class
.
getName
()
CommunicationsFilter
.
RelationshipTypeFilter
.
class
.
getName
()
));
));
String
innerQueryfilterSQL
=
getCommunicationsFilterSQL
(
filter
,
applicableInnerQueryFilters
);
String
innerQueryfilterSQL
=
getCommunicationsFilterSQL
(
filter
,
applicableInnerQueryFilters
);
String
limitSQL
=
""
;
for
(
CommunicationsFilter
.
SubFilter
subFilter
:
filter
.
getAndFilters
())
{
if
(
subFilter
.
getClass
().
getName
().
equals
(
CommunicationsFilter
.
MostRecentFilter
.
class
.
getName
()))
{
limitSQL
=
subFilter
.
getSQL
(
this
);
}
}
String
filterQuery
=
"SELECT * "
+
"FROM account_relationships as relationships"
+
(
innerQueryfilterSQL
.
isEmpty
()
?
""
:
" WHERE "
+
innerQueryfilterSQL
)
+
(
limitSQL
.
isEmpty
()
?
""
:
limitSQL
);
String
innerQueryTemplate
String
innerQueryTemplate
=
" SELECT %1$1s as account_id,"
=
" SELECT %1$1s as account_id,"
+
" data_source_obj_id,"
+
" data_source_obj_id"
+
" date_time"
+
" FROM ( "
+
filterQuery
+
")"
;
+
" FROM account_relationships as relationships"
+
(
innerQueryfilterSQL
.
isEmpty
()
?
""
:
" WHERE "
+
innerQueryfilterSQL
);
String
innerQuery1
=
String
.
format
(
innerQueryTemplate
,
"account1_id"
);
String
innerQuery1
=
String
.
format
(
innerQueryTemplate
,
"account1_id"
);
String
innerQuery2
=
String
.
format
(
innerQueryTemplate
,
"account2_id"
);
String
innerQuery2
=
String
.
format
(
innerQueryTemplate
,
"account2_id"
);
...
@@ -676,7 +687,7 @@ public List<AccountDeviceInstance> getAccountDeviceInstancesWithRelationships(Co
...
@@ -676,7 +687,7 @@ public List<AccountDeviceInstance> getAccountDeviceInstancesWithRelationships(Co
//this query groups by account_id and data_source_obj_id across both innerQueries
//this query groups by account_id and data_source_obj_id across both innerQueries
String
combinedInnerQuery
String
combinedInnerQuery
=
"SELECT DISTINCT account_id, data_source_obj_id"
=
"SELECT DISTINCT account_id, data_source_obj_id"
+
" FROM ( "
+
innerQuery1
+
" UNION "
+
innerQuery2
+
"
"
+
getUnionLimitSQL
(
filter
)
+
"
) AS inner_union"
+
" FROM ( "
+
innerQuery1
+
" UNION "
+
innerQuery2
+
" ) AS inner_union"
+
" GROUP BY account_id, data_source_obj_id"
;
+
" GROUP BY account_id, data_source_obj_id"
;
// set up applicable filters
// set up applicable filters
...
@@ -897,7 +908,13 @@ public long getRelationshipSourcesCount(AccountDeviceInstance accountDeviceInsta
...
@@ -897,7 +908,13 @@ public long getRelationshipSourcesCount(AccountDeviceInstance accountDeviceInsta
s
=
connection
.
createStatement
();
s
=
connection
.
createStatement
();
String
innerQuery
=
" account_relationships AS relationships"
;
String
innerQuery
=
" account_relationships AS relationships"
;
String
limitStr
=
getUnionLimitSQL
(
filter
);
String
limitStr
=
""
;
for
(
CommunicationsFilter
.
SubFilter
subFilter
:
filter
.
getAndFilters
())
{
if
(
subFilter
.
getClass
().
getName
().
equals
(
CommunicationsFilter
.
MostRecentFilter
.
class
.
getName
()))
{
limitStr
=
subFilter
.
getSQL
(
this
);
}
}
if
(!
limitStr
.
isEmpty
())
{
if
(!
limitStr
.
isEmpty
())
{
innerQuery
=
"(SELECT * FROM account_relationships as relationships "
+
limitStr
+
") as relationships"
;
innerQuery
=
"(SELECT * FROM account_relationships as relationships "
+
limitStr
+
") as relationships"
;
}
}
...
@@ -980,7 +997,13 @@ public Set<Content> getRelationshipSources(Set<AccountDeviceInstance> accountDev
...
@@ -980,7 +997,13 @@ public Set<Content> getRelationshipSources(Set<AccountDeviceInstance> accountDev
String
filterSQL
=
getCommunicationsFilterSQL
(
filter
,
applicableFilters
);
String
filterSQL
=
getCommunicationsFilterSQL
(
filter
,
applicableFilters
);
String
limitQuery
=
" account_relationships AS relationships"
;
String
limitQuery
=
" account_relationships AS relationships"
;
String
limitStr
=
getUnionLimitSQL
(
filter
);
String
innerQuery
=
" account_relationships AS relationships"
;
String
limitStr
=
""
;
for
(
CommunicationsFilter
.
SubFilter
subFilter
:
filter
.
getAndFilters
())
{
if
(
subFilter
.
getClass
().
getName
().
equals
(
CommunicationsFilter
.
MostRecentFilter
.
class
.
getName
()))
{
limitStr
=
subFilter
.
getSQL
(
this
);
}
}
if
(!
limitStr
.
isEmpty
())
{
if
(!
limitStr
.
isEmpty
())
{
limitQuery
=
"(SELECT * FROM account_relationships as relationships "
+
limitStr
+
") as relationships"
;
limitQuery
=
"(SELECT * FROM account_relationships as relationships "
+
limitStr
+
") as relationships"
;
}
}
...
@@ -1167,7 +1190,13 @@ public List<Content> getRelationshipSources(AccountDeviceInstance account1, Acco
...
@@ -1167,7 +1190,13 @@ public List<Content> getRelationshipSources(AccountDeviceInstance account1, Acco
));
));
String
limitQuery
=
" account_relationships AS relationships"
;
String
limitQuery
=
" account_relationships AS relationships"
;
String
limitStr
=
getUnionLimitSQL
(
filter
);
String
innerQuery
=
" account_relationships AS relationships"
;
String
limitStr
=
""
;
for
(
CommunicationsFilter
.
SubFilter
subFilter
:
filter
.
getAndFilters
())
{
if
(
subFilter
.
getClass
().
getName
().
equals
(
CommunicationsFilter
.
MostRecentFilter
.
class
.
getName
()))
{
limitStr
=
subFilter
.
getSQL
(
this
);
}
}
if
(!
limitStr
.
isEmpty
())
{
if
(!
limitStr
.
isEmpty
())
{
limitQuery
=
"(SELECT * FROM account_relationships as relationships "
+
limitStr
+
") as relationships"
;
limitQuery
=
"(SELECT * FROM account_relationships as relationships "
+
limitStr
+
") as relationships"
;
}
}
...
@@ -1352,14 +1381,4 @@ private String getCommunicationsFilterSQL(CommunicationsFilter commFilter, Set<S
...
@@ -1352,14 +1381,4 @@ private String getCommunicationsFilterSQL(CommunicationsFilter commFilter, Set<S
}
}
return
sqlStr
;
return
sqlStr
;
}
}
private
String
getUnionLimitSQL
(
CommunicationsFilter
commFilter
)
{
for
(
CommunicationsFilter
.
SubFilter
subFilter
:
commFilter
.
getAndFilters
())
{
if
(
subFilter
.
getClass
().
getName
().
equals
(
CommunicationsFilter
.
MostRecentFilter
.
class
.
getName
()))
{
return
subFilter
.
getSQL
(
this
);
}
}
return
""
;
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment