MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
15,597 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

15597 Commits (9fef5378df13525f0e7475841f126fea850b582a)

Author SHA1 Message Date
Steve Clement 9fef5378df
fix: [bug] Check for non-existen directory fails if exists 2020-07-15 03:52:25 +09:00
Steve Clement 5190346509
Merge branch 'guides' of github.com:SteveClement/MISP into guides 2020-07-14 00:15:16 +09:00
Andras Iklody 784ee2b206
Merge pull request #6110 from RichieB2B/ncsc-nl/unlink 
fix: [StixExport] suppress unlink warnings
 2020-07-12 16:49:05 +02:00
Richard van den Berg 36dafcf8e4 fix: [StixExport] suppress unlink warnings 2020-07-11 20:06:18 +02:00
Andras Iklody f51cdd9c67
Merge pull request #6109 from RichieB2B/nscc-nl/stixfix 
fix: [stix export] log stack trace on error, support 'AMBER NATO ALLI…
 2020-07-10 23:51:24 +02:00
Richard van den Berg d0d233dfd0 fix: [stix export] log stack trace on error, support 'AMBER NATO ALLIANCE' TLP tags 2020-07-10 21:12:27 +02:00
Andras Iklody 2fe7f239a4
Merge pull request #6108 from RichieB2B/ncsc-nl/fix-retention 
fix: [misp_retention] Support objects, use lists for build_complex_qu…
 2020-07-10 19:44:01 +02:00
Richard van den Berg 9b7665b395 fix: [misp_retention] Support objects, use lists for build_complex_query() 2020-07-10 19:40:24 +02:00
chrisr3d 5eb0683168
chg: [stix2 library] Bumped latest version 2020-07-10 14:51:28 +02:00
chrisr3d 30a2dd3140 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2020-07-10 11:54:59 +02:00
chrisr3d 2f69670d36
fix: [stix2 import] Fixed some object reference issues 
- With the newest PyMISP version, the object
  references creation had to get some slight
  changes:
  - We add the referenced object in the event
    before the add the reference between the 2
    objects, when it is possible
  - ** has been removed while calling add_object
    since we are adding already verified MISP
    objects, and using ** was actually the reason
    why the references were not present in the
    objects when they had been created before the
    referenced object were added to the event
 2020-07-10 11:48:57 +02:00
Andras Iklody 6dca14a6b0
Merge pull request #6067 from JakubOnderka/fix-composite-type-uniquenes 
fix: [attributes] Possible duplicate attributes
 2020-07-10 09:59:55 +02:00
Andras Iklody d8b92922f3
Merge pull request #6069 from JakubOnderka/patch-119 
fix: [internal] Missing field for server model when editing event
 2020-07-10 09:59:20 +02:00
Andras Iklody dcee4019cb
Merge pull request #6089 from JakubOnderka/add-attribute-ui-fixes 
chg: [UI] Add attribute fixes
 2020-07-10 09:58:44 +02:00
chrisr3d 5806026658
fix: [stix2 import] Fixed Observable object type checking, following the recent changes on the stix2 python library 2020-07-09 23:15:22 +02:00
chrisr3d 3497466703 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2020-07-09 14:49:13 +02:00
chrisr3d 5f955acce7
fix: [stix upload] Removed 'isset' already tested with 'empty' at the same place 2020-07-09 14:46:38 +02:00
iglocska 2a561d548a
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-07-09 13:44:06 +02:00
iglocska 3736192142
fix: [proposals] re-edded the edit view for propsoals 2020-07-09 13:42:40 +02:00
chrisr3d 6195f81f3e
fix: [opendata export] Fixed resource deletion query creation to avoid silent syntax errors 2020-07-08 15:57:01 +02:00
Alexandre Dulaunoy 46dcb3890f
chg: [misp-galaxy] updated to the latest version 2020-07-08 09:58:16 +02:00
Alexandre Dulaunoy 21efa5d78a
chg: [misp-objects] updated to the latest version 2020-07-08 09:57:29 +02:00
Alexandre Dulaunoy bbcc315ec4
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-07-08 09:56:23 +02:00
Alexandre Dulaunoy 55457ff4d0
chg: [warning-list] updated to the latest version 2020-07-08 09:54:22 +02:00
Andras Iklody 470fd47b40
Merge pull request #6071 from JakubOnderka/patch-120 
fix: [stix] Store synonymsToTagNames.json file in tmp folder
 2020-07-07 12:24:49 +02:00
Andras Iklody bfb2bf1bfd
Merge pull request #6070 from JakubOnderka/cidr-correlation-optim 
Cidr correlation optim
 2020-07-07 12:23:35 +02:00
Andras Iklody 8eaa16c94d
Merge pull request #6036 from JakubOnderka/cache-freetext-feed-optim 
chg: [feed] Faster freetext feed caching
 2020-07-07 12:19:41 +02:00
Andras Iklody 4aa22acfde
Merge pull request #6044 from JakubOnderka/sort-tags-by-name 
chg: [UI] Sort tags by name for server rules
 2020-07-07 12:19:09 +02:00
Andras Iklody e6995dab67
Merge pull request #6035 from JakubOnderka/rest-search-optim 
chg: [internal] Attribute REST search optimisations and error handling
 2020-07-07 12:18:29 +02:00
Andras Iklody aa40f67c8e
Merge pull request #5963 from JakubOnderka/patch-108 
fix: [mail] Contact reporter body
 2020-07-07 12:15:48 +02:00
Andras Iklody e9aa2a284a
Merge pull request #6092 from JakubOnderka/event-ui 
chg: [internal] Simplify and optimise eventUI method
 2020-07-07 11:38:21 +02:00
Andras Iklody 0d7acdfd1f
Merge pull request #6087 from JakubOnderka/zip-ext 
new: [diag] Check if ZIP extension is installed
 2020-07-07 11:37:36 +02:00
chrisr3d a352bc85fa
fix: [stix2 import] Avoid duplication of original-imported-file objects during the import process 
- Duplication can happen when the result of the
  import process is an event that already exists
 2020-07-06 23:25:46 +02:00
iglocska 4693ae3473
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-07-06 16:44:59 +02:00
iglocska c81c47d01a
new: [merge] functionality reworked 
- handle objects, tags, etc via @chrisr3d's module result parsing
- handle sharing groups correctly - as reported by Jakub Onderka
- using standardised fetchers internally
- API enabled (which will directly merge all contents of the source event into the target event)
 2020-07-06 16:43:18 +02:00
mokaddem c5ebc17bd6
Merge branch 'fix-sg-creation' into 2.4 2020-07-06 15:52:42 +02:00
mokaddem 8119dc70b4
Merge remote-tracking branch 'origin/2.4' into fix-sg-creation 2020-07-06 15:52:27 +02:00
Andras Iklody f7983719c7
Merge pull request #6095 from JakubOnderka/shadow-attribute-unused-vol2 
fix: [security] Remove ShadowAttributesController::{getProposalsByUuid,getProposalsByUuidList}
 2020-07-06 12:28:21 +02:00
Jakub Onderka 0d93a45807 fix: [security] Remove ShadowAttributesController::{getProposalsByUuid,getProposalsByUuidList} 
These methods are not used, but they let sync users to access proposals for any event.
 2020-07-06 12:26:43 +02:00
Andras Iklody 64195c418a
Merge pull request #6093 from JakubOnderka/shadow-attribute-unused 
fix: [security] Remove ShadowAttributesController::{fetchEditForm,editField}
 2020-07-06 12:18:12 +02:00
Andras Iklody f0c0fc3a71
Merge pull request #6094 from RichieB2B/ncsc-nl/stop-loop 
fix: [MispObject] Do not unpublish synced events, fixes #4838
 2020-07-06 12:17:03 +02:00
Richard van den Berg b9865f719d fix: [MispObject] Do not unpublish synced events, fixes #4838 2020-07-06 09:17:44 +02:00
Jakub Onderka df6916a312 fix: [security] Remove ShadowAttributesController::{fetchEditForm,editField} 
These methods are not used, but they allow to access attribute data without proper ACL checks.
 2020-07-06 09:08:07 +02:00
Jakub Onderka 7a01fecd14 chg: [internal] Simplify and optimise eventUI method 2020-07-05 16:22:01 +02:00
Jakub Onderka f0a6b9e0ac chg: [UI] Add attribute fixes 2020-07-05 11:33:16 +02:00
Andras Iklody 1154036ffe
Merge pull request #6088 from JakubOnderka/patch-121 
fix: [UI] Attribute category select
 2020-07-05 10:49:46 +02:00
Jakub Onderka 8253fd8fc6 fix: [UI] Attribute category select 2020-07-05 09:32:08 +02:00
Jakub Onderka 812ae3d527 new: [diag] Check if ZIP extension is installed 2020-07-03 16:21:53 +02:00
Andras Iklody ab694cd852
Merge pull request #6075 from JakubOnderka/bool-is-not-array 
fix: [internal] Do not try to access bool as array
 2020-07-03 08:43:41 +02:00
mokaddem 60a9707808
fix: [sharingGroup:captureSharingGroup] Fix failing capture in case of 
roaming mode

- The server list check was incorrect
- When capturing, roaming mode was always defaulted to false
- The logs could not be written due to non-initialized class
 2020-07-02 15:31:47 +02:00