MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
9,890 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

9890 Commits (d65292726193f820ebdc70c90e5c6604084d5152)

Author SHA1 Message Date
iglocska d652927261 Merge branch 'weekend_fixes' into 2.4 2018-10-28 14:28:08 +01:00
iglocska ea820888ef Merge branch '2.4' of github.com:MISP/MISP into HEAD 2018-10-28 14:25:26 +01:00
iglocska e22ed38d5b fix: [thumbnail] Thumbnail visualisation broken on proposals, fixes #3793 2018-10-27 23:08:31 +02:00
iglocska 168fd9f3b0 fix: [server] Allow certificates to be uploaded with other extensions besides .pem, fixes #3797 2018-10-26 21:14:22 +02:00
Alexandre Dulaunoy 78375eac91
Merge pull request #3808 from FloatingGhost/2.4 
Fix: AWS Errors when given empty array of elements
 2018-10-26 13:18:30 +02:00
Hannah Ward 608ddaa969
fix: aws would error if asked to del non-existing 2018-10-26 11:01:44 +01:00
chrisr3d ec7cd9b1fd
fix: [stix import] Avoided import of empty header description 2018-10-26 11:35:31 +02:00
chrisr3d 3d694bf6f1 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-26 10:25:43 +02:00
Alexandre Dulaunoy 7d0188b06f
Merge pull request #3804 from 8ear/patch-1 
Update CONFIG.SMIME.md
 2018-10-26 10:00:55 +02:00
chrisr3d 0ab66374c9
fix: [stix export] Avoided putting Incident object as attribute everywhere 
- Incident is now a class attribute
- It also let us make the function parsing some
  not really common attribute types lighter by
  putting a conditionnal statement in another
  function
 2018-10-26 09:58:11 +02:00
chrisr3d 2731f3f6a5
fix: [stix export] Made 'header_comment' a list so we don't overwrite the value 
- There should only be one attribute matching the
  condition per event, but it is juste to be sure
 2018-10-26 09:40:10 +02:00
chrisr3d f27b69cfac
add: [stix export] Exporting STIX header description from the corresponding comment attribute 2018-10-26 09:34:34 +02:00
Steve Clement 94eb322981
Merge pull request #3802 from SteveClement/guides 
chg: [tools] RHEL7 update status and added gitchangelog to document creation toolchain.
 2018-10-26 07:13:14 +09:00
Alexandre Dulaunoy 702301565b
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-25 17:54:01 +02:00
Alexandre Dulaunoy 269e75d573
chg: [misp-objects] forensic objects added 2018-10-25 17:53:28 +02:00
Andras Iklody 3a0168f7a6
Merge pull request #3803 from garanews/2.4 
fix accommodate misspelling
 2018-10-25 17:36:02 +02:00
chrisr3d 60548dc184
add: [stix import] Importing STIX header description as comment attribute 2018-10-25 16:41:31 +02:00
Raphaël Vinot 8018084194 chg: Bump misp-galaxy & taxonomies 2018-10-25 10:22:56 -04:00
Max H 9030a7e06e
Update CONFIG.SMIME.md 
Include code blocks.
 2018-10-25 12:53:10 +02:00
garanews 4866b7035a fix accommodate misspelling 
accommodate vs accomodate
 2018-10-25 11:37:02 +02:00
Alexandre Dulaunoy 8363727674
Merge pull request #3799 from garanews/patch-1 
fix separate misspelling
 2018-10-25 09:54:30 +02:00
Alexandre Dulaunoy 82d21e17b6
Merge pull request #3800 from garanews/patch-2 
fix referred misspelling
 2018-10-25 09:53:20 +02:00
garanews aaa14a9ace
fix referred misspelling 
referred vs refered
 2018-10-25 09:48:12 +02:00
Steve Clement 3ba4f09286 chg: [docs] Added note on RHEL unmaintainability at this point of time, by the core team. 2018-10-25 16:38:15 +09:00
garanews 4501338233
fix separate misspelling 
separate vs seperate
 2018-10-25 09:12:17 +02:00
Steve Clement 54cb2f12e7 Merge branch '2.4' into guides 2018-10-25 12:58:17 +09:00
Steve Clement 362f03ee00 chg: [tools] Updated gitchangelog.rc for latest version of toll, added to doc generator. 2018-10-25 12:57:13 +09:00
Steve Clement 1a4bc58502
Merge pull request #3798 from SteveClement/guides 
chg: [docs] Major INSTALL Guide update
 2018-10-25 12:52:35 +09:00
Steve Clement 4f93a3f06f chg: [docs] Added generic sections to debian guides. 2018-10-25 12:48:39 +09:00
Steve Clement 14c23958b8 new: [docs] Added new sub-sections in seperate files that are shared between install guides. 
new: [docs] ethX.md to bring back eth0
new: [docs] mail to misp install debian flavored guide
new: [docs] ssdeep install debian flavored guide
new: [docs] viper install debian flavored guide
new: [docs] sudo/etckeeper install debian flavored guide
new: [docs] misp dashboard install debian flavored guide
 2018-10-25 12:28:51 +09:00
Steve Clement e752a761af new: [docs] Added 3 generic documentation files, one where the MISP install is completed, A specific centos/etc... one because, well, CentOS.. and the generic recommended actions section that kept repeating in all guides. 
chg: [docs] Implemented the above 3 files in all the guides. Plus some format changes.
 2018-10-25 10:07:02 +09:00
Steve Clement f51b5275d6 new: [docs] Added generic notice about community contributed doc maintenance. 2018-10-25 08:44:14 +09:00
Steve Clement db244c8a96 chg: [docs] Added a generic directory where all the platform independent files should reside. 
chg: [docs] Added MISP Defaults via the cake command to seperate file.
 2018-10-25 08:30:57 +09:00
Alexandre Dulaunoy af0fb30869
chg: [misp-galaxy] updated to the latest version 2018-10-24 23:18:53 +02:00
Alexandre Dulaunoy fbebdc4a14
chg: [misp-objects] updated to the latest version (including many new objects) 2018-10-24 23:17:57 +02:00
iglocska e854428ec3 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-24 23:04:27 +02:00
Steve Clement 13974fb206
Merge pull request #3726 from pettai/shibb 
add date_created for provisioned users
 2018-10-24 20:11:37 +09:00
Steve Clement c21a62a92a
Merge pull request #3794 from SteveClement/guides 
chg: [docs] The debian install docs are now fully functional and quite a few format changes to some of the install guides.
 2018-10-24 18:52:23 +09:00
Steve Clement fe5735cc73 new: [docs] Added globalVariables files to be included by all Install Guides 
chg: [tools] Updated dependencies on docs creator
chg: [docs] Some minor changes to Ubuntu Install guide and added VariableglobalVariables
chg: [docs] Updated mkdocs.yml with new dependencies
 2018-10-24 18:48:24 +09:00
Steve Clement 51d694e2a8 chg: [docs] More formatting updates and evened both versions out. 2018-10-24 18:42:16 +09:00
Steve Clement 708ee4744d chg: [docs] Compared with bootstrap.sh and added missing dependencies and tools. 2018-10-24 18:20:13 +09:00
chrisr3d fa462f5db5 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-10-24 11:08:22 +02:00
chrisr3d 238cc35b33
fix: [stix import] Importing uuids for objects from external sources 2018-10-24 11:07:46 +02:00
Steve Clement b1cfcfc0b1 chg: [docs] Added note on when Kali was last tested working. Added RHEL 7.6 BETA to index. 2018-10-24 16:22:36 +09:00
Steve Clement 1d011ac9a9 chg: [docs] Leveled both install docs, updated debian testing and verified working. 2018-10-24 16:18:38 +09:00
Steve Clement af883df21b chg: [docs] Minor regression, fixed. 2018-10-24 16:18:14 +09:00
chrisr3d c3a7fd27ff
fix: [stix import] Importing uuids for STIX files generated via MISP 2018-10-24 08:25:24 +02:00
Steve Clement 93dbc6f9ca chg: [tools] Changed testForBinExec as the x-sharedlib type is not only on OpenBSD, Debian has the same type when check if executable. 
chg: [tools] Added typeinfo to the return so you see in the UI what type it thinks it is. (In case you forced the parameter on the CLI)
 2018-10-24 09:22:47 +09:00
chrisr3d 58c48878ea
fix: [stix import] Improved uuid fetching 2018-10-23 16:40:47 +02:00
chrisr3d 9513c8437d
fix: [stix import] Better event & attribute distribution parsing 2018-10-23 16:37:13 +02:00