MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
21,626 Commits
34 Branches
364 Tags
187 MiB
Commit Graph

307 Commits (3e706867e93973fae3e84e74080268ced30ddc58)

Author SHA1 Message Date
Andras Iklody 8fbdaddca2
fix: [bindmodel] added reset = false to the linking of users to authkeys 
- added reset = false in parameters (otherwise consecutive calls to the user model will not include the relation)
 2020-11-29 12:10:53 +01:00
Jakub Onderka c9e96322a9 new: [shibb] Allow to get organisation UUID from HTTP headers 2020-11-25 21:21:14 +01:00
iglocska 68fc0eca7d
fix: [authkey] only link the model if the instance is already updated 2020-11-24 16:28:10 +01:00
iglocska 2eec8878cd
new: [authkey] generate authkeys automatically when creating users 
- when using the new authkey system
 2020-11-13 12:54:14 +01:00
iglocska dbffebe503
Merge branch '2.4' into CRUD 2020-11-11 11:19:23 +01:00
Jakub Onderka 5a4ba9cbc1 fix: [internal] Properly set login times for custom auth 2020-10-29 17:53:11 +01:00
iglocska 62bbc95472
Merge branch '2.4' into CRUD 2020-10-20 02:01:21 +02:00
iglocska 5ea44e691d
chg: [authkey] model tied to user model 2020-10-20 01:43:38 +02:00
Jakub Onderka 380fba5405 new: [GPG] Validate fetched GPG key 2020-10-09 16:58:59 +02:00
Jakub Onderka 77833be960 chg: [mail] Another code cleanup for alert and contact mails template 2020-09-21 13:17:00 +02:00
Jakub Onderka 76b2a51253 fix: [ACL] Permissions when sending contact and alert emails 2020-09-21 13:17:00 +02:00
Jakub Onderka 8f806c4f1b
Merge pull request #6214 from JakubOnderka/otp-encryption 
fix: [otp] Allow to send encrypted OTP by mail
 2020-08-30 11:22:05 +02:00
Jakub Onderka d3eb86553b chg: [internal] Less SQL queries for event index page 2020-08-24 16:27:27 +02:00
Jakub Onderka 3005ef8f6e fix: [otp] Allow to send encrypted OTP by mail 2020-08-20 19:58:24 +02:00
Jakub Onderka f157b879a3 fix: [test] Use two spaces to pass the test 2020-08-12 19:34:05 +02:00
Jakub Onderka 6ee505a207 chg: [mail] Initialize GPG just once 2020-08-12 19:33:15 +02:00
Jakub Onderka ee4de160e8 chg: [internal] Move GPG initialization to GpgTool 2020-08-12 19:33:15 +02:00
Jakub Onderka 65a4ece3bb chg: [test] Set correct setting for GPG 2020-08-12 19:33:15 +02:00
Jakub Onderka d044df2cb4 chg: [internal] Refactor S/MIME certificate validation 2020-08-12 19:33:15 +02:00
Jakub Onderka 6d1757188a new: [internal] Log if e-mail was send encrypted or not 2020-08-12 19:33:15 +02:00
Jakub Onderka 652df56ba6 chg: [internal] Rework email sending 2020-08-12 19:33:15 +02:00
Jakub Onderka 54aa24a31e fix: [intrernal] Undefined index: Organisation notice 2020-08-12 18:32:12 +02:00
Václav Bartoš 369341683d fix: [mail] Fix body of passwordReset/newUser emails 
When MISP sends an email with new credentials, the body is generated from one of the configured templates - passwordResetText or newUserText. However, these two templates were swapped - the newUserText was used for password reset, while passwordResetText was used when new account is created.

This commit fixes it.
 2020-06-05 13:47:16 +02:00
mokaddem b724e30282
chg: [user:finaliseAndSendEmail] Aggresively catch errors and log them 
while sending email
 2020-05-07 17:11:42 +02:00
iglocska 3740e38907
fix: [registration] log entry action shortened to not cause issues 2020-05-07 15:56:08 +02:00
mokaddem 6bff239740
chg: [user:registration] Added audit log 2020-04-22 10:04:07 +02:00
iglocska 3241e95730
fix: [user registration] automatically convert selected orgs to local as described in the tool 2020-04-07 14:27:21 +02:00
iglocska 4ebc0a7988
new: [inbox] system added 
- user self-registration is the first use-case
- if the feature is enabled, users can unauthenticated send a registration request to MISP
  - request includes information on desired org and some privileges (sync / org admin / publisher)
- requests land in the inbox, admins can inspect the registration requests
  - they can accept/discard them individually or en masse
  - users will be notified of their credentials automatically
  - quick user creation if the user asks for an org that doesn't exist yet
 2020-04-07 13:21:01 +02:00
iglocska d7e3674987
new: [audit] Added user monitoring 
- site admins can set the monitoring flag on a user if the feature is enabled on the instance
- monitored users will have all requests logged along with POST bodies

- keep in mind this functionality is quite heavy and intrusive - so use it with care. The idea is that this allows us to track potentially malicious users during an investigation
 2020-03-25 11:49:33 +01:00
mokaddem 6e66256f7a
Merge branch '2.4' of github.com:MISP/MISP into pr-5210 2020-02-10 11:09:14 +01:00
Jakub Onderka 5391611d75
fix: [log] Proper format log message for reset auth key 
In future, it will be also possible to filter auth keys in logs.
 2020-01-27 16:58:46 +01:00
Jakub Onderka fd4588154a fixup! chg: [user] GPG key fetching by server 2020-01-26 19:28:04 +01:00
iglocska 56902c265e
Merge branch '2.4' of github.com:MISP/MISP into add_attribute 2019-12-12 10:05:01 +01:00
Andras Iklody 91a045c13f
Merge pull request #5208 from JakubOnderka/patch-34 
Simplify user profile logging
 2019-12-11 19:28:32 +01:00
iglocska b6bb2bb576
new: [UI] first implementation of the modal forms 2019-12-11 10:03:43 +01:00
mokaddem 806f443764
new: [statistics] Added organisation activity over time 2019-11-16 15:40:02 -05:00
iglocska 6d8b76ae4f
fix: [user] Include user settings in /users/view 2019-10-15 07:24:43 +02:00
Jakub Onderka 688bab2778 chg: [internal] Simplify UserController::admin_edit 2019-10-11 20:35:27 +02:00
Jakub Onderka 899f53dd5a chg: [internal] Simplify User::extralog method 2019-10-11 20:35:26 +02:00
Jakub Onderka 1d15722195
fix: [internal] user_count variable is already number 2019-10-03 12:02:21 +02:00
iglocska 946602a696
new: [User settings] Added user settings system 
- set settings / user
- settings can be set by user themselves or their org admin / site admin
- added first setting: publish_alert_filter
- accepts boolean branched filter options
  - supports deep logical trees
  - OR/NOT/AND
  - currently supports filtering on tags and the creator organisation
 2019-09-25 11:50:54 +02:00
Jakub Onderka a9f6af9fcb chg: [user] GPG key fetching by server 2019-09-23 22:09:02 +02:00
iglocska 9b2916a4c0
fix: [community access requests] fixed serveral issues, fixes #5194 
- added missing view to preview the request
- don't throw errors when possible, instead show what should have been sent
 2019-09-19 15:14:51 +02:00
iglocska e89d1a267d
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-09 13:03:09 +02:00
iglocska 75acd63c46
fix: [security] Fix to a vulnerability related to the server index 
- along with various support tools
- more information coming soon
 2019-09-09 13:00:21 +02:00
Jakub Onderka 4b1645a54e fix: Throw exception when GnuGP homedir is not set 2019-09-07 00:01:55 +02:00
Jakub Onderka 863e38807d chg: Allow to load Crypt_GPG from composer 2019-09-06 21:31:16 +02:00
Jakub Onderka f63cfc9c5a
fix: [UI] Fetching GPG keys 
This error was introduced in 600e540516
 2019-09-06 15:56:01 +02:00
Jakub Onderka 6f4b99026e
chg: [user] Remove unused private method 2019-09-06 13:59:47 +02:00
Jakub Onderka 600e540516
chg: [user] Use machine readable format for fetching PGP keys 2019-09-04 13:10:37 +02:00
iglocska 8418e8ee57
fix: [internal] return true from the external email sender if no mocking is happening instead of the full email 2019-08-30 11:19:43 +02:00
iglocska 181bda4698
new: [requestAccess] Made the requestAccess endpoint more API friendly and some UI improvements 
- better handling of empty parameters
- added the mock functionality to both API and UI, this will generate the e-mail to be sent and return it with no actual sending happening
- defaulting to mock if emailing is disabled
- fixed some minor bugs
 2019-08-30 11:10:59 +02:00
iglocska feb7fe82dd
new: [communities] Added support for requesting access for known communities 
- site admins can list the misp-project maintained community list
- request access to any of the communities
 2019-08-29 09:24:33 +02:00
Nikos Filippakis 9d59b10368 Publish events to Kafka 
Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
 2019-03-18 15:53:22 +01:00
Christophe Vandeplas 67efc70bf5 fix: [style] consistent space indentation 2019-02-10 13:08:55 +01:00
iglocska 2d0259ce13 fix: [CS] coding standards script re-run 2018-11-23 14:11:33 +01:00
iglocska 035f663e9b fix: [log] user zmq logging was always getting the first user instead of the actual one 2018-10-02 10:37:59 +02:00
iglocska b407aba746 fix: [CS] Updated recent changes 2018-08-20 10:50:09 +02:00
iglocska 4482373259 fix: [encryption] broken S/MIME encryption 
- as reported and pinpointed by @3c7
- blind fix, awaits confirmation
 2018-08-15 08:50:26 +02:00
iglocska 5a2061f15d fix: [pgp] left of changes for the pgp printout 2018-08-06 17:05:35 +02:00
iglocska 0e1b058ac9 fix: [bug] Fixed e-mailing bug introduced during the refactoring 2018-08-05 18:14:25 +02:00
iglocska 41f76dd963 chg: [internal] Rework of the emailing 
- extracted the encryption functions out from the main e-mailing function
- simplification of the code in several places
 2018-08-03 18:26:45 +02:00
iglocska 742c1a6cd1 fix: [cleanup] Invalid assignment in conditional cleaned up 2018-08-03 17:30:59 +02:00
iglocska c6f2d87645 chg: [cleanup] removed pointless TODOs 2018-08-03 17:26:06 +02:00
iglocska 6936625f16 fix: [cleanup] Cleaned up SMIME certificate validation 
- merged the two functionalities we've had for it
 2018-08-03 17:23:06 +02:00
iglocska a81894f14c chg: [CS] Changed to PSR-2 
- to make contributions easier, adopted PSR-2
- used php-cs-fixer to rework the style
- *sniff sniff* Goodbye tab indentation
 2018-07-19 11:48:22 +02:00
iglocska 00be1ad68a fix: [cleanup] removed obsolete code 2018-07-05 15:16:05 +02:00
iglocska 87c152d9f3 fix: Use common code-path for user init via the login page and the CLI 
- also, be consistent with initial settings
 2018-06-20 07:32:52 +02:00
Anthony Vaccaro ba96309305 Add config mapping for 'gpgconf' option in Crypt_GPG library. 
This option not only sets the location of the gpgconf binary, but
if set to false, disables behaviour that shuts down running agents
when a Crypt_GPG object is destroyed. This behaviour would also
kill any long-running or daemonised agents that are running and
configured in the gpg.homedir directory.
 2018-05-15 10:36:23 +10:00
iglocska 5acfac3539 fix: Some cleanup 2018-05-12 17:26:16 +02:00
iglocska 767ab6c21b fix: Fail gracefully during single user PGP key checks on the user view 2018-04-24 11:45:43 +02:00
StefanKelm f5aef2fd4e
Update User.php 2018-03-27 15:53:20 +02:00
StefanKelm 92dd4739c2
Update User.php 2018-03-27 15:16:50 +02:00
iglocska 8b78df3cf9 fix: Added missing db field to users 
- fixes a nasty issue with saving users failing when ZMQ is enabled on instances installed after 2.4.69
- fixes a typo that caused invalid user changes being pushed to the ZMQ channel
 2018-02-02 19:44:41 +01:00
Alexandre Dulaunoy 938180c004
fix: set the default PGP keyserver to pgp.circl.lu (faster than 
pgp.mit.edu)

TODO: A configuration for setting up the PGP keyserver at the MISP
instance setting.
 2018-02-01 12:03:22 +01:00
iglocska ca88bdf5ed fix: Graceful handling of gnupg not being set up on an instnace 2018-01-30 10:33:21 +01:00
Andras Iklody 173496c305
Merge pull request #1969 from devnull-/GPG_sign_option 
Add a option to sign GPG emails
 2018-01-24 11:11:03 +01:00
iglocska 67d9cd6a6c new: Include user action in zmq 2017-11-16 12:15:39 +01:00
iglocska 943f18d6cc new: push the action for user updates/creations/logins along with the user object to the ZMQ channel 2017-11-16 08:58:53 +01:00
iglocska 5303b86987 fix: 984732984th time is the charm... 2017-11-16 08:50:06 +01:00
iglocska 1058345ee7 fix: Reduced the user data to just a partial user object and organisation object for the zmq push 2017-11-16 08:48:59 +01:00
iglocska 8f71ce66af fix: Fixed the pubsub user push if the user object is not contained within a User key 2017-11-16 08:44:28 +01:00
iglocska e6bff6072c fix: Previous commit didn't trigger in all cases 2017-11-16 08:41:54 +01:00
iglocska bce9b94c28 chg: Push the full user object to the ZMQ feed 2017-11-16 08:37:53 +01:00
iglocska 4230601116 fix: Fixes to various issues with the cert auth 2017-09-06 23:26:21 +02:00
Richie B2B ee5af8d0bb Make newsread numeric instead of boolean 
Fixes #2394
 2017-08-25 09:41:42 +02:00
iglocska 14d5b0444d fix: Possible fix to the newsread = null issue 2017-08-25 00:03:48 +02:00
iglocska e0de52a534 fix: Fixed an obviously dumb validation rule, fixes #2394 
- derp
 2017-08-17 14:13:30 +02:00
Andras Iklody 1ee754f3e5 fix: Changed the validation of newsread and change_pw to boolean 2017-07-13 17:07:49 +02:00
iglocska 3317f56ca1 fix: Upgraded hashing algorithm used and added requirement to confirm password for user profile changes 
- Added method to upgrade all passwords to blowfish transparently
- All profile edit pages (/users/edit, /admin/users/edit, /users/change_pw) now require the user's password to be confirmed

- Thanks to cert.govt.nz for the security report.
 2017-07-12 15:38:34 +02:00
iglocska 57857c3a32 new: Performance improvements for the pub-sub modules 
- Only load and open connection to redis for the pub-sub connection once.
- Massive performance boost when the ZMQ functionality is enabled
 2017-06-16 08:41:12 +02:00
iglocska 3797177247 fix: fix a copy paste bug 2017-05-29 16:35:11 +02:00
iglocska bce780090f new: Added User and Organisation addition/change data to the ZMQ feed 2017-05-29 16:18:37 +02:00
Ángel González 926895733b Cosmetic changes 
Change space indents to tabs
Remove ?> at end of file
Add or remove some indentation where appropriate
 2017-05-08 00:45:57 +02:00
Ángel González 45ef670178 Minor tweaking of comments 2017-05-08 00:35:07 +02:00
iglocska 77ef188457 new: Password complexity defaults tightened, also passowrd requirements shown to users, fixes #2117 2017-04-11 10:04:07 +02:00
iglocska 6c487c393a chg: Default password policy now includes a 16 char+ string option as an alternative to the short 3/4, fixes #2117 2017-04-07 10:47:23 +02:00
iglocska 38138e0871 chg: Some changes to the users 
- added date created/modified in the backend
- added date created in the users index
- passowrd reset for a user now shows a warning if no pgp/smime key are set and the user might not be getting the email
 2017-03-10 16:17:14 +01:00
devnull- e4023fabb6 Merge branch '2.4' into GPG_sign_option 2017-02-28 15:47:21 +01:00
iglocska e9edeed22c new: User management convenience functions added 
- quick e-mail: send an e-mail to a user quickly
- orgadmin: see the org admins of a user and contact them
- pgp key issues shown on the user view
- pgp fingerprint shown on the user view
- copy paste auth keys and pgp keys quickly by clicking on them
 2017-02-22 17:12:32 +01:00