Commit Graph

533 Commits (00005bca97e02747e4cc2a9d32b5d503c27c8757)

Author SHA1 Message Date
Iglocska 00005bca97 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Model/Attribute.php
2015-07-22 19:30:45 +02:00
Iglocska 616629e9b5 Fixed an issue with the NIDS export not correctly working for single events 2015-07-22 19:27:56 +02:00
Iglocska 47cc0e4d18 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Model/Attribute.php
	app/Model/Event.php
2015-07-22 18:04:02 +02:00
Iglocska 1bf2995f4e Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
2015-07-22 17:19:13 +02:00
Iglocska 684be69ed0 Incremental export generation for HIDS and NIDS exports
- Instead of fetching all events at once for the export, events are fetched one by one
- Greatly reduces memory footprint (It mostly depends on the event with the most eligible attributes now, instead of the combined list of all events)
- Because of the lower memory usage, the time taken for the export is also slashed to a fragment of what it was before
2015-07-20 16:25:16 +02:00
Iglocska b089cf077f Some changes to the workers
- some fixes with the previous iteration of the background workers
- PID now checked using ps -p instead of looking for it in /proc
2015-07-17 15:06:38 +02:00
Iglocska 93f9a01c87 Changes to the hids exports
- fixed some issues with unset variables (from, to, last) when triggered by the background workers
- reduced memory usage of the hids exports (removed storing the hashes twice in memory, drastically removed the data retrieved from the db when preparing the export)
2015-07-17 10:50:50 +02:00
Iglocska c906cacd81 Merge branch 'pr567' into hotfix-2.3.97 2015-07-13 11:23:29 +02:00
Iglocska 47ad24fbad Merge branch 'pr564' into hotfix-2.3.97 2015-07-13 11:23:24 +02:00
Richard van den Berg 4b5bc3736a Use setupHttpSocket for fetchPGPKey 2015-07-13 11:05:53 +02:00
Iglocska 1645ee1e3b Rework of the diagnostics for background workers
- shows dead background workers
- allows site admins to add workers to any queue on the fly
- allows site admins to kill workers on the fly
2015-07-12 21:45:11 +02:00
David André 2b6ec81891 Edited comment for RPZ_Policy
Removed copy/pasta and added a correct comment for RPZ_Policy
2015-07-09 11:49:58 +02:00
Iglocska f1a5ba52e5 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Lib/Tools/XMLConverterTool.php
	app/Model/Event.php
2015-07-08 14:02:54 +02:00
Iglocska 6a25471ea4 Fix to an error with very large strings in an array causing a failure in the XML conversion of simpleXML, fixes #500
Moved the XML conversion in restfullEventToServer() to MISP's own xml conversion tool
2015-07-08 10:37:20 +02:00
Iglocska e706562cd5 Fixes to the RPZ export based on the testing of elhoim
- some errors in the format (wrong comment character used, rpz-ip not appended to IP addresses, missing semi-colon)
- removed hostnames that are on domains blocked by the rules based on domain attributes
2015-07-07 14:42:28 +02:00
Iglocska 038ccd99bd Work on the new attribute types 2015-07-06 18:19:51 +02:00
Iglocska a05afbdd11 GnuPG.binary demoted to optional setting as it should be 2015-07-01 09:01:32 +02:00
Iglocska 0481e6eb02 Merge branch 'master' into feature/sg
Conflicts:
	VERSION.json
	app/Controller/ServersController.php
	app/Controller/ShadowAttributesController.php
	app/Controller/UsersController.php
	app/Model/Event.php
	app/webroot/js/ajaxification.js
2015-06-29 14:27:16 +02:00
Iglocska 33390ee8f7 Some merge issues removed 2015-06-29 13:53:54 +02:00
Iglocska 3f215743f0 Complete rework of the ZeroMQ implementation
- python server running in the background doing the publishing
- MISP -> python script communication via redis
- configurable / controllable via the admin UI
2015-06-29 08:56:45 +02:00
Iglocska df1c6b1961 Merge branch 'fix-stix-date-ranges' into hotfix-2.3.86
Conflicts:
	app/View/Events/automation.ctp
2015-06-24 17:50:26 +02:00
Iglocska 3d2b8c3c10 Added pub/sub feature using ZeroMQ, fixes #540 and fixes #526
- by installing the requirements described in the update and the install instructions (ubuntu only for now, centos/red-hat versions to be tested and described), administrators can enable the pub/sub feature
- assign a port to the service via the interface
- each time an event is published, MISP will use ZMQ's PUB feature to push out a MISP JSON package using the "misp_json" prefix
2015-06-24 17:38:15 +02:00
Iglocska c120c5bdd3 Some merge issues resolved 2015-06-23 17:21:19 +02:00
Iglocska ae0e1aeacb Merge branch 'feature/rpz' into hotfix-2.3.86
Conflicts:
	app/Console/Command/EventShell.php
	app/Model/Server.php
2015-06-23 17:19:08 +02:00
Iglocska 6135804afa Removed some junk 2015-06-23 11:00:53 +02:00
Iglocska ea0dd2a33f PGP key selection on fetch, fixes #554
- MISP will now fetch a list of all keys matching the e-mail address from the MIT server from the user edit view
- A popup will present all the matching keys (with the creation date, key ID, email addresses associated - and the fingerprint when hovering over them)
- Once the admin clicks on one, it will fetch the desired key

- future enhancement possibility: move the second stage (the actual key fetch) to the server side instead of a direct ajax query from the user's browser
2015-06-23 10:56:19 +02:00
iglocska a0afab66a7 Various changes and bug fixes
- contact reporter first tries to contact orgc users on the instance, if they don't exist, it will contact the owner (instead of going straight to the owner)
- hostname / domain name validation change broke validation of hostnames/domain names / email addresses with a "-"
- Some documentation changes for the REST API (more coming)
- some tuning of the freetext import
2015-06-18 14:49:25 +02:00
iglocska 3d51e34386 Small tweak to the email/domain/hostname validation, affects #551 2015-06-17 10:31:25 +02:00
iglocska 5820d899c0 Relaxed validation of tlds in domain/hostname/email-src/email-dst attributes to allow for longer custom tlds 2015-06-16 16:34:15 +02:00
Richard van den Berg cc1744dd46 Add $from and $to to Event->stix() 2015-06-15 10:25:59 +02:00
Richard van den Berg 68615ffb23 dateFieldCheck actually expects YYYY-MM-DD 2015-06-15 10:06:46 +02:00
Iglocska c73f71f243 Merge branch 'master' into feature/sg
The merging is complete

Conflicts:
	VERSION.json
	app/Console/Command/ServerShell.php
	app/Controller/AppController.php
	app/Controller/AttributesController.php
	app/Controller/EventsController.php
	app/Controller/PostsController.php
	app/Controller/UsersController.php
	app/Model/Attribute.php
	app/Model/Event.php
	app/Model/Log.php
	app/Model/Server.php
	app/Model/User.php
	app/View/Elements/side_menu.ctp
	app/View/Users/admin_index.ctp
	app/webroot/js/ajaxification.js
2015-06-10 22:54:20 +02:00
Iglocska 3c6f73e41c Some further cleanup / refactoring 2015-06-10 13:01:36 +02:00
Iglocska 707140243a Updated the documentation to reflect the correct STIX / CyBox versions required
- Updated the admin tool to check the STIX / Cybox versions
2015-06-10 12:47:00 +02:00
Iglocska 822172d425 Fixes to the e-mailer and the HIDS export
- HIDS exports did not include filename|hash types
- Sending a password reset / welcome message picked the opposite subject line
- line breaks were sent as literals.
2015-06-10 09:50:38 +02:00
Iglocska 47d02845d2 Added the option to use an alternat executable for gpg, fixes #498
- users can specify an alternate gnupg executable
- Since GnuPG2 is not compatible with the last stable CryptGPG version, there are 3 options for CentOS / Red Hat users:
  1. Don't use a passphrase for the server's PGP key
  2. Install the beta version of CryptGPG (1.4.0b4)
  3. Install GnuPG classic and point MISP to the executable

- This patch enables option 3, administrators can point MISP to the alternate executable in the server settings
2015-06-09 13:04:33 +02:00
Iglocska a81f4a19ed Server setting changes logged, fixes #531 2015-06-09 09:55:22 +02:00
Iglocska 71635b00a1 Added a new API parameter that allows to restrict events to the most recently published ones, #527
- added the new flag "last" to the list of parameters
- exports affected: XML, CSV, NIDS, HIDS, STIX, Text, RestSearch
- Valid values: number + format where format can be d, m, h for day, minute, hour (examples: 5d or 12h or 30m)
2015-06-06 20:00:57 +02:00
Iglocska b36c0da66a Timing for rescheduling of tasks changed slightly
- The rescheduling now happens before the task is executed - this way a failed job will not prevent the rescheduling of the next execution time
2015-06-03 23:49:37 +02:00
Iglocska d4b72bd0cc Disablerestalert setting clarified and default set to true, fixes 511 2015-06-02 12:06:32 +02:00
Iglocska b467f0a9a9 Events without attributes are now blocked from pull/push, fixes #476
- Events published / pushed will now refuse to sync if the situation arises where no attributes would be eligible to be synced
- Events pulled that contain no attributes will be thrown away
2015-06-01 17:45:50 +02:00
Aaron Kaplan d9ae3c19b8 Merge branch 'master' of https://github.com/MISP/MISP 2015-05-27 21:10:33 +02:00
iglocska 42841b59c1 Finished the e-mailing rework branch, fixes #505, fixes #504, fixes #502, fixes #499
- this commit is mostly here to capture what was changed in hotfix 2.3.69

- e-mailing completely reworked, all e-mails now flow through the same method
- that method will handle all encryption and the decisions whether to send e-mails unencrypted to users without an encryption key, whether to keep the body of the e-mail untruncated, etc
- all e-mails are now also logged here (including the reason of a potential failure)

- new server settings for default template messages for password resets / new user welcome messages

- admin e-mail interface reworked and org admins now also have access to the features

- password resets / new user for site and org admins (where applicable) - quickly reset the password of a user and alert them using the pre-defined reset template

=====

- Tuned the freetext import to really accept free-text. Let me know if you have any tips for tuning the detection further!

- it now breaks the passed string on whitespace and line-break and tries to resolve the rest. Filename resolution tightened to exclude anthing that starts or ends with a .
2015-05-27 18:27:53 +02:00
iglocska 620b7d1adb New emailer finished 2015-05-27 17:46:01 +02:00
iglocska ecf9facf07 Further progress 2015-05-25 20:54:10 +02:00
iglocska 3431d2cc0d Rework of the e-mailing, part 1
- Reworking the way e-mails are sent - all of it goes through a centralised e-mail method
- just pass the recipient, recipient encryption key collection, body, alternate body if the message cannot be encrypted, subject, reply to address and pgp key for reply to along and the method will do the rest

- encrypt if possible, check if sending without encryption is allowed, signing, adding attachment for reply to encryption key, using alternate sanitised body if it is enforced for accounts that cannot use encryption is all done in one place

- easy to maintain and expand with future changes (such as the S/MIME pull request on github)
2015-05-25 17:18:39 +02:00
iglocska 9b4974d394 Merge branch 'unencrypted' into hotfix-2.3.69 2015-05-25 10:25:25 +02:00
iglocska de50a99f44 Merge branch 'email-notifications' into hotfix-2.3.69 2015-05-25 10:24:04 +02:00
iglocska 2afea61ea0 Added the missing ways to exploit the rpz functionality
- rpz added to exports, both old-style and with background workers
- per event rpz functionality added
2015-05-20 16:23:42 +02:00
iglocska dedc9f5ef2 First revision of the RPZ export complete
- documented in automation view
- right now it follows the simple rule of user > admin settings > default values when generating the export
- Parameters can be passed via url / JSON object / XML object
- filters include filter on event ID, date range, tags

TODO:
- buttons for a per event download via the UI
- introduce new export option for normal users (via background workers and the old style export)
2015-05-20 15:04:41 +02:00