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

134 Commits (df9fa875038652aad331c84bcaa73227601a940e)

Author SHA1 Message Date
iglocska 15d6c30649
new: [sync] (for now) undocumented force pull added 
- can only be triggered via the CLI for now
- usage: /var/www/MISP/app/Console/cake Server pull [user_id] [server_id] [technique] [force]
  - the force flag has to be passed as 'force' to avoid accidentally triggering it

- What it does:
  - pulls ignoring the timetamp differences
  - this means that even older states of events, attributes, objects are ingested
  - useful for when wanting to reset an event / all events to align with an upstream server
- Caveats:
  - attributes added on the low side are maintained
  - tags added on the low side are maintained
  - keep in mind this WILL override attributes that are soft deleted
 2020-05-14 09:34:49 +02:00
iglocska 0ed0324417
fix: [object restsearch] fixed, no more trailing commas 2020-05-07 07:58:51 +02:00
iglocska 3a8efe4bf8
fix: [object restsearch] fixed 
Endless loop fixed
 2020-05-06 14:22:05 +02:00
iglocska 93c9c64c95
new: [restsearch] object restsearch now has the metadata flag 
- when set, no attributes are returned
 2020-05-06 09:32:44 +02:00
mokaddem 4099e09548
fix: [objecs:reviseObject] Pass forgotten template data - Fix #5733 2020-03-30 08:37:16 +02:00
iglocska 4bfcc3211b
new: [API] object level restSearch added 
still WiP
 2020-02-29 08:57:32 +01:00
iglocska 55385e6ca6
fix: [object] object deduplication fixed 2020-02-10 14:39:58 +01:00
iglocska 4ea3612dfc
new: [objects] pass the /breakOnDuplicate:1 flag to the /objects/add endpoint to deduplicate 
- returns an error if the object already exists
  - objects of the same template_uuid are compared
  - non deleted attributes only
  - type + category + value + object_relation tuple is compared
 2020-02-10 14:30:34 +01:00
mokaddem eb9b60032e
fix: [objects:edit] Added *_seen validation and error reporting 2020-01-27 16:29:28 +01:00
iglocska 0b402e6474
Merge branch 'zoidberg-final' into 2.4 2020-01-20 06:10:41 +01:00
iglocska aead1d0105
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2020-01-17 10:13:14 +01:00
iglocska 03de8be19a
fix: [Objects] editing refactored 
- code made more readable
- resolved an issue where objects could not be edited via the API without having the correct template
 2020-01-17 10:11:51 +01:00
mokaddem 2a5112cc1e
Merge branch '2.4' of github.com:MISP/MISP into zoidberg-final 2020-01-17 09:20:49 +01:00
mokaddem 34ebbe529d
fix: [Object:editObject] Removed Event unpublishing that induced a divergence of Event.timestamp. 
Chances are that it was causing ghost loggins and useless sync loops
 2020-01-16 15:14:07 +01:00
mokaddem 5c97c5da53
fix: [Attribute:editTag] Correctly escalate the timestamp refresh to the 
Object
 2020-01-16 11:02:56 +01:00
mokaddem aabc568b90
fix: [Object:DeltaMerge] Gracefully catch if *_seen field is not present 
in the pushed Object
 2019-12-16 15:00:30 +01:00
mokaddem 092348ffcd
chg: [Attribute:seen] Moved conversion iso<->utc of fs/ls in dedicated 
functions
 2019-12-16 10:47:07 +01:00
mokaddem a1fdea754d
Merge branch 'zoidberg-timeline' into zoidberg-final 2019-12-06 15:40:51 +01:00
iglocska bed34757f8
fix: [internal] When capturing an object, avoid throwig notice errors if no attributes are set, fixes #5439 2019-12-02 08:47:07 +01:00
mokaddem 6eda00f701
chg: [timeline] Synchronize *-seen at Object and ObjectAttribute level, 
few fixes and Improved UI
 2019-10-28 15:45:33 +01:00
mokaddem 265f96dac8
chg: [object:quickAddAttribute] Improved feedback when creation fails 2019-10-02 14:30:34 +02:00
mokaddem bb3cf85776
Merge branch '2.4' into zoidberg-timeline 2019-10-02 11:23:04 +02:00
mokaddem 38db050465
fix: [object:merge] Fix #5041, Duplicated value gets unique UUID and 
relaxed javascript equality check.
 2019-08-22 15:28:25 +02:00
iglocska 166fbf0da4
fix: [objects] Fix various issues with objects/edit 
- value1 and value2 should not be included in the repsonse, fixes #4944
- fixed input being misunderstood in certain situations
 2019-08-05 10:50:39 +02:00
Raphaël Vinot 98a370c5db fix: Typo when the validation fails on an object 
Fix #4903
 2019-07-18 15:40:24 +02:00
mokaddem 8ecc01390b
fix: [object:save] Inversed condition. copy/pasta fail... 2019-07-05 10:40:00 +02:00
mokaddem 9462424a64
fix: [object:save] fail-safe if Object doesn't have fs/ls set 2019-07-05 10:03:31 +02:00
mokaddem 11bee7c6e5
chg: [object:edit] Support of fs/ls sync on object for `edit` and 
`addQuickField`
 2019-07-04 14:13:23 +02:00
mokaddem d616acc92a
fix: [object:add] Catch exception if fs/ls doesn't exists 2019-07-04 14:05:47 +02:00
mokaddem 59d815b716
chg: [object] Set fs/ls on all attributes when an object got its fs/ls 
sets
 2019-07-04 13:52:29 +02:00
mokaddem ac797ff2f8
chg: [object:delta] No deletion of ObjectAttribute when sync. with 
Object's FS/LS
 2019-07-01 14:34:32 +02:00
mokaddem 3a7b398764
fix: [object:setMetraFromAttribte] Pass Object reference instead of 
value
 2019-07-01 10:35:38 +02:00
mokaddem 0cc1b7b9dc
fix: [timeline] Prevent `Column not found` error if user has the `user` 
role
 2019-06-24 11:19:03 +02:00
mokaddem 2ea4916051 Merge branch '2.4' of github.com:MISP/MISP into zoidberg-timeline 2019-06-24 09:06:11 +02:00
mokaddem 5c10a02bf0 fix: [object:proposeValidTemplate] Support only_full_group_by sql mode. 
Fix #4746
 2019-06-18 15:50:48 +02:00
mokaddem e7f3d0d9df new: [timeline/*-seen] Initial import of the timeline code from the 
zoidberg branch
 2019-06-13 09:16:34 +02:00
mokaddem 2035aa8c7c chg: [object:fromAttributes] Deleted comments and hardcoded table name 2019-06-12 12:05:13 +02:00
mokaddem b3849655e0 fix: [attributes] Correctly pass the user object and renamed delete function 2019-06-12 11:56:42 +02:00
mokaddem 5748bab998 fix: few typos 2019-06-12 11:38:19 +02:00
mokaddem d6093b9659 chg: [object:fromAttributes] Method only accesible via AJAX and regular 
users can use the feature
 2019-06-12 11:17:17 +02:00
mokaddem b050269949 chg: [object:fromAttributes] Added support of hard delete if event not 
published yet
 2019-06-12 11:00:17 +02:00
mokaddem fe4740abd9 fix: [object:fromAttributes] SYNC support for older instances 
(duplicate attributes and their contexts)
 2019-06-06 15:11:34 +02:00
mokaddem af15c4af79 fix: [sync] Correctly capture the attributes from a groupment into an 
object during the sync
 2019-05-27 15:40:54 +02:00
mokaddem 7a104a2d0f chg: [object:fromAttributes] Returns correct value if attribute list is 
empty
 2019-05-21 08:35:19 +02:00
mokaddem 44d71a327a chg: [object:fromAttributes] Shows selected types and started 
implementaion of the actual object creation - WiP
 2019-05-20 14:30:20 +02:00
mokaddem ca01897857 chg: [object:fromAttributes] Better Attribute filtering - WiP 2019-05-17 16:28:58 +02:00
mokaddem 5798a73462 chg: [object:fromAttributes] Greatly improved UI - WiP 2019-05-17 16:02:06 +02:00
mokaddem c325f1728c new: [object:fromAttribute] Started dev on merging selected attributes 
into an object - WiP
 2019-05-08 16:56:19 +02:00
Nikos Filippakis 9d59b10368 Publish events to Kafka 
Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-18 15:53:22 +01:00
Nikos Filippakis b783b5e393 Fix checking of incorrect flags when publishing to ZMQ 
* Check Plugin.ZeroMQ_event_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in Event.php
* Check Plugin.ZeroMQ_audit_notifications_enable instead of Plugin.ZeroMQ_user_notifications_enable in Log.php
* Check Plugin.ZeroMQ_object_notifications_enable instead of Plugin.ZeroMQ_attribute_notifications_enable in MispObject.php

Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-13 11:51:40 +01:00
Christophe Vandeplas 67efc70bf5 fix: [style] consistent space indentation 2019-02-10 13:08:55 +01:00
iglocska 0365cb19b1 fix: [API] previous commit fixed 2018-11-29 17:18:42 +01:00
iglocska e289db66aa fix: [internal] When editing an object to add new attributes, correctly set the default distribution if nothing is set 2018-11-29 17:14:56 +01:00
iglocska 2d0259ce13 fix: [CS] coding standards script re-run 2018-11-23 14:11:33 +01:00
Sami Mokaddem 7f71f2d4f8 fix: [mispObject] fixed disable_correlation saving & display issue 
Before this fix, MISP was not saving any modification related to disable_correlation.
Moreover, the value of disable_correlation was always set to the one specified in the object's template
regardless of its actual value.
 2018-11-21 15:25:03 +01:00
iglocska aa15896839 fix: [objects] Fixes issue #3874 
- shouldn't be allowed in the first place
 2018-11-14 20:10:22 +01:00
iglocska a81894f14c chg: [CS] Changed to PSR-2 
- to make contributions easier, adopted PSR-2
- used php-cs-fixer to rework the style
- *sniff sniff* Goodbye tab indentation
 2018-07-19 11:48:22 +02:00
iglocska 604b463a42 fix: [API] Fixed object view API 2018-07-03 17:42:09 +02:00
iglocska 45cef39b2d fix: Account for alternate format for /objects/edit 
- I need to take a shower after this fix
 2018-05-08 14:38:30 +02:00
iglocska 436c9c9a01 fix: Fixed broken objects/edit 2018-05-08 14:07:40 +02:00
iglocska b2dff10511 fix: Fixed name change of variable breaking /objects/add 2018-05-08 10:24:51 +02:00
iglocska d49e3cb83f fix: Handle no template being passed to objects/add correctly 2018-05-08 09:44:04 +02:00
iglocska fc00138fc7 fix: Emergency fix for objects getting overwritten on a pull in certain situations 
- object IDs not purged on pull can lead to a local object being overwritten
- the patch fixes the capture function to purge the object IDs

- as discovered and reported by TS-WAY (@TS_WAY_SRL)
 2018-03-01 21:44:49 +01:00
iglocska f93db19b9c fix: objects not purged correctly when deleting an event, fixes #2810 
- correctly included objects now in the quick delete function
- new upgrade script that purges existing orphaned objects
 2018-01-15 11:55:29 +01:00
iglocska 8ed3883f0b fix: Fixed an issue where adding an attribute to an existing object isn't handled correctly via the API / sync, fixes #2760 2017-12-20 17:00:33 +01:00
iglocska 205d6ba148 fix: Fixed a condition where adding objects through /events/edit would fail 2017-12-12 09:50:31 +01:00
iglocska c332f43368 fix: Fixed an issue with the log model being referenced incorrectly in MispObject 2017-12-12 09:34:59 +01:00
iglocska bd81f48f07 new: Added object references to ZMQ 2017-10-27 15:39:40 +02:00
iglocska 68f4833893 new: First version of the zmq reimplementation 2017-10-27 09:10:46 +02:00
iglocska 9eb3ea2114 fix: When deleting an attirbute/objects, object references to it are not deleted, fixes #2477 
- force a reference deletion on attribute/object deletion
- changed it to match deletion type
  - soft-deleting an attribute/object soft-deletes all references to it
  - hard-deleting an attribute/object hard-deletes all references to it
 2017-09-17 12:26:06 +02:00
iglocska 80e70fd240 fix: Fixed notices described in #2482 2017-09-15 17:26:10 +02:00
iglocska 3938abe7e1 fix: Fixed the add attachments functionalities 2017-09-07 16:10:36 +02:00
iglocska b442a273fc new: Further progress on the synchronisation 2017-09-07 12:20:20 +02:00
iglocska 4bf01000dd fix: Various fixes with object reference editing 2017-09-04 23:12:46 +02:00
iglocska 80a00ea054 fix: Fixing various issues with the pull 2017-09-04 22:36:35 +02:00
iglocska 58bfabfa73 new: Sync with objects wip 
- add/edit of full events now capture all object related structures
- restructuring of the edit/add functionalities into clearly divided subsections
 2017-09-04 17:26:45 +02:00
iglocska 5552d7c030 new: Several new features 
- added multiple flag among other things
 2017-08-29 18:28:18 +02:00
iglocska c8b0be9431 new: Added first iteration of new add attachment functionality 
- still WIP
 2017-08-28 09:18:40 +02:00
iglocska c1ef6fe2b6 fix: Fixed array level mess-up 
derp
 2017-08-23 14:28:24 +02:00
iglocska 7b8e11379d chg: Removed default distribution for attributes in object - tkaen over by the pre-validation script 2017-08-11 15:58:06 +02:00
iglocska 94fbfed48f fix: Ommit object template elements with invalid attribute types 
- and warn users
- shout out to all C-level managers at SHA2017
 2017-08-06 20:53:21 +02:00
iglocska 8f6b53ee24 new: Progress on the Objects 
- Fixed UI elements in the event view
- Added object-aware filtering to the event view
- Objects can now be deleted and viewed once deleted
  - object sanitisation if the setting is set is implemented
- Edit objects directly from the interface (if the template exists)
- Various other fixes
 2017-08-06 18:23:24 +02:00
iglocska dd27f118f3 new: WIP - change to model aliasing to solve the reserved class name 
- Internal name is now MispObject for the model, but it is used Aliased, removing the need to do any data massaging
- Added WIP edit function
 2017-07-06 15:04:01 +02:00
iglocska 3a5b2f0157 chg: Changed Object to MispObject internally 2017-07-05 14:25:09 +02:00