Commit Graph

631 Commits (93af832abef6293052efb768f6109bf8a5355f8a)

Author SHA1 Message Date
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 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 1805614efb Fix to a bug in the template attribute creation 2015-11-20 04:31:58 +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 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 db359170f6 some left over merging issues among other things 2015-11-17 22:01:22 +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 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 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 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 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 0d758de89b Fixed an issue where a linebreak in an event info would break the CSV export, fixes #710
- also added comment field for attributes
- until now multi line fields were both escaped and the line breaks removed
  - this was overkill, linebreaks are now kept intact
2015-11-10 13:45:40 +01:00
iglocska 34e4183854 Moved the logic for flagging an attribute for a validation issue to the model 2015-11-09 14:50:57 +01:00
iglocska 3716b38a60 Bin number added to validation 2015-11-09 13:42:22 +01:00
iglocska cd886b4a79 Relaxed financial attribute validation
- also added 2 new types: bank-account-nr and aba-rtn
- validation is completely relaxed
- idea is to add a visual notification in the view for these attributes types if they are not valid (invalid financial indicators are still interesting)
2015-11-09 12:36:49 +01:00
iglocska 9faf3df8ae Some fixes to the api authentication
- Handle user not found gracefully
- Log the failed authentication correctly
2015-11-09 08:52:06 +01:00
iglocska 324418dcf9 Merge branch 'master' into 2.4-beta
Merge and upgrade of several new features

Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Controller/TagsController.php
	app/Model/AppModel.php
	app/Model/Event.php
	app/Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php
2015-11-08 23:26:19 +01:00
iglocska c83b1e2dd0 Fix to the CSV export, fixes #710 2015-11-08 22:56:00 +01:00
iglocska 16e7974fc0 Improved logging, fixes #695
- Added logging of failed login attempts
- Added (optional) logging of successful authentications
  - admin setting that has to be enabled
  - will log all API calls (both HTTP method and target url)

- optional logging of user IP address for all logs
  - each log entry created while this setting is enabled will log the IP address of the client
  - disabling it also hides the IPs from the interface
  - added new IP field for the log search (only if enabled)
2015-11-08 22:35:46 +01:00
iglocska 345e898f5f Tagging added to the API
- Create / Edit / Remove / index / view tags via the API
2015-10-30 16:28:51 +01:00
Iglocska 7a686a2718 Merge branch 'master' into 2.4-beta
Also, reworked a lot of remaining distribution checks not handled by the main fetch methods

Conflicts:
	VERSION.json
	app/Controller/AttributesController.php
	app/Controller/ShadowAttributesController.php
	app/View/ShadowAttributes/add.ctp
	app/View/ShadowAttributes/edit.ctp
2015-10-30 13:39:12 +01:00
Iglocska 80f29c1f33 More details on the PGP validation tool 2015-10-27 15:18:04 +01:00
Iglocska f9da3f2d2c Small fix to the pgp key validation tool
- doesn't break on completely invalid keys anymore
2015-10-27 14:00:31 +01:00
iglocska 1d3ec3afa3 Merge branch 'feature/sg' of https://github.com/MISP/MISP into feature/sg 2015-10-22 10:01:25 +02:00
iglocska ef1d3949e7 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ShadowAttributesController.php
	app/Lib/Tools/JSONConverterTool.php
	app/Lib/Tools/XMLConverterTool.php
	app/Model/User.php
	app/View/Elements/eventattribute.ctp
2015-10-22 09:59:00 +02:00
iglocska 6fa27d659a Reverted change in proposal file storage path that wasn't needed 2015-10-22 09:51:31 +02:00
iglocska 61e865956b Fixes to several issues, fixes #693
- Fixed a critical bug in the XML export
  - As of recently XML exports include relations as they were missing before
  - the sanitisation of the event info field in related attributes was incorrectly sanitized of unicode characters
  - this can lead to the XML export breaking and also for affected events to be blocked from synchronisation

- Proposal fixes
  - fixed an invalid uuid generation that lead to an exception
  - fixed the attachments for proposals still using the old attachment system that disallows most filenames
  - added the automatic creation of hashes for attachment proposals
2015-10-21 23:44:07 +02:00
iglocska e63d10f0d4 Various bugfixes 2015-10-18 23:10:25 +02:00
iglocska e191a25317 Updated the server preview to work between 2.4 instances 2015-10-18 21:31:01 +02:00
iglocska 479a3bfde4 Check if a tag is pushed with an event before trying to loop through the tags... 2015-10-18 20:57:20 +02:00
iglocska da8b2604ba Fixes to some validations issues using cakephp 2.7 2015-10-18 20:51:37 +02:00
iglocska 867dbbc7a3 Small fix thta resolves the inability to delete orgs 2015-10-18 19:51:11 +02:00
iglocska 37faddff62 Further progress
- rework of the push mechanism
- rework of the object capture on add
- rework of the sync filter UI
2015-10-18 18:03:48 +02:00
Iglocska 044996bdb5 New feature: Proposal to delete attribute, fixes #315
- Users can now propose a deletion to an attribute
  - also tied into the mass accept mechanism
  - new UI elements to go along with this

- Code refactoring for category list retrievals
  - Until now, several methods got the list of categories from the validation code
  - Was awkward with a fake empty element that had to be removed
  - altered the validation code to read the categoryDefinitions array instead
2015-10-16 23:49:04 +02:00