MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
2,307 Commits
35 Branches
366 Tags
190 MiB
Commit Graph

1828 Commits (3431d2cc0d0da8868833675b79701ae73618eb71)

Author SHA1 Message Date
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 5559536bf1 Freetext import tool now splits the input by line break and whitespace, fixes #502 2015-05-24 10:09:41 +02:00
iglocska 0cbedf5847 Date set to today's date by default, fixes #495 2015-05-21 14:21:09 +02:00
iglocska 85e52810a4 Ignoring non MISP AUTHORIZATION headers, fixes #478 
- Users being logged on would not be able to use the actions that are also used for automation
- Those actions trigger a check of the authorization header, which in certain use cases can be set with values that is outside of the scope of MISP

- MISP will now try to only detect MISP auth keys in the headers and if it detects something else it ignores it
 2015-05-20 16:32:04 +02:00
iglocska c02aeb8802 Fix to copy pasta issue breaking from/to filters in exports, fixes #494 2015-05-16 01:31:18 +02:00
iglocska 7fb6e2f95e Fixed issue with proxy settings attempted to be added in synctool, even if not set 2015-05-15 09:25:07 +02:00
iglocska 88d4a2da83 Merge branch 'certauth' into hotfix-2.3.64 2015-05-13 17:20:15 +02:00
iglocska 962a21e3c6 Left off a file 2015-05-13 17:04:09 +02:00
iglocska 0851f44764 PGP key lookup for lazy MISP instance admins, fixes #492 
- Added a button for the add user / edit user views that fetches the entered e-mail addresses pgp key from pgp.mit.edu
 2015-05-13 17:01:56 +02:00
iglocska 35134a7f2e Implemented correct from / to api parameter checks 
- based on stevengoossensB's pull request
 2015-05-13 16:12:06 +02:00
iglocska 644b0cd512 Password reset fix 2015-05-12 11:28:36 +02:00
iglocska b144831b4d Removed debug 2015-05-04 19:02:50 +02:00
iglocska d9f4e996f2 Parse authorization headers for a valid MISP auth key, fixes #478 
- Keeps parsing until a valid auth key is found
 2015-05-04 19:01:12 +02:00
Guilherme Capilé 3055d153f8 minor typo in the unset -- should be ['User']['gpgkey'] 2015-04-28 11:32:20 -03:00
Guilherme Capilé d2eaccec31 removed session handling from plugin and moved to AppController 2015-04-28 11:25:13 -03:00
Guilherme Capilé 7a40b124a8 Merge remote-tracking branch 'upstream/master' 2015-04-28 10:45:17 -03:00
David André d03fecdc59 Fix for #467 
Fix for issue #467
Changed the label of IDS checkbox for proposals
 2015-04-20 13:43:36 +02:00
Guilherme Capilé 6de2541c9a added user defaults to plugin 2015-04-16 22:14:43 -03:00
Guilherme Capilé 9179a2263f Added client SSL certificate authentication as a CakePHP plugin 2015-04-16 22:14:43 -03:00
Guilherme Capilé d0c3b44e34 Added client SSL certificate authentication as a CakePHP plugin 2015-04-16 22:14:43 -03:00
Iglocska 699e5a9d17 Small fix to editing an event via the api 
- adding attributes without a uuid will cause the edit to fail
- attributes without a uuid will now be added as a new attribute
 2015-04-16 23:16:15 +02:00
Iglocska e339f0e646 Fixed various issues with the attribute REST api 
- also updated the sample curl scripts
 2015-04-14 13:50:51 +02:00
Iglocska e8bcab19db Background job for pull incorrectly checks the push flag on the server, fixes #457 
- Issue fixed: When background jobs are enabled the wrong flag is checked when attemptying to enqueue a pull
 2015-04-13 14:40:42 +02:00
Iglocska 116bf8e425 Fix to an issue with the caching 
- CSV caching was saving to file on each attribute, creating extremely high amounts of I/O
- reduced it to saving to file / event

- fixed incorrect pathing
 2015-04-08 22:47:28 +02:00
Iglocska 1ff0ade5cb Merge branch 'triple-dots' into hotfix-2.3.59 2015-04-08 22:41:54 +02:00
Iglocska 35976ac847 Merge branch 'cakephp-update' into hotfix-2.3.59 2015-04-08 22:38:18 +02:00
Iglocska 9f09d6d7e5 Merge branch 'cakeresque-queues' into hotfix-2.3.59 2015-04-08 22:37:30 +02:00
Iglocska 06f8a9bbd6 Merge branch 'proxy' into hotfix-2.3.59 2015-04-08 22:36:13 +02:00
Iglocska c2d5a5f1fc Merge branch 'stix_no_random_ids' into hotfix-2.3.59 2015-04-08 22:30:39 +02:00
Iglocska 348923691f Merge branch 'stix-info' into hotfix-2.3.59 2015-04-08 22:29:36 +02:00
Iglocska 094f932616 Merge branch 'disallow_unpublished_events' into hotfix-2.3.59 2015-04-08 22:22:22 +02:00
Richard van den Berg c49c387337 Only truncate string if adding ... will make it shorter 2015-04-08 14:08:38 +02:00
Iglocska cc5c32fca2 Sync update issue fixed 
- attributes were not correctly updated during a manual push due to an incorrect conditional
- re-publishing was unaffected
 2015-04-02 00:14:36 +02:00
Richard van den Berg 9b8a3e9873 Removed extraneous dash 2015-03-24 14:28:59 +01:00
Richard van den Berg 0306912271 Remove gitlink for app/Plugin/CakeResque 
CakeResque is installed with composer.phar

Removing the gitlink gets rid of this annoying error message:
No submodule mapping found in .gitmodules for path 'app/Plugin/CakeResque'
 2015-03-24 10:27:13 +01:00
Richard van den Berg 056b21ff6f Update cakephp to latest 2.6 branch 2015-03-24 10:03:17 +01:00
Richard van den Berg 1a8960b480 Use correct CakeResque queue 2015-03-23 18:02:17 +01:00
Richard van den Berg fa112d77c3 Use correct CakeResque queues 2015-03-23 17:58:41 +01:00
Richard van den Berg 75f93641dc Use isOK() for version check 2015-03-19 15:09:54 +01:00
Richard van den Berg 850e4bd19f Catch HTTP error codes 2015-03-19 14:05:10 +01:00
Richard van den Berg 2f58fdec0d Catch invalid proxy configuration 2015-03-19 13:33:17 +01:00
Richard van den Berg 106b6cb06b Allow SyncTool with empty $server 2015-03-19 13:03:16 +01:00
Richard van den Berg 05bc4c4389 Allow SyncTool to be used for generic HTTP(S) connections 2015-03-19 12:57:46 +01:00
Richard van den Berg 0e66ff140f Use SyncTool for diagnostics 2015-03-19 12:31:35 +01:00
Richard van den Berg b62032fc7b Fix typo 2015-03-19 12:20:16 +01:00
Richard van den Berg 2ccab722d7 Add proxy section to server diagnostics 2015-03-19 12:15:28 +01:00
Richard van den Berg 0d242d8549 configProxy() checks for empty arguments, no need to do it twice 2015-03-19 10:03:40 +01:00
Richard van den Berg 9e7ea8fe74 Add proxy support to SyncTool 2015-03-19 10:03:25 +01:00