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

10522 Commits (745512e71e09580ae533a1e14dfc3026cd9f9cd2)

Author SHA1 Message Date
Alexandre Dulaunoy da4bca001e
chg: [misp-objects] updated to the latest one 2019-09-16 13:52:19 +02:00
Alexandre Dulaunoy 0a13d56b8f
chg: [taxonomies] updated to the latest version 2019-09-16 13:51:45 +02:00
chrisr3d 5f2f51ed21 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-16 09:38:09 +02:00
iglocska e11490494e
fix: [internal] Added a code branch to check if saddarray is available - if yes, use it 
- for the warninglist model's cacheWarninglistEntries function
 2019-09-16 09:28:43 +02:00
chrisr3d 839321af0e
fix: [stix2] Fixed custom objects parsing when an attribute is multiple 
- Avoids loss of attributes that are multiple,
  during the export, by returning them in a list
- Supporting import of of custom values that are
  in a list, as single multiple attributes
 2019-09-16 09:25:56 +02:00
Andras Iklody d656c2b318
Merge pull request #5097 from JakubOnderka/patch-18 
chg: [feed] Break loop when match is found
 2019-09-16 09:15:37 +02:00
Jakub Onderka 95c78416c7 fix: [UI] Allow to skip pagination in IndexTable 2019-09-15 18:15:56 +02:00
Andras Iklody 3e3318c419
fix: [internal] warninglist missing Redis::sAddArray() fixed 2019-09-15 11:15:34 +02:00
chrisr3d 1c9283f846 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-13 18:19:38 +02:00
chrisr3d 36b40a4185
new: [stix2 export] Parsing relationships between objects 
- Which includes of course relationships between
  objects and objects, and the ones between
  objects and attributes
 2019-09-13 18:15:28 +02:00
chrisr3d d6aabd049c
fix: [stix2 export] Avoids passing variable already contained in another variable passed at the same time 2019-09-13 18:13:03 +02:00
chrisr3d 432879f405
fix: [stix2 export] Removed some useless processing 2019-09-13 16:26:55 +02:00
iglocska b6ba80e26e
fix: [prio] changePriority function responses fixed 2019-09-13 15:50:06 +02:00
iglocska 5002e536ff
chg: [API] /events/view now accepts the deleted parameter via posted parameters too 2019-09-13 15:34:12 +02:00
iglocska 4d0d538ba0
fix: [API] hard delete passable via different methods to /attributes/delete than just ordered URL parameters 2019-09-13 15:18:39 +02:00
iglocska 0f4613ebd3
fix: [internal] Fix post check for attribute delete function via the API 2019-09-13 15:13:09 +02:00
iglocska 626e190afb
fix: [server prio] Don't block the reordering even when the requested move is invalid 
- helps with fixing misaligned server lists
 2019-09-13 15:03:24 +02:00
iglocska b31ea8c18f
fix: [server prio] reprioritise should be more lenient if there's a messed up priority order as the starting point 
- should still return false for the rearranging, but should re-set the priority list based on the current positions
 2019-09-13 14:53:36 +02:00
iglocska 76b1b05a9e
fix: [UI] Attribute search sort by date fixed 2019-09-13 13:51:17 +02:00
iglocska 0a1165dead
fix: [ACL] priority change for servers tied into the ACL 2019-09-13 13:22:23 +02:00
iglocska 7db73b1ee5
fix: [server prio] Automatically put new servers to lowest prio instead of highest 2019-09-13 13:21:46 +02:00
iglocska 850159627a
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-13 11:51:05 +02:00
iglocska ffc9147018
new: [sync] Added sync priority system to prioritise the order of instances to push to 2019-09-13 11:49:12 +02:00
iglocska b004cf0290
fix: [UI] removed obsolete logo preview tool from org add/edit 2019-09-13 10:53:43 +02:00
iglocska 3240a6cac4
new: [CLI] Added cleanup tool to purge all events related to a feed 
- Simply run /var/www/MISP/app/Console/cake Admin purgeFeedEvents [user_id] [feed_id]
- works for CSV/Freetext feeds
 2019-09-13 10:48:43 +02:00
mokaddem 7023f11e26
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-13 09:24:29 +02:00
mokaddem 83ec51ac7c
chg: [decaying:simulation] Disabled sorting on score (will be 
implemented in the next `decaying` version)
 2019-09-13 09:23:07 +02:00
mokaddem d78d407f9b
fix: [decaying:base_score] Create temporary false tags when they are defined in their taxonomy but not created yet 2019-09-13 09:11:05 +02:00
mokaddem 449a95c77a
fix: [decaying:base_score] Single taxonomy appear in the correct namespace 2019-09-13 08:20:20 +02:00
mokaddem 4e5f800a3b
fix: [decaying:base_score] Round base_score config up to 4 digits. 2019-09-13 08:19:48 +02:00
mokaddem e2a0d55348
fix: [decaying] `.json` view in `decaying/view` 2019-09-13 08:17:44 +02:00
Alexandre Dulaunoy 8a9e8667da
Merge pull request #5098 from JakubOnderka/patch-19 
fix: [UI] Fix typo in community view
 2019-09-13 06:41:06 +02:00
mokaddem 3402318fa8
fix: [decaying:import] Force somes fields to be present while importing 
a decaying model
 2019-09-12 18:52:00 +02:00
chrisr3d c0aec75a09 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-12 17:13:19 +02:00
chrisr3d fbb25bad6f
new: [restSearch] restSearch module for ATT&CK Sightings 
- Returning ATTA&CK Sightings in json format for
  events and attributes with mitre-attack-pattern
  galaxies attached
- For further details on the ATT&CK Sightings,
  please visit https://attack.mitre.org/resources/sightings/
- Also thanks to @johnwunder for the clarification
  on the output format
 2019-09-12 17:03:35 +02:00
mokaddem df9fd36518
fix: [decaying] fixed `const` error 2019-09-12 16:33:19 +02:00
mokaddem 1b133062e6
chg: [decaying] Changed `name` column type from `text` to `varchar(255)` 2019-09-12 14:44:09 +02:00
mokaddem ead4f46cf4
fix: [decaying] Correctly add database indexes 2019-09-12 14:28:49 +02:00
mokaddem 813d222bf4
chg: [decaying] Added log entry if formula cannot be loaded 2019-09-12 14:10:17 +02:00
mokaddem cfafc2e51f
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-09-12 13:35:35 +02:00
mokaddem 917b374921
chg: [decaying:(en|dis)able] Converted empty form with built-in cakephp 
`postLink`
 2019-09-12 13:31:23 +02:00
mokaddem 9b7f997443
chg: [decaying] Improve UI when multiple eventTags get overriden by 
attributeTag
 2019-09-12 13:26:26 +02:00
mokaddem 5322527c65
fix: [decaying:simulation] Make sure every sightings have a rounded 
timestamp
 2019-09-12 12:54:38 +02:00
mokaddem fbad1aaff3
chg: [decaying:simulation] Swapped round to floor when rounding 
sightings timestamp
 2019-09-12 11:49:50 +02:00
mokaddem 1a5ab3e79e
fix: [decaying] typo 4 2019-09-12 11:46:12 +02:00
mokaddem 09742c253f
fix: [decaying] typo 3 2019-09-12 11:43:43 +02:00
mokaddem 377e748771
fix: [event] typo 2 2019-09-12 11:40:23 +02:00
mokaddem b2c1a71bc9
fix: [event] typo 2019-09-12 11:38:51 +02:00
mokaddem 54e13a89c3
chg: [decaying:model] Seventh batch of fix from the PR review - WiP (not tested) 2019-09-12 11:35:44 +02:00
mokaddem ad4055cb73
chg: [decaying:model] Sixth batch of fix from the PR review - WiP (not tested) 2019-09-12 11:30:59 +02:00
mokaddem b16945619e
chg: [decaying:model] Fith batch of fix from the PR review - WiP (not tested) 2019-09-12 11:28:32 +02:00
mokaddem 32140b75b5
chg: [decaying:model] Fourth batch of fix from the PR review - WiP (not tested) 2019-09-12 11:23:45 +02:00
mokaddem f6f1310a50
chg: [decaying:model] Third batch of fix from the PR review - WiP (not tested) 2019-09-12 11:17:33 +02:00
mokaddem 1b59a8e192
chg: [decaying:model] Second batch of fix from the PR review - WiP (not tested) 2019-09-12 11:02:39 +02:00
mokaddem a990727db2
chg: [decaying:model] First batch of fix from the PR review - WiP (not tested) 2019-09-12 10:42:53 +02:00
mokaddem 60edb198a7
chg: [database] Added indexes to decaying models and related tables 2019-09-12 10:22:13 +02:00
mokaddem 48c89ea333
chg: [event] applying few PSR2 rules 2019-09-12 10:18:52 +02:00
mokaddem 70f77f7c0e
chg: [decaying:simulation] restSearch comments added to be fixed in next 
decaying version
 2019-09-12 10:16:07 +02:00
mokaddem 5a291d87a5
chg: [decaying] First batch of fix from the PR review - WiP (not tested) 2019-09-12 09:38:15 +02:00
Andras Iklody bf55db64e4
fix: [regression] removed readded invalid acl entry 2019-09-12 06:45:58 +02:00
iglocska fdf1379f3f
fix: [ACL] removed two unused functions 2019-09-11 17:25:49 +02:00
iglocska d49e76ec0d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-11 16:52:40 +02:00
iglocska ed0450faf4
new: [API] verbose output for /servers/update 2019-09-11 16:52:14 +02:00
iglocska 32873d7ebc
fix: [API] Empty strings should be embedded in an array for the JSON output 2019-09-11 16:41:42 +02:00
chrisr3d 1c470fc327 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-11 11:39:37 +02:00
chrisr3d 8bec9e55b9
fix: [stix import] Fixed ttps malware from external stix files parsing 2019-09-11 11:38:52 +02:00
Alexandre Dulaunoy 66a2951674
chg: [misp-objects] updated to the latest version 2019-09-11 09:30:27 +02:00
iglocska 7b749aec11
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-11 09:29:36 +02:00
iglocska 290a92808d
fix: [customauth] default setting for use_header_namespace should adhere to what is displayed (true) 
- as requested by the MELiCERTES consortium for CSP
 2019-09-11 09:28:45 +02:00
Andras Iklody db3a5fd646
Merge pull request #5106 from JakubOnderka/composer-requirements 
chg: Put require PHP version and extension into composer.json
 2019-09-11 07:04:28 +02:00
chrisr3d 25d5ed6447
fix: [stix import] Additional test if leveraged ttps are not None to avoid issues 2019-09-10 16:15:34 +02:00
chrisr3d 1e57e73fb3
add: [stix import] Importing Galaxies supported during stix export 2019-09-10 15:47:59 +02:00
mokaddem 6b9c600ce5
fix: [decaying:tool] Replaced `title` function into `text` 2019-09-10 15:46:40 +02:00
mokaddem 35e2c62947
chg: [app] bumped queryversion 2019-09-10 15:43:20 +02:00
mokaddem f3860ade80
Merge remote-tracking branch 'origin/2.4' into decaying 2019-09-10 15:40:25 +02:00
iglocska 8a8ac9852c
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-10 15:23:31 +02:00
iglocska 77f767ff02
fix: [internal] blackhole function default fixed 2019-09-10 15:22:55 +02:00
chrisr3d 8d0c11d54e
add: [stix export] Exporting Branded Vulnerability galaxies 2019-09-10 15:22:35 +02:00
chrisr3d f025bb583c
fix: [stix export] Typo on course of action galaxy type 2019-09-10 13:23:19 +02:00
chrisr3d decaa0ad95
fix: [stix export] Making the validator happy with capec ids 2019-09-10 13:22:39 +02:00
Jakub Onderka 609998e24c
fix: [feed] When fetching feeds, accept also text/plain in HTTP 2019-09-10 12:21:42 +02:00
Andras Iklody ab1f0def3d
Merge pull request #5125 from JakubOnderka/patch-25 
fix: Require exact monolog version 1.24
 2019-09-10 11:32:52 +02:00
Andras Iklody 6b42f089cd
Merge pull request #5129 from JakubOnderka/array-copy-remove 
chg: [users] Remove unused method UsersController::arrayCopy
 2019-09-10 11:32:30 +02:00
chrisr3d b97e04eeec
fix: [stix export] Avoiding custom vocabularies for an easier parsing of the result file 2019-09-10 11:01:57 +02:00
iglocska 42a9e533b2
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-10 10:25:42 +02:00
iglocska e6e5f737d3
fix: [ACL] Added resetremoteauthkey to the ACL system 2019-09-10 10:25:14 +02:00
Jakub Onderka 15f572c627
Merge branch '2.4' into composer-requirements 2019-09-10 09:35:08 +02:00
Jakub Onderka 1cd2ff5ca6 chg: [users] Remove unused method UsersController::arrayCopy 2019-09-09 23:37:37 +02:00
Jakub Onderka 50a0f564c6
fix: [audit] Correct title in audit log when admin edit user 2019-09-09 19:34:38 +02:00
Alexandre Dulaunoy 6e78bb654f
chg: [misp-galaxy] updated to the latest version 2019-09-09 16:05:07 +02:00
iglocska d1e3f0455a
fix: [sync] Post test fixed for sync users 2019-09-09 15:36:30 +02:00
iglocska 226ccd6de5
chg: [sync] Further improvements to the connection test logging 2019-09-09 15:35:05 +02:00
iglocska 6580e951e0
chg: [sync] Connection test POST test logs the full response, not just the expected part 2019-09-09 15:27:36 +02:00
iglocska 33f7444fe9
new: [auth key fail logging throttle] Throttle the auth key failed log entries to 1 / hour / key 2019-09-09 14:09:18 +02:00
Jakub Onderka ad331e8c06
fix: Require exact monolog version 1.24 2019-09-09 13:29:51 +02:00
iglocska e89d1a267d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-09 13:03:09 +02:00
iglocska 75acd63c46
fix: [security] Fix to a vulnerability related to the server index 
- along with various support tools
- more information coming soon
 2019-09-09 13:00:21 +02:00
mokaddem 73babe7bf7
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-09-09 11:30:10 +02:00
mokaddem 901a70eb04
chg: [decaying:update] Added a warning in case the folder is empty 2019-09-09 11:27:27 +02:00
mokaddem 4b4b4ced4e
chg: [server:submodule_version] Whitelisted `misp-decaying-models` for 
the UI
 2019-09-09 10:59:31 +02:00
mokaddem 768b7ef7d5
chg: [gitmodule] Added git-submodule `misp-decaying-models` 2019-09-09 10:56:41 +02:00
Sami Mokaddem 936a745135
Merge pull request #5119 from JakubOnderka/patch-24 
fix: [UI] Removed duplicate button title in userIndexTable.ctp
 2019-09-09 09:26:37 +02:00
chrisr3d 3e70fb6ea9
fix: [stix export] Specifying tool name for mitre-tool galaxies 2019-09-09 08:51:26 +02:00
chrisr3d 8fe319c12c Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-09 08:33:05 +02:00
Andras Iklody 65be5dfc03
Merge pull request #5120 from JakubOnderka/gpg-composer 
Install Crypt_GPG by composer
 2019-09-08 22:20:14 +02:00
Alexandre Dulaunoy bd7f7b7b3a
Merge pull request #5103 from JakubOnderka/circl-key-server-description 
fix: [UI] GPG keys are fetched from CIRCL keyserver
 2019-09-08 09:20:15 +02:00
Jakub Onderka 4b1645a54e fix: Throw exception when GnuGP homedir is not set 2019-09-07 00:01:55 +02:00
Jakub Onderka becee3b772 chg: Install crypt_gpg by composer 2019-09-06 22:00:56 +02:00
Jakub Onderka 863e38807d chg: Allow to load Crypt_GPG from composer 2019-09-06 21:31:16 +02:00
Jakub Onderka a0733e6429
fix: [UI] Removed duplicate button title in userIndexTable.ctp 2019-09-06 18:48:33 +02:00
chrisr3d 7d20e30df2 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-06 17:42:48 +02:00
chrisr3d eebeeb9804 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 17:07:30 +02:00
chrisr3d 9d3e340b52
fix: [stix2 import] Fixed hash patterns import for external STIX files 2019-09-06 17:06:38 +02:00
mokaddem 1d378fd7bd
Merge remote-tracking branch 'origin/2.4' into decaying 2019-09-06 16:21:17 +02:00
mokaddem e3fea69f5e
chg: [decaying:import] When importing a model, mapping is imported as custom mapping 2019-09-06 16:09:39 +02:00
Jakub Onderka f63cfc9c5a
fix: [UI] Fetching GPG keys 
This error was introduced in 600e540516
 2019-09-06 15:56:01 +02:00
iglocska 36ef32392e
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 15:55:41 +02:00
iglocska 5e1a26afa0
fix: [internal] orgs restricted to a domain displayed incorrectly 
- afterfind messes up the keys by reusing the same var for an inner loop
 2019-09-06 15:54:58 +02:00
mokaddem ecbea013a1
fix: [decaying:import] imported models from directory are correctly 
saved as default
 2019-09-06 15:50:24 +02:00
mokaddem 0d0002ee70
fix: [decaying:import] Correctly remove id, uuid and preserve the import 
data
 2019-09-06 15:42:52 +02:00
mokaddem 21b2da356e
chg: [decaying] Round all sightings at once 2019-09-06 15:33:18 +02:00
mokaddem e3b78bbac9
chg: [decaying:simulation] Support of `score` on-the-fly threshold 
override
 2019-09-06 15:19:33 +02:00
mokaddem 515f0572df
chg: [decaying] Added alias `score` to override on-the-fly the treshold 
of a model
 2019-09-06 14:55:12 +02:00
Jakub Onderka 6f4b99026e
chg: [user] Remove unused private method 2019-09-06 13:59:47 +02:00
mokaddem 3f57d600d0
chg: [decaying] `includeFullModel` parameter support in the UI 2019-09-06 11:43:08 +02:00
mokaddem 893dd617c8
chg: [attribute:restSearch] New paramter `includeFullModel` to attach 
full model information
 2019-09-06 11:32:54 +02:00
mokaddem 519ec416ea
fix: [event:view] Toggle boolean buttons 2019-09-06 11:22:14 +02:00
chrisr3d a2a97ae52a
fix: [stix export] Exporting tool type 
- Type is what we call galaxy name, for instance
  Tool, Enterprise Attack - Tool, etc.
 2019-09-06 11:15:21 +02:00
iglocska b2e026b9ef
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-06 11:08:17 +02:00
iglocska 41f5c88c74
fix: [sync] Fixed major performance blocker 
- fix based on the insights of @RichieB2B, the hero we need, not the one we deserve
- added orgc_uuid to the minimal event index
- added handlers for it on the pull side
- when pulling from old instances the new functionality is skipped, resulting in the behaviour we had pre-patch
- both sides of the sync are encouraged to update, especially if the slow pulls are causing issues
 2019-09-06 10:59:48 +02:00
chrisr3d d48aa740a1
fix: [stix export] Exporting malware type 
- Type is what we call galaxy name, for instance
  Stealer, Malware, Ransomware, etc.
 2019-09-06 10:55:33 +02:00
Andras Iklody 15d38ed898
Merge pull request #5115 from RichieB2B/ncsc-nl/speedup-pull 
Speedup pull
 2019-09-06 09:52:54 +02:00
chrisr3d 48dbf2388b
add: [stix import] Importing attack pattern galaxies 2019-09-05 21:18:18 +02:00
Jakub Onderka 7904509fde fix: [feed] Fetching event manifest 2019-09-05 19:16:26 +02:00
Richard van den Berg e53ec5b0c8 Log reason for event download failure 2019-09-05 15:29:23 +02:00
Richard van den Berg 9ebd5f21be Log all errors from server pull 2019-09-05 15:22:38 +02:00
Richard van den Berg c2b0172549 Loose a find when adding existing event 2019-09-05 10:42:08 +02:00
Jakub Onderka be81d72c55 chg: Set composer vendor dir right in composer.json 2019-09-04 21:41:07 +02:00
Jakub Onderka c44b53fd31 chg: Put require PHP version and extension into composer.json 2019-09-04 19:58:38 +02:00
Jakub Onderka 2ea4b37368 fix: [UI] GPG keys are fetched from CIRCL keyserver 2019-09-04 18:09:49 +02:00
chrisr3d d783e0d039 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-04 16:21:37 +02:00
chrisr3d a19029c8ec
fix: [stix2 import] Dealing with the case of named pipe attribute being imported from custom object 2019-09-04 16:20:39 +02:00
chrisr3d dc98e1bc56
fix: [stix2 export] Avoid fails with named pipe export as custom object 2019-09-04 16:20:05 +02:00
Andras Iklody 0cb0aa1dac
Merge pull request #5101 from JakubOnderka/patch-20 
chg: [user] Use machine readable format for fetching PGP keys
 2019-09-04 15:36:34 +02:00
Andras Iklody 62a9c73c9e
Merge pull request #5052 from JakubOnderka/error-handling 
Better error handling for fetching feeds
 2019-09-04 15:35:03 +02:00
Jakub Onderka dc0cf472d3
fix: [UI] Remove rest of unused code 
Inner code was removed in 3f03ceb229
 2019-09-04 14:52:12 +02:00
Jakub Onderka 600e540516
chg: [user] Use machine readable format for fetching PGP keys 2019-09-04 13:10:37 +02:00
chrisr3d 6b2eaa9fe2
add: [stix import] Importing pipe objects as named pipe attribute 2019-09-04 11:32:21 +02:00
chrisr3d 3d5981bcb0
add: [stix export] Exporting named pipe attributes 2019-09-04 11:20:54 +02:00
Jakub Onderka 08064d3eec
fix: [UI] Fix typo in community view 2019-09-03 20:57:08 +02:00