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

113 Commits (ae5434fbc66cf61376986424841df976e9c70fef)

Author SHA1 Message Date
Jakub Onderka 32acd3895d chg: [internal] Simplify objects conditions 2020-09-20 19:02:57 +02:00
Jakub Onderka 3d4142f836 fix: [internal] Fetching objects with attachments 2020-09-20 18:54:04 +02:00
Jakub Onderka 08e2a18b2c chg: [internal] Use cached sharing groups IDs when fetching objects 2020-09-20 18:43:07 +02:00
Jakub Onderka f52eee457a fix: [internal] Remove duplicate check for published event when fetch objects 2020-09-20 18:34:38 +02:00
Jakub Onderka 6a017f63fe fix: [internal] Remove duplicate conditions for object restSearch 2020-09-20 18:20:23 +02:00
Jakub Onderka 8f897af503 fix: [internal] Code style 2020-09-20 18:20:23 +02:00
Jakub Onderka 636fc74d8a fix: [internal] Invalid conditions for sharing group when fetching objects 2020-09-20 18:20:23 +02:00
Jakub Onderka 935437d1bc chg: [internal] Invalid message for UUID contains that UUID must be RFC 4122 compliant 2020-09-18 10:56:28 +02:00
Jakub Onderka 0e916bd364 chg: [internal] Ensure that UUID is always lowecase and real UUID 2020-09-08 10:47:28 +02:00
Golbark 3a0bedb104 chg: [internal] Using Allowedlist instead of Whitelist 2020-09-01 16:28:20 +02:00
Jakub Onderka b6116098c0 fix: [security] Throw exception if invalid data provided 2020-08-05 12:39:11 +02:00
Jakub Onderka 03c78fedf7 fix: [ACL] Unpublished private for object do not apply for site admin 2020-08-05 12:39:11 +02:00
Jakub Onderka f0f826841e fix: [security] Sharing groups for objects respect permissions 2020-08-05 12:39:11 +02:00
Jakub Onderka db626cf741 fix: [security] Respect ACL when event edit 2020-08-04 12:21:42 +02:00
mokaddem 3d224cfdb8
Merge branch '2.4' of github.com:MISP/MISP into fix-mass-edit-form-with-post 2020-07-30 15:29:20 +02:00
mokaddem 8420663ae1
fix: [object:edit] Updating an object to a new template acutally save 
the template version
Fix #6083
 2020-07-29 15:46:20 +02:00
mokaddem f92467643b
chg: [objects:edit] Merge data is passed via cookies instead of the URI 2020-07-27 16:10:47 +02:00
mokaddem cda56bdbd3
fix: [attribute:editableFields] Typo in variable name 2020-07-24 16:19:02 +02:00
mokaddem f53ba3675e
chg: [AttributeTags:handleAttributeTags] More generic way to handle 
capture and association
 2020-07-24 14:30:41 +02:00
mokaddem 6c1bbf0fde
chg: [attribute] Added tag handling when saving attributes and objects 2020-07-24 13:55:34 +02:00
mokaddem f9b851f229
fix: [object:edit] Correctly set the SG of the added new attributes 
Fix #6025
 2020-07-24 10:13:54 +02:00
mokaddem e05505eb60
chg: [object] Avoid notices if some object attributes fields are not set 2020-07-23 12:26:22 +02:00
mokaddem f26503de48
chg: [object:edit] Allow deleting objects by passing `deleted` flag 
Fix #6024
 2020-07-23 11:52:46 +02:00
iglocska 662cdbc7b7
fix: [sync] drop the republishing of events when the modification is merely a timestamp bump 
- due to an already fixed issue still lingering, invalid event edits keep getting synchronised between instances
- these events still generate publish alerts erroneously

- this fix compares the previous state of the event to the modification, if there are no material changes (attributes, objects, object relations, event tags added/updated) then the publishing is dropped.
 2020-07-22 13:10:52 +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
Richard van den Berg b9865f719d fix: [MispObject] Do not unpublish synced events, fixes #4838 2020-07-06 09:17:44 +02:00
Jakub Onderka 3d12cb3f3c chg: [internal] Attribute REST search optimisations and error handling 2020-06-19 23:45:22 +02:00
iglocska 82425123ab
fix: [internal] object level restsearch issues resolved when querying via filters on the attribute scope, fixes #6016 
- use subqueries instead of trying to query on the current scope
- associated find queries don't work on habtm relationships
 2020-06-14 20:23:48 +02:00
mokaddem bb167029eb
new: [userSettings] New setting `default_restsearch_parameters` 
It allows users to supply restSearch parameters that will be injected
(and possibly overridden) into the restSearch filters.
 2020-05-29 15:23:27 +02:00
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