Commit Graph

2286 Commits (9b85428897b6930422138abcb93ee1ea65bcaeb8)

Author SHA1 Message Date
Iglocska 55e66d7d74 Correct conversion of the own server before sync
- also a small fix to the event tags and unicode chars
2015-12-11 14:08:45 +01:00
Iglocska e103e84b21 Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 2015-12-10 13:30:22 +01:00
Iglocska 45b3eb25ec Only capture objects when adding an event via the API 2015-12-10 13:30:03 +01:00
Iglocska 7ac9b2c70a Further fixes on the sharing group sync 2015-12-10 13:28:58 +01:00
Iglocska 1f3bfc3d6a Org and SG fixes for issues that are breaking the functionality 2015-12-10 10:54:31 +01:00
Iglocska 5f4c90699f Allow orgs to not have uuids
- only in if they are external orgs
2015-12-10 01:37:56 +01:00
Iglocska 5ed1c27e43 Disable users
- users can now be disabled by an admin
- disabled users cannot login (via the UI or the API) and will be informed
- login attempts by disabled users are logged

- also added the expiration field for later use
2015-12-09 23:47:19 +01:00
Iglocska a009c56f66 Merge branch '2.4-syncrework' of https://github.com/MISP/MISP into 2.4-syncrework 2015-12-09 23:02:58 +01:00
Iglocska 2601ad146e Sharing group changes depend on modification time 2015-12-09 23:02:25 +01:00
Iglocska bc63ed42b6 Fix to the Discussion boards 2015-12-09 23:01:37 +01:00
Iglocska 79b2ae520e Further progress on the sync rework 2015-12-09 23:00:21 +01:00
Iglocska f867301c35 Fixed the locked field not being set on push 2015-12-09 02:47:17 +01:00
Iglocska 99e8263447 Small fixes 2015-12-09 02:29:04 +01:00
Iglocska b40e0fdc7c Merge branch 'master' into 2.4-syncrework
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/ComplexTypeTool.php
	app/Model/Attribute.php
	app/View/Pages/administration.ctp
2015-12-09 02:00:23 +01:00
Iglocska 5debff6b0d Visual fixes 2015-12-09 01:50:50 +01:00
Iglocska af92e29e3c Further progress on the sync
- also, added maintenance mode
- various fixes
2015-12-09 01:43:54 +01:00
iglocska eaab990620 Double quoting of quoted messages in discussion threads fixed 2015-12-08 15:27:03 +01:00
iglocska 5f153b36c6 Invalid message fixed when accepting several proposals at once 2015-12-08 15:18:34 +01:00
iglocska fbd97df3ac Several fixes, among others fixes #748
- Double sanitisation when edditing an attribute/proposal comment removed
- Fixed an issue where an ip/resource was recognised as a CIDR notation IP range instead of a url
- Changed the flash message for publishing without e-mails to something less scary
2015-12-08 15:12:13 +01:00
Iglocska 1b46840f66 Merge artifact removed 2015-12-08 11:17:23 +01:00
Iglocska 215bca0954 Fix to the download as failing due to an incorrect fetch to check if the event is visible to the user 2015-12-08 11:08:37 +01:00
Iglocska 24fc2399cc Further progress 2015-12-07 02:02:32 +01:00
Iglocska 3831ee2e90 Further work on the sync 2015-12-07 01:32:51 +01:00
Iglocska fa7fa322cb First stab at the push filters influencing the pull of a remote instance 2015-12-06 19:41:29 +01:00
Iglocska e66c38d6f9 Further work on the discussions complete for now
- adding a new post automatically scrolls to the new post
- adding/editing/deleting posts persists the context (discussion thread vs event view)
2015-12-06 15:28:21 +01:00
Iglocska 1584ddfc48 Finish of the new discussion post add
- flips to the page where the post was added
- scrolls to the last post
2015-12-06 00:44:57 +01:00
Iglocska d66d26d383 Merge and rework of the thread pagination
- not complete yet

Merge branch 'master' into 2.4-beta

Conflicts:
	VERSION.json
	app/Controller/EventsController.php
2015-12-05 22:17:43 +01:00
iglocska 63ca467a0c Fix to a missing Log Model init causing an exception 2015-12-04 15:56:39 +01:00
iglocska 5e79c30974 Fix to the previous fix
- Flipped it the wrong way, fixed now
2015-12-04 14:28:02 +01:00
iglocska a82addb981 Small fix to the previous commit
- Small fix to a copy-paste fail
2015-12-04 14:23:42 +01:00
iglocska 65faeb48d9 Further tweaks
- fixed some corner cases
- added support for the same defanging to the freetext import tool
2015-12-04 11:33:14 +01:00
iglocska 744cf50fb9 Update to attribute validation and the freetext import tool, fixes #742
- defanged URL type attributes are refanged on input
- admin script to do the same for all existing attributes

- admin tool doesn't recognise a word followed by a . as a url
2015-12-04 10:43:38 +01:00
Iglocska 39945ca39e Fixes to the logging
- in some places MISP tried to save the org ID instead of the org name in the logs

- fixed
2015-12-03 10:20:29 +01:00
Iglocska ab26eafd63 Added the possibility to enable debug for site admins
- new option in server settings
- enable debug (equal to normal debug level 1) for site admins only

- regular users will be unaffected
2015-12-03 01:45:38 +01:00
Iglocska d433618c71 Also, enabled the filtering on pull
Merge branch 'master' into 2.4-beta

Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/Server.php
2015-12-03 00:27:56 +01:00
iglocska 7763b63dc2 Junk left in the previous commit 2015-12-02 22:12:54 +01:00
iglocska 9f684d230d Filter and discussion changes
- event index filtering now accepts POST requests with a json object
  - format has to be filter syntax passed for each field. Example:
    - {"tags":"OSINT|TLP:WHITE|!PRIVINT", "published":"1"}
  - Fixed an issue with no tags being recognised leading to the index returning an unfiltered list
  - Required for filtered pulls from 2.4

- Discussions
  - Event discussion thread initiated on first post instead of first view
2015-12-02 22:07:54 +01:00
iglocska 864298e9e5 Fix to an incorrect call on sending out alert emails on edit 2015-12-02 01:15:43 +01:00
iglocska 0265e92486 Fix to a newly introduced bug that breaks updates of attributes via pulls 2015-12-02 00:46:41 +01:00
iglocska 268c7683a0 Rework of the event add/edit
- allows for saving an event even if an attribute fails
  - logs attributes that fail validation

- same for edit

- add_misp_export updated with the above in mind
2015-12-01 15:39:12 +01:00
Iglocska 5dbbe84069 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
	app/Controller/ShadowAttributesController.php
	app/Model/Event.php
	app/View/Elements/side_menu.ctp
2015-11-30 09:37:22 +01:00
iglocska 85eaea724c Version bump 2015-11-30 02:29:52 +01:00
iglocska 9eb5680ee8 Reimplementation of the Add XML feature
- called Add MISP export now
- can be an XML / JSON file
- result browser with explanations of failures

- REST XML/JSON add/edit of events returns errors instead of the partially succeeding event
2015-11-30 02:28:07 +01:00
Iglocska 184949cc9f Some small taxonomy fixes 2015-11-29 22:36:14 +01:00
Iglocska 714ed198e5 Various fixes throughout the application
- org field still used in some places other than the legitimate use-cases
2015-11-28 23:49:52 +01:00
Iglocska 908f2c4c46 Rework of the taxonomies
- users can now add taxonomy tags separately from normal tags on the event view
- tag index now shows taxonomy
2015-11-27 17:41:41 +01:00
Iglocska d20946f5ed Fix to logging causing certain functions to fail on migrated installations 2015-11-27 14:10:25 +01:00
iglocska b30bfab0a5 Delete proposal attachment if the proposal was accepted / discarded
- there is no need to keep retransfering the actual attached file if all we want to convey is that the proposal is gone.
2015-11-27 09:16:17 +01:00
iglocska 91c4f67ebd Fix to an issue where a proposal with an attachment could not be correctly accepted 2015-11-27 08:49:13 +01:00
iglocska 8cac54fd66 Updated CakePHP version to 2.7.7 2015-11-26 18:36:25 +01:00
iglocska 72db1ab211 Left off the view file from the previous commit 2015-11-26 17:13:01 +01:00
iglocska 57c5696d96 Backport of a fix to 2.4 adding comments to proposed attachments 2015-11-26 17:06:33 +01:00
iglocska c94d67275f Fix to an issue with the proposal uploader
- also a small fix to the baseurl auto detection
2015-11-26 16:38:39 +01:00
Iglocska 93af832abe Blocked the colour update when the taxonomies are updated
- better to not overwrite the local tag colours unless the tag is refreshed from the taxonomy view. A gree tlp:red looks silly.
2015-11-26 09:21:51 +01:00
Iglocska c104a1763b Temporarily re-added org field for jobs 2015-11-26 04:38:57 +01:00
Iglocska 0572b2030e Further work on the taxonomies
- colour coding
- filters on the index
- mass tag creation
2015-11-26 04:31:24 +01:00
Iglocska 1328d83fe5 Updated taxonomies 2015-11-25 15:43:45 +01:00
iglocska b5857696e9 Update to the Taxonomies 2015-11-24 12:02:39 +01:00
iglocska 3784209cf5 First bash at Taxonomies
What works:
- added submodules for taxonomies
- added import tool for taxonomies
- added models and convenience functions for taxonomies

- site admins can update taxonomy libraries
- list taxonomies / view indvidual ones (with all resolved tags)
- create tags manually if a taxonomy is enabled
- view related tags / events quickly from the Taxonomy view

What doesn't work:
- Users still cannot choose a tag from taxonomy lists (this will be the main functionality)
- Feature cannot be disabled
2015-11-24 03:27:14 +01:00
iglocska 71cbaefae3 Removed nested gitignores 2015-11-23 19:44:57 +01:00
iglocska ba8728abb9 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/Component/IOCImportComponent.php
2015-11-22 17:53:08 +01:00
iglocska 97f6da18da Added file as an option when a url like google.com is recognised 2015-11-22 17:50:22 +01:00
iglocska ca51b55d6b Changes to the OpenIOC Import, fixes #725
- Removed the OpenIOC Indicator UUID persistence and moved it to a comment
  - this allows for the same OpenIOC report to be imported into separate events and won't result in a UUID collision

- Reworked the composite indicator resolver
  - more generic, allows for 3 part composites (to allow for regkeypath/regkey/regvalue combinations)

- Registry values now correctly recognised
2015-11-22 17:38:11 +01:00
iglocska 74ab203fda Memberslist now links to the organisations 2015-11-21 23:55:48 +01:00
iglocska 1805614efb Fix to a bug in the template attribute creation 2015-11-20 04:31:58 +01:00
iglocska 709a6cae3d New category lookup added to templates 2015-11-20 04:22:10 +01:00
iglocska 61282db28e Fix to the ZMQ call on publish incorrectly passing data to the event fetcher 2015-11-20 03:53:46 +01:00
iglocska 394ae49596 Some bugs resolved 2015-11-20 03:42:35 +01:00
iglocska ac56b8e806 Empty server list causes the user creation to fail
- fixed
2015-11-20 03:11:41 +01:00
iglocska 94072f7c60 Fixed a newly introduced bug in the IOC import component 2015-11-20 01:50:10 +01:00
iglocska 3cc3b4f34d fixed too restrictive generateCorrelation attribute fields 2015-11-20 01:21:44 +01:00
iglocska ec566d6225 Small fix to the upgrade script 2015-11-20 01:09:02 +01:00
iglocska 0fb9a70449 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
2015-11-20 00:15:17 +01:00
iglocska 56adab6122 Bugfix pack, fixes #724, fixes #721
- Fixed an issue with the new UUID generation method call in OpenIOC
- Fixed an invalid validation check on the salt key

- Added a note on the server page to make it more obvious that values can be changed by double clicking them
2015-11-19 16:50:14 +01:00
iglocska c71c8f968d Fix to a bug in the financial tool's validation router
- it didn't use the validation type -> validation method array to call the validation function
- resulted in CC validation not being called as expected
2015-11-17 22:25:37 +01:00
iglocska db359170f6 some left over merging issues among other things 2015-11-17 22:01:22 +01:00
iglocska 043057f133 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 15:13:55 +01:00
iglocska bda6923018 Security fix fixing an XSS issue with the templates
- as discovered and reported by Rafael Pablos García of INCIBE

- fixed a reflected XSS for template creator users when viewing a template
2015-11-17 11:58:56 +01:00
iglocska b59ab5cd8b Added logo to organisation page 2015-11-17 08:52:24 +01:00
iglocska 332d5fa666 Reverted the sanitisation of the baseurl variable on the view level
- sanitising it in appcontroller instead
2015-11-17 01:17:10 +01:00
iglocska 485c007b39 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
	app/Model/EventTag.php
	app/Model/TemplateElementAttribute.php
	app/Model/TemplateElementFile.php
	app/Model/TemplateElementText.php
	app/Model/ThreatLevel.php
	app/View/Attributes/index.ctp
	app/View/Elements/eventattribute.ctp
	app/View/Elements/eventattributerow.ctp
	app/View/Elements/global_menu.ctp
	app/View/Elements/side_menu.ctp
	app/View/Events/automation.ctp
	app/View/Events/index.ctp
	app/View/Pages/administration.ctp
	app/View/ShadowAttributes/index.ctp
	app/View/Tags/index.ctp
2015-11-17 01:14:51 +01:00
iglocska 866641fb40 Fixed an issue with the blacklists not saving the event org 2015-11-17 00:47:51 +01:00
iglocska 6cb7cc7748 Fixed some deprecated validations left over from the purge a few weeks ago 2015-11-17 00:35:32 +01:00
iglocska b3a2428345 Merge branch 'basedir' into hotfix-2.3.160
Conflicts:
	app/Controller/AppController.php
	app/View/Pages/administration.ctp
2015-11-17 00:33:34 +01:00
iglocska 053c27ae9a Removed a crappy solution to an issue with attributes being overwritten that was fixed a long time ago correctly on data entry 2015-11-16 19:51:38 +01:00
iglocska cd3096a38f Fixed a security issue with the regular expressions
- as discovered and reported by Egidio Romano of Minded Security

- Users with the perm_regex permissions could create a malicious regex that leads to RCE using the PHP /e modifier for preg_replace().
- Regular expressions are now sanitised on edit / creation of the malicious modifier

- also added an admin tool that lets admins clean their current set of regexes of the harmful modifier
2015-11-16 19:47:31 +01:00
iglocska 3045cc2630 Fixed an invalid detection of JSON requests when not passing the accept header
- some json actions worked by passing the .json extension in the url
- these pages were correctly returning JSONs but were often internally running through the HTML code-path thanks to an invalid detection
- the new correct detection should provide a major speed boost for certain json requests
2015-11-16 00:25:21 +01:00
iglocska da5fac5873 Added logging of auth key changes, fixes #715
- Changing the auth key now creates a log entry that inclues the user's ID, e-mail address old and new autkeys
- Also removed the logging of the hashed password for newly created users
2015-11-16 00:22:58 +01:00
iglocska 487912a15a Fix to an invalid json request detection leading to the JSON export failing
- It seems like relying on the Accept header can lead to the data type detection failing when accessing .json extension views
- this issue seems to have gone unnoticed since until now the data passed to the json view was the same as that passed to the html view
- this means that all the additional UI only features may have triggered in the background previously on .json views
2015-11-15 17:43:19 +01:00
iglocska f36e00e944 Permission checks 2015-11-14 17:27:06 +01:00
iglocska 8cc0996c3c Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/View/Elements/side_menu.ctp
	app/View/Pages/administration.ctp
2015-11-14 17:16:38 +01:00
iglocska 7fbbdafec2 Tighter control over deleting organisations 2015-11-14 11:08:41 +01:00
iglocska afdcc1af0c Fixed a security issue with the CSRF protection being avoidable using some site admin functionality
- as discovered and reported by Egidio Romano of Minded Security

- Lacking checks of HTTP methods in some functionality could lead to a site admin uploading and executing malicious scripts

- Tightened HTTP method verification across the board for actions that modify data
- Turned some administrative tasks to POST only actions
2015-11-13 23:57:03 +01:00
iglocska a380458d2e Fixed a security issue with the site admin file uploader
- as discovered and reported by Egidio Romano of Minded Security

- The site admin file upload tool allowed for unrestricted file upload that could lead to RCE
- Fixed the file uploader to be much more restrictive
- removed the interactive terms file upload
2015-11-13 23:48:29 +01:00
iglocska 5941772b3a Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
2015-11-12 09:49:04 +01:00
iglocska 69031ab35e Fixed an issue where PGP keys that are set to never expire show up as expired 2015-11-12 09:46:33 +01:00
iglocska 1c6f45de52 Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/EventsController.php
2015-11-12 09:26:29 +01:00
iglocska 620aab4e0e Merge branch 'master' into 2.4-beta
Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Model/Event.php
2015-11-12 08:44:23 +01:00
iglocska 675ceb2e0e Better verification of PGP keys
- checks whether the key can be used to encrypt and whether it's expired
2015-11-11 17:03:59 +01:00
iglocska 6548297b80 Merge branch 'hotfix-2.3.154' into hotfix-2.3.155
Conflicts:
	VERSION.json
2015-11-10 15:22:10 +01:00