MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
13,459 Commits
35 Branches
365 Tags
189 MiB
Commit Graph

3780 Commits (745512e71e09580ae533a1e14dfc3026cd9f9cd2)

Author SHA1 Message Date
iglocska 8f5f3ed08a
fix: [debug] Removed internal breakpoint that was left in 2019-09-29 21:17:08 +02:00
iglocska 480e3b2969
Merge branch 'dev_session' into 2.4 2019-09-29 20:23:00 +02:00
iglocska c7488f93c1
fix: [user setting] Left off missing changes to the controller 2019-09-29 20:21:35 +02:00
chrisr3d 3b11f6f2a2 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-28 02:36:54 +02:00
chrisr3d 1784b5d76f
fix: [stix 1/2 import] Making the publish checkbox work as expected 
- Publishing as exxpected when the option is
  checked AND the user has the right to publish
 2019-09-28 02:35:22 +02:00
Andras Iklody 7a71d76d82
Merge pull request #5198 from JakubOnderka/redis-info 
new: [internal] Redis diagnostic
 2019-09-27 22:19:05 +02:00
Andras Iklody a7a5226373
Merge pull request #5202 from JakubOnderka/patch-30 
fix: [UI] GnuPG diagnostic message
 2019-09-27 22:18:33 +02:00
Andras Iklody 90e1b8807e
Merge pull request #5215 from ancailliau/add_localtag_api 
Add support to add local tags to an event using the API.
 2019-09-26 12:59:14 +02:00
iglocska dc25176384
fix: [internal] paranoid log body didn't contain full body for API calls 2019-09-26 10:28:53 +02:00
iglocska 213cd99ebf
fix: [logging] paranoid log entry not logging request body via the API 2019-09-26 10:26:32 +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
Antoine Cailliau 453a54ca0d Add support to add local tags to an event using the API. 2019-09-25 09:19:30 +00:00
Jakub Onderka 2b28d0c39e
fix: [UI] GnuPG diagnostic message 2019-09-23 09:38:15 +02:00
Jakub Onderka 84d100e982 new: [internal] Redis diagnostic 2019-09-21 07:43:35 +02:00
iglocska 13ce0e099a
fix: [UI] Loading of local tags fixed via the UI, fixes #5197 
- over-zealous ACL removed local tags for non sync users
- UI only functionality, no need for the restriction at al
 2019-09-20 15:59:20 +02:00
iglocska 4cca9e01f0
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-20 11:54:46 +02:00
iglocska c6a1941454
fix: [API] Added DELETE http method to the rest client and fixed the JSON response of the API info 2019-09-20 11:53:28 +02:00
iglocska 0b799a43db
fix: [API] remove weird line breaks from the API descriptions 2019-09-20 11:53:03 +02:00
chrisr3d c4538e0a45 Merge branch '2.4' of https://github.com/MISP/MISP into 2.4 2019-09-20 09:46:13 +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
Andras Iklody f5e4c4f1bf
Merge pull request #5187 from challs/refactor-appController 
Refactor app controller
 2019-09-19 11:37:56 +02:00
Andreas Rammhold 624476a1f9 chg: [AppController] move debugMode setup code to a function so it can be reused 
There were already two places in AppComponent that implemented the same
functionality. It makes sense to move this to a common function so it
can also be used from Controllers that do not inherit the full
beforeFilter functionality.

Since `__preAuthException` is private and only called from the
beforeFilter method after the variable has been setup we can remove
the explicit init from there.
 2019-09-18 15:57:28 +02:00
Andreas Rammhold 96311ef480 chg: [AppController] move the database connection setup to a dedicated function on the AppComponent 
This removes a bit of clutter from the already large beforeFilter
method and allows other views to resuse the logic without having to
duplicate it.
 2019-09-18 15:57:28 +02:00
Andreas Rammhold 013b3ac619 chg: [AppController] move the `baseurl` configuration into a helper method 
This makes the beforeFilter function a bit smaller while keeping all the
functionality. It will also help with reusing the setup logic in views
that can not execute all of AppComponent::beforeFilter, like the
LinOTPAuth plugin.
 2019-09-18 15:57:28 +02:00
Andreas Rammhold 3cbc36af4e chg: [AppController] move loading and initialisation of Auth plugins to reuseable method 
For some authentication workflows it might be desireable to execute the
exact same code without having to call the entire beforeFilter method
from the base class. That way you do not have to work around all the
edge cases without having to reinvent the same code in multiple
locations.
 2019-09-18 15:57:28 +02:00
Andreas Rammhold 9edffd01ba chg: [AppController] move login redirects to dedicated functions 
This makes it easier to modify the login redirect behaviour in a unified
way. For now this just uses the default Auth loginAction while setting
the `admin` attribute to `false`. Thus application behaviour should be
unchanged.
 2019-09-18 15:57:28 +02:00
iglocska 71d8436cbc
fix: [UI] If a server add with a newly created external organisation fails, set the external organisation as the currently selected option after the validation fail redirect, fixes #5182 2019-09-18 14:37:42 +02:00
chrisr3d b3ded21b39
fix: [import modules] Avoiding issues with empty module parameter 2019-09-17 16:02:41 +02:00
iglocska 71a0fd350b
fix: [UI] Annoying race condition fixed causing redirects to the login, fixes #5172 2019-09-17 12:40:22 +02:00
iglocska 518c83362c
chg: [version] bump 2019-09-16 13:55:16 +02:00
iglocska b6ba80e26e
fix: [prio] changePriority function responses fixed 2019-09-13 15:50:06 +02:00
iglocska 5002e536ff
chg: [API] /events/view now accepts the deleted parameter via posted parameters too 2019-09-13 15:34:12 +02:00
iglocska 4d0d538ba0
fix: [API] hard delete passable via different methods to /attributes/delete than just ordered URL parameters 2019-09-13 15:18:39 +02:00
iglocska 0f4613ebd3
fix: [internal] Fix post check for attribute delete function via the API 2019-09-13 15:13:09 +02:00
iglocska 0a1165dead
fix: [ACL] priority change for servers tied into the ACL 2019-09-13 13:22:23 +02:00
iglocska 850159627a
Merge branch '2.4' of github.com:MISP/MISP into 2.4 2019-09-13 11:51:05 +02:00
iglocska ffc9147018
new: [sync] Added sync priority system to prioritise the order of instances to push to 2019-09-13 11:49:12 +02:00
mokaddem e2a0d55348
fix: [decaying] `.json` view in `decaying/view` 2019-09-13 08:17:44 +02:00
mokaddem 813d222bf4
chg: [decaying] Added log entry if formula cannot be loaded 2019-09-12 14:10:17 +02:00
mokaddem cfafc2e51f
Merge branch '2.4' of github.com:MISP/MISP into decaying 2019-09-12 13:35:35 +02:00
mokaddem 377e748771
fix: [event] typo 2 2019-09-12 11:40:23 +02:00
mokaddem f6f1310a50
chg: [decaying:model] Third batch of fix from the PR review - WiP (not tested) 2019-09-12 11:17:33 +02:00
mokaddem 1b59a8e192
chg: [decaying:model] Second batch of fix from the PR review - WiP (not tested) 2019-09-12 11:02:39 +02:00
mokaddem a990727db2
chg: [decaying:model] First batch of fix from the PR review - WiP (not tested) 2019-09-12 10:42:53 +02:00
mokaddem 48c89ea333
chg: [event] applying few PSR2 rules 2019-09-12 10:18:52 +02:00
mokaddem 70f77f7c0e
chg: [decaying:simulation] restSearch comments added to be fixed in next 
decaying version
 2019-09-12 10:16:07 +02:00
mokaddem 5a291d87a5
chg: [decaying] First batch of fix from the PR review - WiP (not tested) 2019-09-12 09:38:15 +02:00
Andras Iklody bf55db64e4
fix: [regression] removed readded invalid acl entry 2019-09-12 06:45:58 +02:00
iglocska fdf1379f3f
fix: [ACL] removed two unused functions 2019-09-11 17:25:49 +02:00
iglocska ed0450faf4
new: [API] verbose output for /servers/update 2019-09-11 16:52:14 +02:00