Commit Graph

1114 Commits (519ca09b25945961735dc3c09771916e0485641f)

Author SHA1 Message Date
Alexandre Dulaunoy 519ca09b25
Merge branch 'C00kie--main' into main 2020-09-03 12:09:44 +02:00
Alexandre Dulaunoy 46b6f79cfd
chg: [keybase] description updated 2020-09-03 12:08:13 +02:00
Alexandre Dulaunoy ae3158e3fa
chg: [keybase] updated 2020-09-03 12:02:37 +02:00
Alexandre Dulaunoy 1d870bf238
chg: [restore] file 2020-09-03 12:01:26 +02:00
Alexandre Dulaunoy b0ef3a0c21
Merge branch 'main' of https://github.com/C00kie-/misp-objects into C00kie--main 2020-09-03 11:58:06 +02:00
Pauline Bourmeau 2e5d994deb Revert "added description field in attributes"
This reverts commit 3224f78d4f.
2020-09-03 11:55:31 +02:00
Alexandre Dulaunoy 009a2ef870
Merge branch 'main' of https://github.com/C00kie-/misp-objects into C00kie--main 2020-09-03 11:09:43 +02:00
Pauline Bourmeau 496f4bd030 jq-ed file 2020-09-03 11:05:21 +02:00
Pauline Bourmeau 3224f78d4f added description field in attributes 2020-09-03 11:00:38 +02:00
Alexandre Dulaunoy ad1f1cc3bb
chg: [doc] MISP object template 2020-09-03 10:34:08 +02:00
Alexandre Dulaunoy 12fc65cc67
chg: [doc] example was broken 2020-09-03 10:31:31 +02:00
Alexandre Dulaunoy 8d005061f3
chg: [doc] README 2020-09-03 10:30:28 +02:00
Pauline Bourmeau a3fd21d39d fixed comments 2020-09-03 10:02:30 +02:00
Pauline Bourmeau 5e7152714b first addition of keybase object 2020-09-03 09:41:12 +02:00
Alexandre Dulaunoy d35cd2d47f
chg: [jq] all the things 2020-08-28 16:45:47 +02:00
Alexandre Dulaunoy 3c1c9e5dd0
Merge pull request #284 from C00kie-/patch-5
added json multiple objects twitter-following and twitter-followers
2020-08-28 16:43:38 +02:00
Pauline Bourmeau da3c168506
Update definition.json 2020-08-28 16:41:01 +02:00
Alexandre Dulaunoy 939a950d87
chg: [jq] all the things 2020-08-28 16:33:05 +02:00
Alexandre Dulaunoy 67581394e4
Merge pull request #283 from C00kie-/patch-3
added multiple json object for following and followers
2020-08-28 16:31:38 +02:00
Pauline Bourmeau 50288b806c
Update definition.json 2020-08-28 16:27:41 +02:00
Alexandre Dulaunoy 55d1da8a01
Merge pull request #282 from C00kie-/patch-1
Update definition.json
2020-08-28 16:17:31 +02:00
Pauline Bourmeau d76f21d8b5
Update definition.json 2020-08-28 16:15:57 +02:00
Alexandre Dulaunoy ca42ea1861
Merge branch 'C00kie--main' into main 2020-08-28 16:10:59 +02:00
Alexandre Dulaunoy a168037d93
chg: [jq] all the things 2020-08-28 16:10:42 +02:00
Alexandre Dulaunoy 894ab6e24b
Merge branch 'main' of https://github.com/C00kie-/misp-objects into C00kie--main 2020-08-28 16:10:12 +02:00
Alexandre Dulaunoy c487e73b86
chg: [jq] all the things 2020-08-28 16:08:39 +02:00
Pauline Bourmeau 794063dfe9
Update definition.json 2020-08-28 16:05:33 +02:00
Pauline Bourmeau 9fd1f78b5a
Update definition.json 2020-08-28 16:05:05 +02:00
Pauline Bourmeau b698ccb724
Update definition.json 2020-08-28 16:04:23 +02:00
Alexandre Dulaunoy 90b0390ad5
chg: [relationships] update relationships with space 2020-08-28 15:43:12 +02:00
Alexandre Dulaunoy 83d3aa6a92
chg: [tools] now using main branch instead of master while generating
documentation
2020-08-28 11:31:26 +02:00
Alexandre Dulaunoy 6b6c136b9c
chg: [vulnerability] vulnerability is is now a vulnerability type
The vulnerability type is an official CVE number.

We might need to add in the future a new attribute in the object
for non-CVE id of a vulnerability or adding other id type in the object.

This commit fixes #234
2020-08-28 11:23:10 +02:00
Alexandre Dulaunoy fbe850e6c4
Merge branch 'main' of github.com:MISP/misp-objects into main 2020-08-24 13:33:10 +02:00
Alexandre Dulaunoy 9de2be3c71
chg: [schema] new types added 2020-08-24 13:18:53 +02:00
Alexandre Dulaunoy 49754d9f29
Merge pull request #276 from rmkml/main
add SHA3 Hash on definition.json
2020-08-24 12:37:54 +02:00
rmkml cd49fe8d97 add SHA3 Hash on definition.json 2020-08-23 19:30:17 +02:00
Alexandre Dulaunoy 842d128ef3
chg: [misp-objects] newline newline newline is the evil 2020-08-20 10:53:06 +02:00
Alexandre Dulaunoy dc70db0204
chg: [pe] multiple is true not 1 ;-) 2020-08-20 10:44:41 +02:00
Alexandre Dulaunoy 0c863f194f
chg: [pe] richpe 2020-08-20 10:39:49 +02:00
Andras Iklody 4a671ca739
chg: [RichPE] added 2020-08-20 10:14:35 +02:00
Alexandre Dulaunoy 115e503c6d
Merge branch 'rmkml-main' into main 2020-08-18 07:55:01 +02:00
Alexandre Dulaunoy bfec61d8b0
chg: [file] jq 2020-08-18 07:54:42 +02:00
Alexandre Dulaunoy 7fdfbd4110
UUID must be the same 2020-08-18 07:44:12 +02:00
rmkml 5bdc6c6592 add vhash (VirusTotal Hash) on definition.json 2020-08-17 17:35:58 +02:00
Alexandre Dulaunoy bc4cabba65
Merge pull request #269 from emilhf/additional-dns-records
Add more rrtypes to dns-record
2020-08-15 18:16:05 +02:00
Emil Henry Flakk 097ea8c76c Add more rrtypes to dns-record 2020-08-15 14:57:53 +02:00
Alexandre Dulaunoy 2902024f5f
chg: [doc] misp-objects list updated 2020-08-12 10:07:57 +02:00
Alexandre Dulaunoy a9d51da83c
chg: [license] clarify the license of MISP objects and software
The MISP objects JSON template are dual-licensed under CC-0 or 2-clause
BSD (like the taxonomies).

Only the software in /tools is under the AGPL.

Fix #266

Ref: https://drewdevault.com/2020/07/27/Anti-AGPL-propaganda.html
Ref: https://opensource.google/docs/using/agpl-policy/
Ref: https://www.misp-project.org/license/#agpl-affero-general-public-license---misp-point-of-view
2020-08-12 08:46:39 +02:00
Andras Iklody b768b2d735
Merge pull request #265 from VVX7/master
chg: [dev] add Parler app objects
2020-07-06 08:32:00 +02:00
VVX7 7bbcf0ed78 chg: [dev] add Parler app objects 2020-07-05 22:03:16 -04:00