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

8191 Commits (66ae444957a9c0be76925b7f6d7a7936d64f69dc)

Author SHA1 Message Date
iglocska 515bf89766 fix: [tag collections] Fixed several bugs linking to the wrong tag collection when attaching them to an event/attribute 2019-01-01 19:20:49 +01:00
iglocska 783214f840 fix: [tag collections] Fixed an issue where if a collection was added that already had all tags attached from before, the process would get stuck with no feedback to the user 2019-01-01 19:09:46 +01:00
iglocska b608ce841b fix: [taxonomies] Tag list empty fixed 2019-01-01 18:37:27 +01:00
iglocska 8f9c6c1be6 Merge branch '2.4' into tag_collections 2019-01-01 17:38:32 +01:00
iglocska 6e8afdaa3a new: [tag collections] Add default tag collection per instance 2019-01-01 17:11:10 +01:00
iglocska 760dbed37d new: [tag collections] First feature complete minimal version of the tag collection system 2019-01-01 16:38:57 +01:00
iglocska 2e38015e8e fix: [data model] fixed a bug that caused org_id fields to be tinyint(1) for org_ids on tags 2019-01-01 16:37:15 +01:00
iglocska e2965a79e4 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-31 08:04:29 +01:00
iglocska 65709a353b Merge branch 'qb' into 2.4 2018-12-31 08:04:12 +01:00
iglocska 262066ecad fix: [cleanup] Fixed a few issues 
- unnecesary access to controller from component fixed (load component instead)
- confusion between private and public variables resolved
- some minor fixes for rules
 2018-12-31 08:02:00 +01:00
Alexandre Dulaunoy b41635ab62
chg: [objects] updated to the latest version 2018-12-30 16:31:19 +01:00
eCrimeLabs c920925d48 Update Attribute.php 
Added ja3-fingerprint-md5 as a deticated data type. Also updating the object for ja3
 2018-12-30 12:26:33 +01:00
iglocska 1b1fca34ce fix: [tag collections] fixed galaxies not showing up 2018-12-29 04:25:57 +01:00
iglocska 977d10a87f fix: [added missing controller] tag collections controller 2018-12-28 12:55:41 +01:00
iglocska cf666eec5a new: [tag collections] Added missing views 2018-12-28 12:55:17 +01:00
iglocska bf0fffcd58 fix: [model linking] Made tag collection tag dependent of tag 2018-12-28 12:54:51 +01:00
iglocska facedf7fc3 chg: [refactor] Refactoed attachCluster to be more model agnostic 2018-12-28 12:54:22 +01:00
iglocska 7cebaef6c8 fix: [db update] Fixed update script for tag collection tags 2018-12-27 05:24:30 +01:00
iglocska d22787b263 chg: [tag collection tag] Renamed Model references in the codebase 2018-12-26 23:48:49 +01:00
iglocska 6db77bb862 fix: [object references] Editing an event failed to save new object references 2018-12-26 22:40:31 +01:00
Alexandre Dulaunoy d26a61ba03
chg: [taxonomies] updated to the latest version 2018-12-25 17:30:21 +01:00
iglocska 6a74eb0bb6 fix: [cleanup] removed tagCollectionElement 2018-12-25 14:45:12 +01:00
iglocska aefb824d5c new: [tag collections] Renamed tagCollectionElement to tagCollectionTag 2018-12-25 14:44:26 +01:00
iglocska 856a76951f fix: [js] Various fixes with adding/removing tags 2018-12-25 14:04:01 +01:00
iglocska 6f8e03c657 chg: [generic index] Fixed scoping issue with rows 2018-12-24 05:51:03 +01:00
iglocska 15d8fd31db new: [tag collections] WIP 2018-12-23 22:45:25 +01:00
Christophe Vandeplas f82fbf165a
chg: [Objects] Sorts object references types in add reference form (#3969) 2018-12-22 09:54:12 +01:00
Alexandre Dulaunoy e0036625ac
chg: [misp-objects] updated to the latest version 2018-12-21 20:55:44 +01:00
chrisr3d 8331bd716f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-21 19:25:32 +01:00
chrisr3d f3fc403c1c
fix: [stix2 export] Fixed number_of_sections field in STIX PE extenstion 
- Avoiding issues when the section referenced in the
  MISP pe object is actually not in the event
 2018-12-21 19:21:56 +01:00
chrisr3d e660469697
fix: [stix2 export] Added required field pe_type in STIX PE extension 2018-12-21 19:20:02 +01:00
chrisr3d 909d6fc34f
fix: [stix2 export] Fixed GalaxyCluster UUID fetching 
- Supporting the latest changes on UUID field name
  for Galaxy clusters
- Still supporting the previous UUID field name in
  the case of a terminal execution, with a former
  version of Galaxy clusters
 2018-12-21 18:47:52 +01:00
chrisr3d 58b339962e
fix: [stix2 export] Some fixes on 'Attribute' ObjectReference key + missing self argument 2018-12-21 16:29:37 +01:00
chrisr3d 9408156dd9
fix: [stix2 export] Removed not used function 2018-12-21 16:26:24 +01:00
chrisr3d 724c561804
fix: [stix2 export] Added interoperability parameter to all created STIX objects 
- In order to avoid crashes on MISP data generated via the STIX import
 2018-12-21 16:17:30 +01:00
Sami Mokaddem 8e964d4a9a chg: [eventView] added quickEdit button for Category, Type and IDS 
fields + Changed IDS representation (from YES/NO to checkbox)
 2018-12-21 14:42:52 +01:00
iglocska 925c752172 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-21 12:18:19 +01:00
iglocska 65f92a5274 fix: [expansion] Hover broken after pagination fixed 2018-12-21 12:17:51 +01:00
chrisr3d cdd2cf7b5c Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-21 10:08:07 +01:00
chrisr3d 6e2ddf9dc8
fix: [stix2 export] Fixed GalaxyCluster uuids key fetching 2018-12-21 10:07:20 +01:00
Alexandre Dulaunoy 0ee95e4b0d
chg: [misp-galaxy] updated to the latest version 2018-12-20 22:10:03 +01:00
iglocska 3ba8c360bf new: [WIP] tag collections WIP 2018-12-20 21:48:04 +01:00
chrisr3d efcec5c45f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-20 16:39:21 +01:00
chrisr3d 3da69062cd
fix: [stix2 export] Fixed field name Attribute for ObjectReference checking 2018-12-20 16:37:31 +01:00
chrisr3d ca72197e82
fix: [stix 1&2 export] Checking if a referenced pe-section is indeed in the event before trying to parse it 2018-12-20 16:35:59 +01:00
Daniel Roethlisberger 5b4079637a new: [attributes] Add cdhash attribute, 40+ digit hash, default Payload delivery, ids=1 (#3965) 2018-12-19 20:19:49 +01:00
iglocska 4e23c23d6e Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-19 15:55:42 +01:00
iglocska 435bf28df6 fix: [publishing] Fixed several bugs in the background job responsible for publishing events 2018-12-19 15:55:06 +01:00
Dawid Czarnecki 534d5e24a6 Fix disabling correlations for single attributes 2018-12-18 13:34:48 +01:00
Sami Mokaddem 9f3ec7cbaa chg: [restClient] small css change 2018-12-18 11:39:47 +01:00
chrisr3d 0f15b1e5a7 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 11:36:46 +01:00
chrisr3d 91b1fe1db4
fix: [stix import] Fixed parsing of Custom objects 2018-12-18 11:36:04 +01:00
Sami Mokaddem 55c8f8dc82 chg: [restClient] Still show help for nested parameters instead of 
crashing
 2018-12-18 11:34:36 +01:00
Sami Mokaddem 00f4cd13c2 chg: [restResponse] removed space in parameters 2018-12-18 11:33:51 +01:00
iglocska 0e91baa040 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 10:25:23 +01:00
iglocska 1b358f730e fix: [correlations] Invalid orgc loaded in the attribute level correlations, fixes #3948 2018-12-18 10:24:11 +01:00
Andras Iklody c800b4b05b
Merge pull request #3954 from kfinny/fix-enrich-event-job-not-marked-as-completed 
Fixes #3907, enrich event job not marked as completed.
 2018-12-18 09:59:04 +01:00
iglocska 5e8392ae3f Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-18 09:46:48 +01:00
iglocska ba3ae0094c chg: [WIP] added function meant to resolve id vs uuid issues for the UI attribute search 
- still needs some love
 2018-12-18 09:46:02 +01:00
iglocska b1db12d242 fix: [UI] hover size fixed and scroll bar added 
- part of the keep @rommelfs happy project
 2018-12-18 09:44:50 +01:00
Kevin 9446c93ad4 Fixes #3907, enrich event job not marked as completed. 
The enrichment background process did not do anything to update the job
after completing its task.  I used the same logic as the adjcacent
'publish' function to record progress, update the message and create a
log entry.
 2018-12-17 13:55:59 -05:00
Alexandre Dulaunoy ac063792f9
chg: [UI] Clarify the definition of "hide_tag" to an unselectable tag 2018-12-17 18:14:53 +01:00
Sami Mokaddem 45f72787c4 chg: deleted comments 2018-12-17 18:13:07 +01:00
Sami Mokaddem 764b591789 chg: [restClient] Do not show empty rule if builder shown after template 
picking.
Reset the query builder rules if templates is not picked before showing the builder
 2018-12-17 17:17:59 +01:00
Sami Mokaddem 52346f00ef fix+new [restClient] fixed merge glitch and added support of 
`includeProposals`
 2018-12-17 17:15:05 +01:00
Sami Mokaddem 54162e4a82 chg: re-indented view file 2018-12-17 16:43:27 +01:00
Sami Mokaddem ed4f752d3a Merge remote-tracking branch 'origin/2.4' into querybuilder 2018-12-17 16:36:27 +01:00
Sami Mokaddem 11c76c2498 chg: [restClient] prevent usage of query builder if template not picked 2018-12-17 16:13:24 +01:00
Sami Mokaddem 1d43ff4e1f fix: [restClient] form submission is working again. 
was blackholed due to form tampering
 2018-12-17 11:14:05 +01:00
iglocska 54bb5f3d01 new: [tag_collections] Added db upgrade 2018-12-15 10:02:38 +01:00
Alexandre Dulaunoy b2b382f159
chg: [misp-galaxy] updated to the latest version (major update in Malpedia) 2018-12-15 09:29:10 +01:00
iglocska ecf52d5cb8 new: [Tag collections] Added boilerplate models 2018-12-14 20:25:38 +01:00
Sami Mokaddem 05e66de1bc chg: [restClient] added `show query builder` button 2018-12-14 16:32:27 +01:00
Sami Mokaddem f16bb4756e chg: [restClient] re-indented the whole file 2018-12-14 16:05:18 +01:00
Sami Mokaddem 720c4315ce chg: [restclient] moved all javascript into its own file 2018-12-14 16:05:00 +01:00
root 23e17f37ec chg: [querybuilder] added new js dependencies (chosen, query-builder, 
doT, extendext and moment)
 2018-12-14 15:47:41 +01:00
Alexandre Dulaunoy f5af41239e
chg: [misp-galaxy] updated to the latest version 2018-12-13 21:42:58 +01:00
Andras Iklody cfe3841d8d
Merge pull request #3942 from tomking2/2.4 
fix: Make IE11 compliant by adding startsWith polyfill
 2018-12-13 04:52:46 -05:00
iglocska 10557c12da Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-13 10:30:40 +01:00
iglocska be05652072 fix: [CLI] usage output fixed for the server shell tasks 2018-12-13 10:30:04 +01:00
iglocska 2ce3bdddbe fix: [sync] Fixed an incorrectly formatted event index output when minimal:1 is passed, breaking the sync pull 
- ffs
 2018-12-13 10:28:58 +01:00
Tom King 1caca3adcc fix: Make IE11 compliant by adding startsWith polyfill 2018-12-13 09:17:29 +00:00
Tom King da3bba7ba8 fix: Make IE11 compliant by removing default param value from ES2015 2018-12-13 09:13:21 +00:00
Tom King 3c2e976997 fix: Make IE11 compliant by removing default param value from ES2015 2018-12-13 09:07:35 +00:00
iglocska a56e1b44b5 fix: [server preview] fixed sharing groups linking to the equivalent ID sharing group on the local instance 2018-12-12 19:26:40 +01:00
iglocska 147ab92aa9 fix: [api] Fixed event index to include sharing group metadata 2018-12-12 19:24:12 +01:00
iglocska ba74597e87 fix: [Restresponse] fixed XML converter 2018-12-12 19:23:40 +01:00
iglocska a2f073e6d1 fix: [compatibility] reverted IE11 breaking change in misp.js, fixes #3939 2018-12-12 17:53:10 +01:00
iglocska fe3bf1f57a fix: [feeds] Fixed an issue that caused a misp format feed fetch to fail intermittently 2018-12-12 17:30:58 +01:00
iglocska d79757ad73 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-12-12 16:01:15 +01:00
iglocska c7a4b6f1f5 fix: [sync] Issue with events not updating on a pull 
- overzealous protection removed
- Conditions blocking an event edit via a pull now rely on the locking mechanism, relaxed via an internal sync link
 2018-12-12 15:58:36 +01:00
Sami Mokaddem ac0db78bc1 chg: [eventView] applied quick-edit button for comment field 2018-12-12 15:38:22 +01:00
Sami Mokaddem 1c8601c0e1 chg: [quickEditHover] change variable scope to local 2018-12-12 15:16:01 +01:00
Sami Mokaddem e076239a0e new: [eventview] value quickedit are triggered by clicking a button 
And no longer using double-click
 2018-12-12 14:45:18 +01:00
Sami Mokaddem 260f75d8c3 fix: [upload_analysis_file] Prevent object creation on non-existing events 2018-12-12 11:16:00 +01:00
Sami Mokaddem 244f62e355 chg: [eventGraph] added fail save if requiredOneOff is not set 2018-12-12 10:28:08 +01:00
Sami Mokaddem 5140ab0b74 fix: [eventGraph] Object's label gets set correctly 
Add both requiredOneOf and required (forgotten one) fields in the Object's label
 2018-12-12 10:25:18 +01:00
chrisr3d dee614b4b8
fix: [stix 1&2 import] Fixed version attribute of the original filename 2018-12-12 10:19:40 +01:00
chrisr3d 12b713af35
fix: [stix2 import] Allowing import of STIX 2.0 documents that have non v4 UUIDs 
- Some further operations may be done on those UUIDs later
- Atm, we (at least) avoid loading errors from the stix2 python library
 2018-12-11 15:50:14 +01:00
Sami Mokaddem 191c1e1715 chg: [querybuilder] injected tags are now injected by name instead of ID (allowing sql LIKE) 2018-12-11 14:54:28 +01:00