Skip to content

Commit 3c3c39c

Browse files
chrisr3dchrisr3d
committed
Merge branch 'main' of github.com:MISP/misp-objects
2 parents e94facd + 750b333 commit 3c3c39c

38 files changed

Lines changed: 2130 additions & 76 deletions

File tree

‎.github/workflows/nosetests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
python-version: ['3.8', '3.9', '3.10']
15+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
1616

1717
steps:
1818

1919
- uses: actions/checkout@v2
2020

2121
- name: Set up Python ${{matrix.python-version}}
22-
uses: actions/setup-python@v2
22+
uses: actions/setup-python@v6
2323
with:
2424
python-version: ${{matrix.python-version}}
2525

‎README.md‎

Lines changed: 15 additions & 1 deletion
Large diffs are not rendered by default.

‎docs/images/logo.jpg‎

516 KB
Loading

‎objects/administrative-decision/definition.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"attributes": {
3+
"attachment": {
4+
"description": "A file.",
5+
"misp-attribute": "attachment",
6+
"ui-priority": 1
7+
},
8+
"caseNumber": {
9+
"description": "Case number",
10+
"disable_correlation": false,
11+
"misp-attribute": "text",
12+
"multiple": true,
13+
"ui-priority": 1
14+
},
15+
"close-date": {
16+
"description": "Close Date",
17+
"misp-attribute": "datetime",
18+
"ui-priority": 0
19+
},
20+
"creation-date": {
21+
"description": "Creation Date",
22+
"misp-attribute": "datetime",
23+
"ui-priority": 0
24+
},
25+
"language": {
26+
"description": "Language",
27+
"disable_correlation": true,
28+
"misp-attribute": "text",
29+
"sane_default": [
30+
"French",
31+
"Dutch"
32+
],
33+
"ui-priority": 1
34+
},
35+
"modification-date": {
36+
"description": "Modification Date",
37+
"misp-attribute": "datetime",
38+
"ui-priority": 0
39+
},
40+
"text": {
41+
"description": "Free text value",
42+
"disable_correlation": true,
43+
"misp-attribute": "text",
44+
"multiple": true,
45+
"recommended": false,
46+
"ui-priority": 1
47+
}
48+
},
49+
"description": "Administrative Decision",
50+
"meta-category": "misc",
51+
"name": "administrative-decision",
52+
"requiredOneOf": [
53+
"caseNumber",
54+
"creation-date"
55+
],
56+
"uuid": "9d0ac25c-f1cd-425c-87a4-b28bbb15ee2d",
57+
"version": 1
58+
}

‎objects/asn/definition.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,16 @@
5151
"multiple": true,
5252
"ui-priority": 0
5353
},
54+
"name": {
55+
"description": "The official name of the autonomous system",
56+
"misp-attribute": "text",
57+
"ui-priority": 1
58+
},
59+
"organization": {
60+
"description": "The organization who the ASN is registered to",
61+
"misp-attribute": "text",
62+
"ui-priority": 1
63+
},
5464
"subnet-announced": {
5565
"description": "Subnet announced",
5666
"misp-attribute": "ip-src",
@@ -65,5 +75,5 @@
6575
"asn"
6676
],
6777
"uuid": "4ec55cc6-9e49-4c64-b794-03c25c1a6587",
68-
"version": 5
78+
"version": 6
6979
}

‎objects/coin-address/definition.json‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,51 @@
4545
"disable_correlation": true,
4646
"misp-attribute": "text",
4747
"sane_default": [
48-
"BTC",
49-
"ETH",
48+
"ADA",
49+
"ALGO",
50+
"APTOS",
5051
"BCH",
51-
"XRP",
52-
"MIOTA",
53-
"DASH",
52+
"BCC",
53+
"BSC",
54+
"BSV",
55+
"BTC",
5456
"BTG",
55-
"LTC",
56-
"ADA",
57-
"XMR",
58-
"ETC",
59-
"NEO",
60-
"NEM",
57+
"DAI",
58+
"DASH",
59+
"DOGE",
60+
"DOT",
6161
"EOS",
62-
"XLM",
63-
"BCC",
62+
"ETC",
63+
"ETN",
64+
"ETH",
65+
"FIL",
66+
"HSR",
67+
"ICP",
68+
"LTC",
6469
"LSK",
70+
"MKR",
71+
"MIOTA",
72+
"NEM",
73+
"NEO",
6574
"OMG",
75+
"OMI",
76+
"PPT",
77+
"PEPE",
6678
"QTUM",
67-
"ZEC",
68-
"USDT",
69-
"HSR",
79+
"REP",
80+
"SOL",
81+
"STEEM",
7082
"STRAT",
83+
"TRON",
84+
"TRX",
85+
"USDT",
7186
"WAVES",
72-
"PPT",
73-
"ETN"
87+
"XLM",
88+
"XMR",
89+
"XNO",
90+
"XRP",
91+
"XTZ",
92+
"ZEC"
7493
],
7594
"ui-priority": 1
7695
},
@@ -112,5 +131,5 @@
112131
"address-crypto"
113132
],
114133
"uuid": "d0e6997e-78da-4815-a6a1-cfc1c1cb8a46",
115-
"version": 6
134+
"version": 7
116135
}

‎objects/cryptocurrency-transaction/definition.json‎

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,49 @@
1212
"sane_default": [
1313
"BTC",
1414
"ETH",
15-
"BCH",
15+
"USDT",
16+
"SOL",
1617
"XRP",
17-
"MIOTA",
18-
"DASH",
19-
"BTG",
20-
"LTC",
18+
"DOGE",
2119
"ADA",
22-
"XMR",
20+
"BCH",
21+
"LTC",
22+
"DAI",
23+
"DOT",
2324
"ETC",
24-
"NEO",
25-
"NEM",
26-
"EOS",
25+
"ICP",
26+
"FIL",
2727
"XLM",
28-
"BCC",
29-
"LSK",
30-
"OMG",
31-
"QTUM",
28+
"XMR",
29+
"PEPE",
30+
"MKR",
31+
"ALGO",
32+
"EOS",
33+
"XTZ",
34+
"BSV",
35+
"NEO",
36+
"MIOTA",
3237
"ZEC",
33-
"USDT",
34-
"HSR",
35-
"STRAT",
38+
"DASH",
39+
"QTUM",
40+
"OMG",
3641
"WAVES",
42+
"NEM",
43+
"BTG",
44+
"LSK",
45+
"STEEM",
46+
"XNO",
47+
"OMI",
48+
"ETN",
49+
"REP",
3750
"PPT",
38-
"ETN"
51+
"STRAT",
52+
"HSR",
53+
"BCC",
54+
"BSC",
55+
"TRX",
56+
"APTOS",
57+
"TRON"
3958
],
4059
"ui-priority": 1
4160
},
@@ -80,5 +99,5 @@
8099
"address"
81100
],
82101
"uuid": "a4aab70f-e43a-48cb-bf82-505de8228dd6",
83-
"version": 1
102+
"version": 3
84103
}

‎objects/data-url/definition.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"attributes": {
3+
"base64": {
4+
"description": "Is the data base64 encoded or not",
5+
"misp-attribute": "boolean",
6+
"ui-priority": 0
7+
},
8+
"data": {
9+
"description": "The data, as-is, not decoded.",
10+
"misp-attribute": "malware-sample",
11+
"ui-priority": 1
12+
},
13+
"media-type": {
14+
"description": "The mimetype indicating the type of data, without the parameter",
15+
"disable_correlation": true,
16+
"misp-attribute": "mime-type",
17+
"ui-priority": 1
18+
},
19+
"mime-type-parameter": {
20+
"description": "A parameter associated to the mimetype, generally a charset or a boundary.",
21+
"misp-attribute": "text",
22+
"ui-priority": 0
23+
}
24+
},
25+
"description": "URL prefixed with the data: scheme, used to embed inline files in documents",
26+
"meta-category": "file",
27+
"name": "data-url",
28+
"required": [
29+
"data"
30+
],
31+
"uuid": "8b478c14-bfe7-4f99-b370-753637bf60fe",
32+
"version": 1
33+
}

0 commit comments

Comments
 (0)