Skip to content

Commit 1853588

Browse files
chrissanderschrissanders
committed
Merge pull request #17 from chrissanders/flowbat/1.4.0
Flowbat/1.4.0
2 parents 1021918 + bea078e commit 1853588

File tree

199 files changed

+18234
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+18234
-94
lines changed

‎client/templates/ipset/ipset.html.jade‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ template(name="ipset")
66
form.panel.panel-default
77
.panel-heading
88
.form-group
9-
label IP Set name
9+
label IP Set Name
10+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="IP Set name", data-content="This is the name that will be referenced in the query builder.")
1011
.input-group
1112
+input(family="ipset" _id=_id property="name" value=name isNew=isNew)
1213
.input-group-btn
@@ -20,9 +21,11 @@ template(name="ipset")
2021
.panel-body
2122
.form-group
2223
label Note
24+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Note", data-content="These notes are for personal use and can be quickly referenced when examining the list in the IP Sets tab in the navbar.")
2325
+textarea(family="ipset" _id=_id property="note" value=note isNew=isNew)
2426
.form-group
25-
label IP addresses
27+
label IP Addresses
28+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="IP addresses", data-content="List of IP addresses or CIDR ranges. When sets are specified in the query builder (via Source IP Set, Destination IP Set, or Any IP Set), records that contain matching IP addresses will be displayed.")
2629
+textarea(family="ipset" _id=_id property="contents" value=contents isNew=isNew)
2730
.form-group
2831
button.btn.btn-primary(type="submit") Save

‎client/templates/ipset/ipset.js.coffee‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ Template.ipset.helpers
33
share.Queries.find({isQuick: false, $or: [{sipSet: @_id}, {dipSet: @_id}, {anySet: @_id}]})
44

55
Template.ipset.rendered = ->
6+
7+
@$(".panel").popover(
8+
selector: "*[data-toggle='popover']"
9+
trigger: "hover"
10+
delay: {show: 300, hide: 100}
11+
)
12+
613
@$("form").validate(
714
rules:
815
name:

‎client/templates/ipset/ipsetCreate/ipsetCreate.html.jade‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ template(name="ipsetCreate")
77
.panel-heading
88
.form-group
99
label IP Set name
10+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="IP Set name", data-content="This is the name that will be referenced in the query builder.")
1011
+input(family="ipset" _id=_id property="name" value=name isNew=isNew)
1112
.panel-body
1213
.form-group
1314
label Note
15+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Note", data-content="These notes are for personal use and can be quickly referenced when examining the list in the IP Sets tab in the navbar.")
1416
+textarea(family="ipset" _id=_id property="note" value=note isNew=isNew)
1517
.form-group
16-
label IP addresses
18+
label IP Addresses
19+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="IP addresses", data-content="List of IP addresses or CIDR ranges. When sets are specified in the query builder (via Source IP Set, Destination IP Set, or Any IP Set), records that contain matching IP addresses will be displayed.")
1720
+textarea(family="ipset" _id=_id property="contents" value=contents isNew=isNew)
1821
.form-group
1922
button.btn.btn-primary(type="submit") Create

‎client/templates/ipset/ipsetCreate/ipsetCreate.js.coffee‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ Template.ipsetCreate.helpers
22
# helper: ->
33

44
Template.ipsetCreate.rendered = ->
5+
6+
@$(".panel").popover(
7+
selector: "*[data-toggle='popover']"
8+
trigger: "hover"
9+
delay: {show: 300, hide: 100}
10+
)
11+
512
@$("form").validate(
613
rules:
714
name:

‎client/templates/results/table/table.html.jade‎

Lines changed: 51 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,34 +44,56 @@ template(name="table")
4444
else
4545
| {{value}}
4646
if isPivotable ../../output
47-
ul.dropdown-menu(role='menu', aria-labelledby='dropdownMenu1')
47+
if condition ../../output "is" "rwcut"
48+
ul.dropdown-menu(role='menu', aria-labelledby='dropdownMenu1')
49+
if condition _id "in" "sIP" "dIP"
50+
li(role='presentation')
51+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sIP"}}"
52+
li(role='presentation')
53+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="dIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.dIP"}}"
54+
li(role='presentation')
55+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="aIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.aIP"}}"
56+
li(role='presentation')
57+
a(href="https://www.robtex.com/ip/{{value}}.html" target="_blank") Search robtex for {{value}}
58+
else if condition _id "in" "sPort" "dPort"
59+
li(role='presentation')
60+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sPort"}}"
61+
li(role='presentation')
62+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="dPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.dPort"}}"
63+
li(role='presentation')
64+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="aPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.aPort"}}"
65+
li(role='presentation')
66+
a(href="https://isc.sans.edu/port.html?port={{value}}" target="_blank") More Information on Port {{value}}...
67+
else if condition _id "in" "sTime" "eTime"
68+
li(role='presentation')
69+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sTime", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sTime"}}"
70+
li(role='presentation')
71+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="eTime", data-value="{{value}}") Add to query as "{{t "rwcut.fields.eTime"}}"
72+
li(role='presentation')
73+
a.add-to-query-as-before-after-time(role='menuitem', tabindex='-1', href='#', data-spread="60000", data-value="{{value}}") Add to query as "Before/After Time (1 Minute)"
74+
li(role='presentation')
75+
a.add-to-query-as-before-after-time(role='menuitem', tabindex='-1', href='#', data-spread="300000", data-value="{{value}}") Add to query as "Before/After Time (5 Minutes)"
76+
else
77+
li(role='presentation')
78+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="{{_id}}", data-value="{{value}}") Add to query as "{{fieldI18n}}"
79+
else
4880
if condition _id "in" "sIP" "dIP"
49-
li(role='presentation')
50-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sIP"}}"
51-
li(role='presentation')
52-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="dIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.dIP"}}"
53-
li(role='presentation')
54-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="aIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.aIP"}}"
55-
li(role='presentation')
56-
a(href="https://www.robtex.com/ip/{{value}}.html" target="_blank") Search robtex for {{value}}
81+
ul.dropdown-menu(role='menu', aria-labelledby='dropdownMenu1')
82+
li(role='presentation')
83+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sIP"}}"
84+
li(role='presentation')
85+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="dIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.dIP"}}"
86+
li(role='presentation')
87+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="aIP", data-value="{{value}}") Add to query as "{{t "rwcut.fields.aIP"}}"
88+
li(role='presentation')
89+
a(href="https://www.robtex.com/ip/{{value}}.html" target="_blank") Search robtex for {{value}}
5790
else if condition _id "in" "sPort" "dPort"
58-
li(role='presentation')
59-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sPort"}}"
60-
li(role='presentation')
61-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="dPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.dPort"}}"
62-
li(role='presentation')
63-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="aPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.aPort"}}"
64-
li(role='presentation')
65-
a(href="https://isc.sans.edu/port.html?port={{value}}" target="_blank") More Information on Port {{value}}...
66-
else if condition _id "in" "sTime" "eTime"
67-
li(role='presentation')
68-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sTime", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sTime"}}"
69-
li(role='presentation')
70-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="eTime", data-value="{{value}}") Add to query as "{{t "rwcut.fields.eTime"}}"
71-
li(role='presentation')
72-
a.add-to-query-as-before-after-time(role='menuitem', tabindex='-1', href='#', data-spread="60000", data-value="{{value}}") Add to query as "Before/After Time (1 Minute)"
73-
li(role='presentation')
74-
a.add-to-query-as-before-after-time(role='menuitem', tabindex='-1', href='#', data-spread="300000", data-value="{{value}}") Add to query as "Before/After Time (5 Minutes)"
75-
else
76-
li(role='presentation')
77-
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="{{_id}}", data-value="{{value}}") Add to query as "{{fieldI18n}}"
91+
ul.dropdown-menu(role='menu', aria-labelledby='dropdownMenu1')
92+
li(role='presentation')
93+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="sPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.sPort"}}"
94+
li(role='presentation')
95+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="dPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.dPort"}}"
96+
li(role='presentation')
97+
a.add-to-query(role='menuitem', tabindex='-1', href='#', data-id="aPort", data-value="{{value}}") Add to query as "{{t "rwcut.fields.aPort"}}"
98+
li(role='presentation')
99+
a(href="https://isc.sans.edu/port.html?port={{value}}" target="_blank") More Information on Port {{value}}...

‎client/templates/results/table/table.js.coffee‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Template.table.helpers
22
isPivotable: (output) ->
3-
output is "rwcut"
3+
output isnt "rwcount"
44
fieldI18n: ->
55
i18n.t("rwcut.fields." + @_id)
66
protocolname: ->

‎client/templates/tuple/tuple.html.jade‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ template(name="tuple")
66
form.panel.panel-default
77
.panel-heading
88
.form-group
9-
label Tuple name
9+
label Tuple File Name
10+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Tuple file name", data-content="This is the name that will be referenced in the query builder. Tuples allow for searching for records based on the 5-tuple, where the values can occur in any direction.")
1011
.input-group
1112
+input(family="tuple" _id=_id property="name" value=name isNew=isNew)
1213
.input-group-btn
@@ -20,9 +21,11 @@ template(name="tuple")
2021
.panel-body
2122
.form-group
2223
label Note
24+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Note", data-content="These notes are for personal use and can be quickly referenced when examining tuples in the Tuple Files tab.")
2325
+textarea(family="tuple" _id=_id property="note" value=note isNew=isNew)
2426
.form-group
25-
label IP addresses
27+
label Tuple Values
28+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Note", data-content="You may enter a list of n-tuples, up to a 5-tuple. You may choose to 2 IP addresses instead of the full 5 tuple to examine records going in either direction or be port specific in order to filter more closely. For more information, see the options in the query builder.")
2629
+textarea(family="tuple" _id=_id property="contents" value=contents isNew=isNew)
2730
.form-group
2831
button.btn.btn-primary(type="submit") Save

‎client/templates/tuple/tuple.js.coffee‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ Template.tuple.helpers
33
share.Queries.find({isQuick: false, $or: [{tupleFile: @_id}]})
44

55
Template.tuple.rendered = ->
6+
7+
@$(".panel").popover(
8+
selector: "*[data-toggle='popover']"
9+
trigger: "hover"
10+
delay: {show: 300, hide: 100}
11+
)
12+
613
@$("form").validate(
714
rules:
815
name:

‎client/templates/tuple/tupleCreate/tupleCreate.html.jade‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ template(name="tupleCreate")
66
form.panel.panel-default
77
.panel-heading
88
.form-group
9-
label Tuple file name
9+
label Tuple File Name
10+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Tuple file name", data-content="This is the name that will be referenced in the query builder. Tuples allow for searching for records based on the 5-tuple, where the values can occur in any direction.")
1011
+input(family="tuple" _id=_id property="name" value=name isNew=isNew)
1112
.panel-body
1213
.form-group
1314
label Note
15+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Note", data-content="These notes are for personal use and can be quickly referenced when examining tuples in the Tuple Files tab.")
1416
+textarea(family="tuple" _id=_id property="note" value=note isNew=isNew)
1517
.form-group
1618
label Tuple Values
19+
i.fa.fa-question-circle.text-muted(data-toggle="popover", title="Note", data-content="You may enter a list of n-tuples, up to a 5-tuple. You may choose to 2 IP addresses instead of the full 5 tuple to examine records going in either direction or be port specific in order to filter more closely. For more information, see the options in the query builder.")
1720
+textarea(family="tuple" _id=_id property="contents" value=contents isNew=isNew)
1821
.form-group
1922
button.btn.btn-primary(type="submit") Create

‎client/templates/tuple/tupleCreate/tupleCreate.js.coffee‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ Template.tupleCreate.helpers
22
# helper: ->
33

44
Template.tupleCreate.rendered = ->
5+
6+
@$(".panel").popover(
7+
selector: "*[data-toggle='popover']"
8+
trigger: "hover"
9+
delay: {show: 300, hide: 100}
10+
)
11+
512
@$("form").validate(
613
rules:
714
name:

0 commit comments

Comments
 (0)