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

2286 Commits (9b85428897b6930422138abcb93ee1ea65bcaeb8)

Author SHA1 Message Date
iglocska 9b85428897 Event tags correctly saved on rest add if they are set in the compressed format (event->tag instead of event->eventtag->tag) 2015-12-22 11:27:27 +01:00
iglocska d769942a15 When adding/editing a sync user, the choice to limit a user by instance settings shows empty lines for instances without a name 
- use the URL in those cases instead
 2015-12-21 12:08:08 +01:00
iglocska 000449ee81 Editing an event via REST would not capture the tags 
- if a user is a tagger the tag should be created (if not existing on the current instance) and added to the event
 2015-12-21 11:46:33 +01:00
iglocska cb42337f9b Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2015-12-21 10:39:39 +01:00
iglocska 20acdd0622 Removed an accidental addition a while back 2015-12-21 10:38:45 +01:00
iglocska f963f8d7d8 Fixed a menu and some cleanup 
- Freetext import was loading the wrong menu
- some leftover profiling code removed
 2015-12-21 10:37:45 +01:00
Iglocska cc2e4171cf Don't run the anti IE 8 check on requests that don't have a user agent set, fixes #775 2015-12-19 19:41:17 +01:00
Iglocska 2c8940359c Editing an event with new attributes fails because a new id is not assigned correctly, fixes #773 
- the process of detecting and editing existing attributes did not account for a case where the uuid is not set for an attribute and therefore should be saved as a new attribute. Fixed
 2015-12-19 16:03:53 +01:00
Iglocska 5a44d79013 Fix for an issue with event edits containing a new attribute and it not getting an ID as expected 2015-12-18 18:31:43 +01:00
Iglocska b25ca97c46 taxonomies update 2015-12-18 17:45:44 +01:00
Iglocska 30945dacd2 double comment field fixed 2015-12-18 17:20:56 +01:00
Iglocska cc57aa397e Invalid fetchevent call fixed for proposal add attachment 2015-12-18 17:17:42 +01:00
Iglocska 4a93d868de Fixed an issue where non-sharing group events would only send alert e-mails to site admins 2015-12-18 16:33:41 +01:00
Iglocska 8ddceaddc3 Typo fixed 2015-12-18 16:27:25 +01:00
Iglocska e4d3b6d1ac Removed crappy automatic CakePHP sorting from recorrelation 
- /facepalm
 2015-12-18 12:43:34 +01:00
Iglocska c2660f582e Added indexing of the tables as an admin script 2015-12-18 12:27:57 +01:00
Iglocska 692ced8590 typo 2015-12-18 09:48:34 +01:00
Iglocska 85d22aa3a8 Missing subject added back 2015-12-18 09:44:25 +01:00
Iglocska b9dfed927b Removed debug 2015-12-18 09:40:26 +01:00
Iglocska cf119bc315 Fix to a previous merge issue with the e-mailer 2015-12-18 09:38:36 +01:00
Iglocska f8ad9a14fe Fix to the email target on publish 2015-12-18 09:17:57 +01:00
Raphaël Vinot dcc182fa74 Update cakephp 2.7 to HEAD 
Fix #740
 2015-12-17 17:18:07 +01:00
iglocska e215bf3313 Slightly smarter correlation for generateCorrelations 2015-12-17 13:04:49 +01:00
iglocska dd53f7bfa2 Added default values to the log entry creation to avoid empty fields giving notices, fixes #769 2015-12-17 11:01:54 +01:00
iglocska 0a48ee2c44 Fix to the correlation peformance 2015-12-17 10:25:30 +01:00
iglocska ffe8dbb011 More fixes to the background correlation generation 2015-12-17 01:40:02 +01:00
iglocska 78d58b6cbd Changes to the generation recreation 2015-12-17 01:25:23 +01:00
iglocska 150b115c52 Fixed an invalid link, fixes #761 2015-12-17 00:15:35 +01:00
iglocska 3449291533 Fixed issue with the headmmap, fixes #759 and fixes #760 2015-12-16 23:18:05 +01:00
iglocska 9a7301972d Fixed an issue with discussions where a new thread would not have a default distribution and sharing group ID and would fail on creation, fixes #758 2015-12-16 08:59:31 +01:00
iglocska 3a682faf01 Various fixes 
- resolved a missing variable issue on event views with no posts fixes #753
- removed some obsolete code
- sorted tags on the event view when assigning one to an event by name, fixes #416

	modified:   app/Model/Taxonomy.php
 2015-12-16 00:48:30 +01:00
Iglocska bc2c14c815 Disable e-mailing globally for an instance 2015-12-15 10:52:31 +01:00
Iglocska 3a2df829a0 Default settings for roles altered 2015-12-15 10:07:11 +01:00
Iglocska 0161612d94 Merge branch 'master' into 2.4-beta 
Conflicts:
	VERSION.json
 2015-12-14 11:59:23 +01:00
iglocska 4b115c8bfa Fixed an issue with the freetext importer where unsetting a duplicate value would not be reflected in the entry IDs 
- this caused some attributes to be dropped from the end of the list
 2015-12-14 11:50:37 +01:00
Iglocska 07741c0c38 Merge branch '2.4-beta' of https://github.com/MISP/MISP into 2.4-beta 2015-12-14 03:14:20 +01:00
Iglocska b0e8214cbf Added some fixes to corner cases 
- publishing an event when push is enabled to a 2.3 instance failed with an error instead of blocking
- publishing an event wth the remote instance blocking it due to a sync user sharing group conflict resulted in an exception, handled gracefully now

- Added mangle-sync towards 2.3
  - gracefully push non sharing group events in a 2.3 format
  - timestamps downgraded by 1 second - upgrading the 2.3 instance should automatically allow a resync of mangled events
 2015-12-14 03:11:45 +01:00
Iglocska 1fc03541b2 Fixed an issue with a certain condition combination failing during sync 
- pushing an event with a sharing group that doesn't exist on the remote and that has the sync user included as part of an all_org instance
- the saving would generate a 405
 2015-12-14 02:43:38 +01:00
Iglocska 225c48ce4b Merge branch '2.4-syncrework' into 2.4-beta 
Conflicts:
	app/Model/Event.php
 2015-12-14 00:26:27 +01:00
Iglocska 8f5d21790c Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 
Conflicts:
	app/Controller/LogsController.php
 2015-12-14 00:06:58 +01:00
Iglocska f1a54885ba Fixed the editing of sharing groups via event updates 
- if a sync user adds / edits an event with a newer version of a sharing group
and the sync user is the local sync user of the SG or is an extender of the SG
then the sharing group will be updated

- valid changes:
  - Sharing group metadata changes
  - organisation detail changes (except uuid/name)
  - add / remove extend flag from orgs in the SG
  - add / remove all_orgs flag from servers in the SG
 2015-12-14 00:03:45 +01:00
Iglocska 69d973c755 Event history now takes into account sharing groups 2015-12-13 21:28:10 +01:00
Iglocska 4026627a91 Fix to the HIDS export 2015-12-13 17:59:48 +01:00
Iglocska 695e892d3c Fix to the event filtering on organisation 
- org filters now accept org ID or org Name as parameter, fixing the sync filter

- Also, fix to saving sharing group IDs on sync edits on an attribute level
 2015-12-13 17:20:40 +01:00
Iglocska e4d6c72444 Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 2015-12-12 22:51:57 +01:00
Iglocska 02143bbdc0 Capture the sharing groups of attributes on event edit 2015-12-12 22:51:32 +01:00
Iglocska 98756cdaa9 Extend field added to sharinggrouporg object on fetchevent 2015-12-12 22:49:19 +01:00
Iglocska 67fb8bfdcf Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 
Conflicts:
	app/Model/Event.php
 2015-12-11 14:14:16 +01:00
Iglocska 73ab39aa26 Further fixes to the sync 
- corrected the edit access rights for sync users with sharing groups
- Various fixes to the organisation sync and how creation / modification dates are transmitted
- Internal format differences compared to 2.3 causing mismatched field lookups fixed
 2015-12-11 14:11:37 +01:00
Iglocska 26f75591d3 Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 2015-12-11 14:09:39 +01:00