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

15877 Commits (2044541f41d86d5132e32d24cf37f720dc05c925)

Author SHA1 Message Date
mokaddem 2044541f41
chg: [galaxyClusters:view] Renamed extended_by/from with forked_by/from 2020-07-15 13:51:27 +02:00
mokaddem 05cb5cd37f
chg: [galaxyClusters:add] Improved form layout and galaxy element ui 2020-07-15 13:45:38 +02:00
mokaddem a8cf7de3ee
chg: [galaxyClusters] Added more entries in side menu 2020-07-15 13:35:33 +02:00
mokaddem b0afacaf7c
chg: [restResponseComponent] Added doc for rest client 2020-07-15 10:24:49 +02:00
mokaddem 9b7ba25b27
fix: [galaxyCluster] Make sure the value is not empty while saving 2020-07-15 10:01:59 +02:00
mokaddem 0b940a61f8
chg: [restResponseComponent] Added doc for cluster and cluster relations 2020-07-15 10:01:18 +02:00
mokaddem b3dbecb318
Merge branch '2.4' of github.com:MISP/MISP into galaxy-cluster2.0 2020-07-14 16:25:04 +02:00
mokaddem 4b46b06809
chg: [galaxyClusters:selectCluster] Only offers non-deleted clusters 2020-07-14 16:23:36 +02:00
Jakub Onderka c161e25372
Merge pull request #6117 from JakubOnderka/delete-object-proposal 
fix: [proposals] Delete proposals for object attributes
 2020-07-14 16:01:58 +02:00
mokaddem 70f1ccf231
chg: [galaxyCluster:publish] Slightly simplified save process 2020-07-14 14:43:52 +02:00
iglocska c0bc1a0c67
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-07-14 14:33:39 +02:00
iglocska b3550b48f3
fix: [security] xss fix missing part of solution 
- the previous fix to the xss in the homepage setter was lacking the controller changes due to a partial commit (#bf4610c947c7dc372c4078f363d2dff6ae0703a8)

  - as originally discovered by Mislav Božičević <mislav.bozicevic@nn.cz>
  - persistence of the vulnerability after the lacking fix reported by DIEGO JURADO PALLARES from Ciberinteligencia
 2020-07-14 14:26:11 +02:00
Christophe Vandeplas 1c3898c2b8
fix: minor typo 2020-07-14 14:20:20 +02:00
Steve Clement 8bbce5bdf8
fix: [installer] Installer was broken, now fixed 2020-07-15 04:14:19 +09:00
mokaddem 45d1b3c109
chg: [galaxyClusters:publish] Return job id if rest call 2020-07-14 13:49:04 +02:00
Jakub Onderka c2faaca1a3 fix: [proposals] Delete proposals for object attributes 2020-07-14 12:34:29 +02:00
Steve Clement 02012e3881
Merge pull request #6116 from SteveClement/guides 2020-07-14 19:13:52 +09:00
Steve Clement 9fef5378df
fix: [bug] Check for non-existen directory fails if exists 2020-07-15 03:52:25 +09:00
Jakub Onderka dc03e8fd24
Merge pull request #6114 from JakubOnderka/remove-cidr 
fix: [internal] Remove unused CidrComponent and CIDRTool classes
 2020-07-14 12:06:13 +02:00
Jakub Onderka db7f471a6a fix: [internal] Remove unused Event::setSimpleConditions method 2020-07-14 10:34:52 +02:00
Jakub Onderka 39f3acba34 fix: [internal] Remove unused CidrComponent and CIDRTool classes 2020-07-14 10:29:32 +02:00
mokaddem dc28348684
chg: [ACLComponent] Added cluster blocklist endpoints 2020-07-14 08:24:37 +02:00
mokaddem 117d77e026
chg: [clusterBlocklist:index] Added base url in table actions 2020-07-14 08:10:33 +02:00
Jakub Onderka 3afcf1e070
Merge pull request #5929 from JakubOnderka/fuzzy-purge 
fix: [correlations] Purge ssdeep table after attribute delete
 2020-07-13 22:48:10 +02:00
Jakub Onderka 2978d17313
Merge pull request #6113 from JakubOnderka/freetext-fixes-vol2 
chg: [freetext] Various code fixes and optimisations
 2020-07-13 21:28:28 +02:00
Jakub Onderka 3df94f868f chg: [freetext] Various code fixes and optimisations 2020-07-13 21:12:26 +02:00
Jakub Onderka 80c8249b20
Merge pull request #6085 from JakubOnderka/event_log_fix 
fix: [audit] Show all attribute changes in event history
 2020-07-13 18:00:53 +02:00
Jakub Onderka 9f8a198eaa
Merge pull request #6091 from JakubOnderka/existence-checking 
fix: [internal] Do not check event existence twice
 2020-07-13 17:31:30 +02:00
Jakub Onderka 7f2f4d84c4
Merge pull request #6097 from JakubOnderka/freetext-fixes 
fix: [freetext] Handle IPv6 and punycode domains when import
 2020-07-13 17:26:41 +02:00
Steve Clement 5190346509
Merge branch 'guides' of github.com:SteveClement/MISP into guides 2020-07-14 00:15:16 +09:00
mokaddem 45ad28be5d
chg: [galaxyCluster] Prevent creation if UUID is in blocklist. Added 
default distribution fallback
 2020-07-13 16:48:14 +02:00
mokaddem d11bcb0801
chg: [clusterBlocklist:delete] Possibility to delete entry by cluster_uuid 2020-07-13 15:41:33 +02:00
Jakub Onderka a34141c099 chg: [internal] More tests for ComplexTypeTool::checkFreeText 2020-07-13 15:29:17 +02:00
mokaddem 19d17ad12a
chg: [clusterBlocklist] Added forms and endpoints to interract with the 
model
 2020-07-13 15:26:55 +02:00
iglocska ded8ed50a5
chg: [version] bump 2020-07-13 15:01:28 +02:00
mokaddem cd1712761a
chg: [galaxyCluster:delete] Creates entry in cluster blocklist whenever 
hard-deleting
 2020-07-13 12:48:11 +02:00
mokaddem 2051880b3f
new: [GalaxyCluster] Added soft and hard deletion 2020-07-13 12:34:58 +02:00
iglocska a940e943d5
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-07-13 12:34:52 +02:00
Steve Clement ad0587fb71
fix: [installer] Update to latest 2020-07-14 00:17:32 +09:00
Jakub Onderka 06c7af4f83 chg: [internal] Simplified ComplexTypeTool::checkFreeText 2020-07-13 12:24:52 +02:00
iglocska bf4610c947
fix: [security] setting a favourite homepage was not CSRF protected 
- a user could be lured into setting a MISP home-page outside of the MISP baseurl
- switched the endpoint to be CSRF protection enabled

- as discovered by Mislav Božičević <mislav.bozicevic@nn.cz>
 2020-07-13 12:19:11 +02:00
mokaddem 724de8a759
new: [clusterBlocklist] Added initial blocklist similar to the event one 2020-07-13 11:14:56 +02:00
Jakub Onderka e908a80656 fix: [internal] Reduce number of regexp in refang table 2020-07-13 10:13:26 +02: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
mokaddem 1333dea1fe
fix: [server:pull] Make sure to update the job progress only if we are 
running in a background job
 2020-07-10 17:59:09 +02:00