Skip to content

Commit 3099290

Browse files
RafiotRafiot
committed
JQ all the things
1 parent 94290cf commit 3099290

File tree

15 files changed

+1119
-1068
lines changed

15 files changed

+1119
-1068
lines changed

Diff for: ‎MANIFEST.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"name": "dni-ism",
4141
"version": 3
4242
},
43-
{
43+
{
4444
"description": "Taxonomy to tag domain names used for cybercrime.",
4545
"name": "domain-abuse",
4646
"version": 1
@@ -166,9 +166,9 @@
166166
"version": 1
167167
},
168168
{
169-
"description" : "Tags for RiskIQ's passivetotal service",
170-
"name" : "passivetotal",
171-
"version" : 1
169+
"description": "Tags for RiskIQ's passivetotal service",
170+
"name": "passivetotal",
171+
"version": 1
172172
}
173173
]
174174
}

Diff for: ‎adversary/machinetag.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
}
3939
]
4040
},
41-
{
42-
"predicate": "infrastructure-action",
43-
"entry": [
41+
{
42+
"predicate": "infrastructure-action",
43+
"entry": [
4444
{
4545
"value": "passive-only",
4646
"expanded": "Only passive requests shall be performed to avoid detection by the adversary"
@@ -57,11 +57,11 @@
5757
"value": "pending-law-enforcement-request",
5858
"expanded": "Law enforcement requests are ongoing on the adversary infrastructure"
5959
}
60-
]
61-
},
60+
]
61+
},
6262
{
63-
"predicate": "infrastructure-state",
64-
"entry": [
63+
"predicate": "infrastructure-state",
64+
"entry": [
6565
{
6666
"value": "unknown",
6767
"expanded": "Infrastructure state is unknown or cannot be evaluated"
@@ -74,7 +74,7 @@
7474
"value": "down",
7575
"expanded": "Infrastructure state is known to be down"
7676
}
77-
]
77+
]
7878
},
7979
{
8080
"predicate": "infrastructure-type",

Diff for: ‎csirt_case_classification/machinetag.json

-1
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,3 @@
102102
}
103103
]
104104
}
105-

Diff for: ‎dhs-ciip-sectors/machinetag.json

+84-62
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,86 @@
11
{
2-
"namespace": "dhs-ciip-sectors",
3-
"description": "DHS critical sectors as in https://www.dhs.gov/critical-infrastructure-sectors",
4-
"version": 2,
5-
"predicates": [{
6-
"value": "DHS-critical-sectors",
7-
"expanded": "DHS critical sectors"
8-
}, {
9-
"value": "sector",
10-
"expanded": "Sector"
11-
}],
12-
"values": [{
13-
"predicate": "DHS-critical-sectors",
14-
"entry": [{
15-
"value": "chemical",
16-
"expanded": "Chemical"
17-
}, {
18-
"value": "commercial-facilities",
19-
"expanded": "Commercial Facilities"
20-
}, {
21-
"value": "communications",
22-
"expanded": "Communications"
23-
}, {
24-
"value": "critical-manufacturing",
25-
"expanded": "Critical Manufacturing"
26-
}, {
27-
"value": "dams",
28-
"expanded": "Dams"
29-
}, {
30-
"value": "dib",
31-
"expanded": "Defense Industrial Base"
32-
}, {
33-
"value": "emergency-services",
34-
"expanded": "Emergency services"
35-
}, {
36-
"value": "energy",
37-
"expanded": "energy"
38-
}, {
39-
"value": "financial-services",
40-
"expanded": "Financial Services"
41-
}, {
42-
"value": "food-agriculture",
43-
"expanded": "Food and Agriculture"
44-
}, {
45-
"value": "government-facilities",
46-
"expanded": "Government Facilities"
47-
}, {
48-
"value": "healthcare-public",
49-
"expanded": "Healthcare and Public Health"
50-
}, {
51-
"value": "it",
52-
"expanded": "Information Technology"
53-
}, {
54-
"value": "nuclear",
55-
"expanded": "Nuclear"
56-
}, {
57-
"value": "transport",
58-
"expanded": "Transportation Systems"
59-
}, {
60-
"value": "water",
61-
"expanded": "Water and water systems"
62-
}]
63-
}]
2+
"namespace": "dhs-ciip-sectors",
3+
"description": "DHS critical sectors as in https://www.dhs.gov/critical-infrastructure-sectors",
4+
"version": 2,
5+
"predicates": [
6+
{
7+
"value": "DHS-critical-sectors",
8+
"expanded": "DHS critical sectors"
9+
},
10+
{
11+
"value": "sector",
12+
"expanded": "Sector"
13+
}
14+
],
15+
"values": [
16+
{
17+
"predicate": "DHS-critical-sectors",
18+
"entry": [
19+
{
20+
"value": "chemical",
21+
"expanded": "Chemical"
22+
},
23+
{
24+
"value": "commercial-facilities",
25+
"expanded": "Commercial Facilities"
26+
},
27+
{
28+
"value": "communications",
29+
"expanded": "Communications"
30+
},
31+
{
32+
"value": "critical-manufacturing",
33+
"expanded": "Critical Manufacturing"
34+
},
35+
{
36+
"value": "dams",
37+
"expanded": "Dams"
38+
},
39+
{
40+
"value": "dib",
41+
"expanded": "Defense Industrial Base"
42+
},
43+
{
44+
"value": "emergency-services",
45+
"expanded": "Emergency services"
46+
},
47+
{
48+
"value": "energy",
49+
"expanded": "energy"
50+
},
51+
{
52+
"value": "financial-services",
53+
"expanded": "Financial Services"
54+
},
55+
{
56+
"value": "food-agriculture",
57+
"expanded": "Food and Agriculture"
58+
},
59+
{
60+
"value": "government-facilities",
61+
"expanded": "Government Facilities"
62+
},
63+
{
64+
"value": "healthcare-public",
65+
"expanded": "Healthcare and Public Health"
66+
},
67+
{
68+
"value": "it",
69+
"expanded": "Information Technology"
70+
},
71+
{
72+
"value": "nuclear",
73+
"expanded": "Nuclear"
74+
},
75+
{
76+
"value": "transport",
77+
"expanded": "Transportation Systems"
78+
},
79+
{
80+
"value": "water",
81+
"expanded": "Water and water systems"
82+
}
83+
]
84+
}
85+
]
6486
}

Diff for: ‎diamond-model/machinetag.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"expanded": "Diamond Model for Intrusion Analysis",
44
"description": "The Diamond Model for Intrusion Analysis, a phase-based model developed by Lockheed Martin, aims to help categorise and identify the stage of an attack.",
55
"version": 1,
6-
"ref": ["http://www.activeresponse.org/wp-content/uploads/2013/07/diamond.pdf"],
6+
"ref": [
7+
"http://www.activeresponse.org/wp-content/uploads/2013/07/diamond.pdf"
8+
],
79
"predicates": [
810
{
911
"value": "Adversary",

Diff for: ‎domain-abuse/machinetag.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
{
2323
"value": "active",
2424
"expanded": "Registered & active",
25-
"description": "Domain name is registered and DNS is delegated"
25+
"description": "Domain name is registered and DNS is delegated"
2626
},
27-
{
27+
{
2828
"value": "inactive",
2929
"expanded": "Registered & inactive",
3030
"description": "Domain name is registered and DNS is not delegated"
@@ -34,17 +34,17 @@
3434
"expanded": "Registered & suspended",
3535
"description": "Domain name is registered & DNS delegation is temporarily removed by the registry"
3636
},
37-
{
37+
{
3838
"value": "not-registered",
3939
"expanded": "Not registered",
4040
"description": "Domain name is not registered and open for registration"
4141
},
42-
{
42+
{
4343
"value": "not-registrable",
4444
"expanded": "Not registrable",
4545
"description": "Domain is not registered and cannot be registered"
4646
},
47-
{
47+
{
4848
"value": "grace-period",
4949
"expanded": "Grace period",
5050
"description": "Domain is deleted and still reserved for previous owner"
@@ -57,24 +57,24 @@
5757
{
5858
"value": "criminal-registration",
5959
"expanded": "Criminal registration",
60-
"description": "Domain name is registered for criminal purposes"
60+
"description": "Domain name is registered for criminal purposes"
6161
},
6262
{
6363
"value": "compromised-webserver",
6464
"expanded": "Compromised webserver",
65-
"description": "Webserver is compromised for criminal purposes"
65+
"description": "Webserver is compromised for criminal purposes"
6666
},
6767
{
6868
"value": "compromised-dns",
6969
"expanded": "Compromised DNS",
70-
"description": "Compromised authoritative DNS or compromised delegation"
70+
"description": "Compromised authoritative DNS or compromised delegation"
7171
},
7272
{
7373
"value": "sinkhole",
7474
"expanded": "Sinkhole",
75-
"description": "Domain Name is sinkholed for research, detection, LE"
75+
"description": "Domain Name is sinkholed for research, detection, LE"
7676
}
77-
]
77+
]
7878
}
7979
]
80-
}
80+
}

0 commit comments

Comments
 (0)