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

2666 Commits (e242c9add223df0d0190e4706ad5480bf3f7ad11)

Author SHA1 Message Date
Iglocska e242c9add2 Set of changes to the sync 
- finished preview feature
  - can now view events and attributes remotely
  - can copy over new event to local instance

- new sync mode (update)
  - allows to only pull changes to events that exist locally already
  - works well with the manual pull of events, no need to pull events that we didn't manually confirm, but can still update all events that we pulled over

- Fixed an issue with background tasks causing the logging to fail

- reworked connection test showing version numbers of both instances
  - also telling the admin whether the sync is compatible or not

- Further refactoring / tweaking of the vent view
 2015-10-06 01:16:48 +02:00
Iglocska 6bcf104724 Progress on several features 
- implemented a custom pagination tool for data sets that are not directly taken from teh db
  - currently creates a pagination object that mocks CakePHP pagination
  - supports the CakePHP pagination view helper
  - supports: pagination, sorting, custom filters

- implemented first step of the remote instance browser for admins
  - view an index of events on another instance
  - filter the events
  - uses the new pagination

- still missing:
  - remote event view
  - fetch event from remote instance

- reworked the event view
  - separated API and UI code path
    - major speedup for the API!
    - cleaner code as there was almost 0 overlap
  - discussions and attributes are now loaded separately from the event view
    - added after the event view loads via ajax
    - cleaner pagination
  - attribute pagination now finally allows for sorting
    - future improvement (coming soon): Show proposals only filter
    - filtering on the attributes in general
 2015-09-29 02:54:25 +02:00
Iglocska af53475952 1st version of the upgrade documentation 2015-09-25 11:58:42 +02:00
iglocska 656a391223 Progress on the sync 
- pull from 2.3 -> 2.4 should work correctly now
 2015-09-21 14:55:40 +02:00
Iglocska 3ad7d4b441 Added some fixes for XSS 2015-09-10 15:26:08 +02:00
Iglocska e1a95c62b0 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ServersController.php
	app/Model/Attribute.php
	app/View/Users/statistics.ctp
 2015-09-10 15:02:44 +02:00
Iglocska 2902c96f3c Merge branch 'hotfix-2.3.125' 2015-09-10 00:41:32 +02:00
Iglocska d7bab21919 Left off shell script 2015-09-10 00:30:34 +02:00
Iglocska 3feeee920e Initialise first user via the command line 
usage:

/var/www/MISP/app/Console/cake userInit -q

returns the created auth key or an error message if users already exist

The created account is an admin user, with the login being admin@admin.test / admin
 2015-09-09 20:52:01 +02:00
Iglocska bc06362d19 Fixed XSS in several views 
- reported by Roberto Suggi Liverani from NCIA
 2015-09-09 19:26:06 +02:00
David André a07346cfa2 Added comment in text export paragraph that 
non IDS flagged attributes are also exported by default.
 2015-09-09 17:07:03 +02:00
Raphaël Vinot 3f2824b053 Fix travis message in README. 2015-09-08 17:40:01 +02:00
Iglocska cf182167ee Merge branch 'hotfix-2.3.124' 2015-09-07 14:27:40 +02:00
Iglocska 2142bf87c3 Several issues resolved 
- fixed an issue where pushing a single event would fail

- both event and attribute edits via the API work without providing a timestamp. The current timestamp is instead attached

- both event and attribute edits fill the required fields from the data in the database if not supplied (as long as the uuid is found)
 2015-09-07 14:25:24 +02:00
Iglocska 291ebc8393 Typo, fixes #632 2015-09-07 10:31:25 +02:00
Iglocska e7b54c2c61 Fix to a serious bug with adding attributes via the API and performance fixes 
- due to a bug, setting an attribute ID in the /attributes/add API call can lead to overwriting an existing attribute

performance improvements:

- massive improvements to the correlation performance
- improvements to the attribute validation process
 2015-09-07 10:06:34 +02:00
Raphaël Vinot 9b82e4e2a7 Merge pull request #639 from Rafiot/travis 
Add partial travis support
 2015-09-07 09:56:36 +02:00
Raphaël Vinot fd3524aa7f Add partial travis support 2015-09-07 00:40:47 +02:00
Iglocska 5f6c840211 Merge branch 'hotfix-2.3.123' 2015-09-03 10:59:47 +02:00
Iglocska 43c2290097 Enhancements to the reportValidationIssuesAttributes action 
- now also shows issues not related to the value field
- takes an optional parameter to validate a single event's attributes
 2015-09-03 10:58:54 +02:00
Iglocska 10eb2d3ad3 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
 2015-09-02 16:39:54 +02:00
Iglocska 9f8e5049a6 Merge branch 'hotfix-2.3.122' 2015-09-02 16:37:16 +02:00
Iglocska af0b2ffdce Version bump 2015-09-02 16:37:02 +02:00
Iglocska b83e615672 Fixed XSS in the footer 
- reported by Roberto Suggi Liverani from NCIA
 2015-09-02 16:34:43 +02:00
Iglocska 8685e93e22 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Model/Tag.php
	app/files/scripts/misp2stix.py
 2015-09-02 10:26:56 +02:00
Iglocska 809ac8f88b Merge branch 'master' of https://github.com/MISP/MISP 2015-09-02 10:21:46 +02:00
Iglocska b401f56322 Merge branch 'hotfix-2.3.121' 2015-09-02 10:21:19 +02:00
Iglocska 20de4ba9cc Version bump 2015-09-02 10:20:49 +02:00
Iglocska 62532260ef Addition to the previous commit 2015-09-02 10:18:08 +02:00
Iglocska 77adf624d9 Fix to a reflected XSS in the event choice 2015-09-02 09:57:59 +02:00
Iglocska 3fb7764c00 First revision of the upgrade scripts 
- .sql file to add all the new fields / tables
- admin tool to convert the old organisation fields to the new objects
- still missing a cleanup method (to remove the old organisation fields once the conversion is done)
 2015-09-02 01:34:52 +02:00
Iglocska 838b53f9e9 Fix to an unescaped ID that could be used to inject XSS into the side menu on some views 2015-08-31 15:40:39 +02:00
Alexandre Dulaunoy 28e4798b67 Merge pull request #629 from RichieB2B/ncsc-nl/stix-tags 
Export MISP tags as STIX journal entries
 2015-08-31 14:05:03 +02:00
Richard van den Berg 2eddbb5dcc Export MISP tags as STIX journal entries 2015-08-31 12:55:42 +02:00
Iglocska 5f8f22e272 flag incorrectly set for event edit's publishing right check 2015-08-31 04:21:46 +02:00
Iglocska e11ddb9679 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
 2015-08-31 03:40:50 +02:00
Iglocska e04352c005 Contact details fixed in org add/edit 2015-08-31 03:25:04 +02:00
Iglocska 2cfec487ef Fix to the memberslist 2015-08-31 03:19:45 +02:00
Iglocska 6e5b9a5ac5 Cleanup and fixes to the memberslist 2015-08-31 03:08:49 +02:00
Iglocska 186452cd5b Further progress 2015-08-31 02:32:37 +02:00
David André b7f3640e55 Corrected typo in word-wrapping for description in event display 2015-08-30 22:57:53 +02:00
Iglocska 704880ce59 Merge branch 'master' into feature/sg 
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Server.php
 2015-08-30 13:29:05 +02:00
Alexandre Dulaunoy cbfcd0b883 Merge pull request #626 from MISP/wrap-description 
Word-wrap for event description
 2015-08-28 15:00:17 +02:00
David André 3b75f6e793 Word-wrap for event description 
Request: https://groups.google.com/forum/#!topic/misp-users/6FbZp0jd8_g
 2015-08-28 14:47:01 +02:00
Iglocska ffef691aa6 Merge branch 'hotfix-2.3.120' into develop 2015-08-27 13:48:57 +02:00
Iglocska a320e9f34b Merge branch 'hotfix-2.3.120' 2015-08-27 13:48:45 +02:00
Iglocska 0ded8805c0 Cleanup of some mistakes 2015-08-27 13:47:54 +02:00
Iglocska d8ff77907c Merge branch 'hotfix-2.3.118' into develop 2015-08-27 12:39:48 +02:00
Iglocska 21decf0ecf Merge branch 'hotfix-2.3.118' 2015-08-27 12:39:32 +02:00
Iglocska 01398b3ade Add / Remove tags from events via a new API 2015-08-27 12:38:50 +02:00