MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity
11,717 Commits
42 Branches
370 Tags
181 MiB
Commit Graph

534 Commits (e86b161d9319dea616a71b25e731847f4530ab48)

Author SHA1 Message Date
iglocska c7a4b6f1f5 fix: [sync] Issue with events not updating on a pull 
- overzealous protection removed
- Conditions blocking an event edit via a pull now rely on the locking mechanism, relaxed via an internal sync link
 2018-12-12 15:58:36 +01:00
keram79 e34e62efe8
Fix error handling in Server.php 
according to http://php.net/manual/de/exception.getmessage.php , the parenthesis are required
 2018-12-06 19:42:44 +01:00
iglocska 7759c62a8e new: [CLI] Documentation updated 2018-12-03 11:08:06 +01:00
devnull- 299db8ada8
Merge pull request #8 from MISP/2.4 
Update issue 1643 rebase 2.4
 2018-11-27 16:40:05 +01:00
iglocska af0f40ab97 new: [server settings] Added automatic backup system for the server settings 2018-11-26 09:12:01 +01:00
iglocska 2aeafd8b79 fix: [sync] Fixed a blocking bug preventing a full push from working with sharing group events 2018-11-23 16:21:48 +01:00
iglocska 2d0259ce13 fix: [CS] coding standards script re-run 2018-11-23 14:11:33 +01:00
Christophe Vandeplas 5701dda67b fix: fixes variable initialization inconsistency in Server push 
Fixes issues like: Warning (2): count(): Parameter must be an array or an object that implements Countable in [/var/www/MISP/app/Model/Server.php, line 2353]
 2018-11-21 15:55:12 +02:00
Steve Clement f3850747da chg: [config] Added permission check for .git directory 2018-10-29 09:56:12 +09:00
garanews 4501338233
fix separate misspelling 
separate vs seperate
 2018-10-25 09:12:17 +02:00
Steve Clement 93dbc6f9ca chg: [tools] Changed testForBinExec as the x-sharedlib type is not only on OpenBSD, Debian has the same type when check if executable. 
chg: [tools] Added typeinfo to the return so you see in the UI what type it thinks it is. (In case you forced the parameter on the CLI)
 2018-10-24 09:22:47 +09:00
Steve Clement cebca8bcb7 chg: [tools] Added x-sharedlib clause in testForBinExec if on OpenBSD. 2018-10-19 08:53:10 +09:00
iglocska c96be93e3c fix: [internal] Fix of wonky model function calls across the application for getting default attachment directories 2018-10-18 09:51:14 +02:00
iglocska 91983ffdef new: [logging] Log why an event could not be pulled 2018-10-16 14:05:30 +02:00
Amaury Leroy 225e6b9f91 Rebase issue 1643 2018-10-16 14:02:46 +02:00
www-data f9183dee3b Merge branch '2.4' into py-virtualenv 2018-10-15 17:09:18 +09:00
iglocska 6f86836bdb fix: [workers] manage workers by default defaulted to false (should be true) 2018-10-11 18:01:09 +02:00
Anthony Vaccaro 61e9851397 Add "manage workers" option. 
This is enabled by default, which replicates the current behaviour of having controls to start, stop and restart workers in the server settings page.
When set to disabled, these controls are hidden, which allows server administrators to manage the worker processes externally, e.g. via systemd.

A sample systemd unit file has also been included into the INSTALL directory.
 2018-10-08 12:28:22 +10:00
Steve Clement 05e0c412ef chg: [fix] Some fixed to the python virtualenv tweaks 2018-09-28 14:58:55 +02:00
www-data 80fcca5f4c chg: [python] Added initial python virtualenv support, STIX Tests only. 2018-09-25 21:29:34 +02:00
iglocska d8efe959e9 fix: [sync] Invalid model call in the server pull using the update technique 2018-09-12 15:48:43 +02:00
chrisr3d c29b5ac885
fix: [diagnostic] Updated cybox reauired default version 
- Since the very latest version is now installed
  on every new machine generated, we can consider
  it as default version
 2018-09-11 16:47:52 +02:00
iglocska 0123f23739 fix: [sync] Fixed some issues throwing notices when pulling 2018-09-09 15:55:42 +02:00
0xiso 7166b227eb fix: [sync] Fix pull not working caused by the refactor 2018-09-07 05:10:38 +09:00
0xiso 413728919f fix: [sync] Fix pull not working 2018-09-06 23:01:51 +09:00
iglocska fbb9e21fe5 fix: [description] Typo in serverSetting fixed, fixes #3612 2018-09-05 16:09:59 +02:00
iglocska 2a10276d07 Merge branch '2.4' into feature/api_rework 2018-08-22 17:39:56 +02:00
iglocska 113fa25471 new: [API] exposed the server related functionalities to the API 
- server index
- server push
- server pull

- improved logging / error reporting of the sync functionalities
 2018-08-22 17:00:13 +02:00
Steve Clement 1bac3749c5 fix: [i18n] Variables are in no need to be translated, it will break stuff, horribly. 
upd: [i18n] Update default.pot again
 2018-08-21 14:48:23 +03:00
iglocska b407aba746 fix: [CS] Updated recent changes 2018-08-20 10:50:09 +02:00
iglocska 830b5d974e Merge branch '2.4' into feature/api_rework 2018-08-19 23:53:24 +02:00
Andras Iklody 3725edf0d5
new: [performance] disable the checking of expired sessions for automatic logouts 2018-08-18 09:09:28 +02:00
iglocska f675fb8b29 Merge branch '2.4' into feature/api_rework 2018-08-17 14:49:09 +02:00
Hannah Ward c883a7b6d6
new: Add upload/download for attachments 2018-08-15 14:07:44 +01:00
iglocska 4d26f404eb Merge branch '2.4' of github.com:MISP/MISP into feature/refactortime 2018-08-05 19:12:19 +02:00
iglocska cb900d7a1f fix: [bug] Fixed several server settings related issues caused by the refactor 2018-08-05 18:10:29 +02:00
iglocska 2bbc1f3b32 chg: [internal] Cleanup of the pull function 
- split into functions based on the concerns it handles
- separated event download and proposal download into separate functions
 2018-08-03 20:04:09 +02:00
iglocska 45542b1c74 chg: [internal] Refactor of the pull function 
- the various event ID list collection methods are now decided in an external function
 2018-08-03 19:28:07 +02:00
iglocska 8b3f59f72b chg: [cleanup] Removed the 2.3 -> 2.4 upgrade 
- in case you are reading this and wondering why it's gone:
  - 2.4 came out in 2014
  - If you are still running that version, just upgrade to any prior 2.4 and then upgrade from that version on
  - Also hope that no one will ever find this message relevant, 3+ year old software is just bad.
 2018-08-03 18:48:48 +02:00
iglocska 18d730d79a chg: [cleanup] Cleanup of the server settings reader 
- split into more readable functions
 2018-08-03 18:46:27 +02:00
iglocska c962e4f863 fix: [internal] tightened authkey validation 2018-08-03 18:40:46 +02:00
iglocska fe3fc13fbd new: [internal] Simplication of the push functionality 2018-08-03 13:22:17 +02:00
iglocska 7681cc4759 fix: [internal] streamlining the worker removal logging 2018-08-03 12:14:40 +02:00
iglocska c4c7e11120 fix: [cleanup] Removed duplicate code 2018-08-03 11:58:25 +02:00
iglocska 740d1e0892 chg: [cleanup] removed duplicate branching code to set module setting defaults 2018-08-03 11:52:59 +02:00
iglocska cce066ecd7 fix: [cleanup] cleaned up the setup of httpsockets in the Server.php file 2018-08-03 11:23:07 +02:00
iglocska 6a8e40cba9 fix: [bug] Fixed cryptic ##COMMA## in error message 2018-07-31 23:41:36 +02:00
iglocska db9b5179d3 chg: [documenation] Added CLI documentation for the getAuthkey tool 2018-07-31 23:34:56 +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
Steve Clement e0b9dcafcb chg: [i18n] wrap stuff into __construct( 2018-07-13 12:26:51 +02:00
Steve Clement fa8a782e2a chg: [i18n] Added more __()'s 2018-07-12 21:32:50 +02:00
iglocska ce77ec7f65 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-07-12 14:07:53 +02:00
iglocska 64f65427be fix: [update] checkout the last checked in version of composer.json before attempting a pull 2018-07-12 14:06:51 +02:00
Andras Iklody f0964c11f6
Merge pull request #3479 from FloatingGhost/feature-send-logs-to-elasticsearch 
Feature: send logs to elasticsearch
 2018-07-12 12:09:53 +02:00
Steve Clement c3a5b95eb0 chg: [deps] There is no major difference between 2.1.0.17 and the dev version. 2018-07-12 09:24:19 +02:00
iglocska b43773fb2b fix: [settings] Make travis happy 2018-07-11 14:33:41 +02:00
iglocska 8f2377239d fix: [settings] Attempted fix to appease Travis 2018-07-11 10:47:44 +02:00
iglocska 089ce29d2f fix: [settings] Default setting for the attachments directory fixed 2018-07-11 10:21:24 +02:00
Hannah Ward a70f8e45d8
new: Add ability to log to elasticsearch 2018-07-10 17:01:57 +01:00
Hannah Ward bb31ee1f03
new: Add elasticsearch settings 2018-07-10 14:53:21 +01:00
iglocska 8259e1c22c new: [sync] Improvements to the pull mechanism 
- moved the blacklist event skipping to the negotiation phase
- no longer need to pull and then discard events that have been blacklisted
- solves issues with slow syncs when a lot of deletions were involved

- also, moved the sync negotiation + event retrieval to UUID based lookups instead of ID
 2018-07-06 08:31:00 +02:00
iglocska 4a08403e15 fix: [cleanup] Reverted lax baseurl validation 2018-07-06 08:14:47 +02:00
iglocska b00a54c7cc fix: [sync] pull giving some weird messages when an event is blocked by blacklists 
- don't warn about failed pulls when the reason is a local blocking of the event.

- future improvements: remove the blocked events during the negotiation phase
 2018-07-06 08:12:44 +02:00
Alexandre Dulaunoy e8d8d80aba
chg: [PyMISP] released as 2.4.93 2018-07-01 18:26:06 +02:00
iglocska 8559af8c6a fix: [Session handling] Make sure that the autoregenerate setting changes are actually saved 2018-06-30 19:42:57 +02:00
iglocska adebce6c69 Merge branch '2.4' of github.com:MISP/MISP into 2.4 2018-06-30 19:26:20 +02:00
iglocska 881649c8e9 new: [Session handling] Added checkAgent toggle 2018-06-30 19:26:02 +02:00
Andras Iklody fe3f2067be
fix: [update] recursively init and update submodules 2018-06-29 07:49:10 +02:00
iglocska 81c0fc2279 new: [API] Added unsafe URL parameter to authenticate users 
- for legacy tools that cannot pass headers in HTTP requests for some insane reason
- Needs to be enabled by a site admin - default is that it is disabled
- MISP's diagnostic tool WILL complain if this is ever enabled
 2018-06-27 14:25:40 +02:00
iglocska 73ced14c6e fix: [sync] Fix to the attribute level filters not being applied correctly on a full push 
- Found during the investigation of #3378
 2018-06-25 23:29:01 +02:00
iglocska 2aaf2c54c4 chg: [diagnostics] Make the STIX diagnostics a bit less cryptic 2018-06-22 09:34:56 +02:00
iglocska a930fdeaeb new: [i18n] Added tools to switch between languages via the server settings 2018-06-20 15:11:43 +02:00
iglocska 214df94bda chg: [i18n] Made the strings more i18n friendly across the application 2018-06-20 12:56:53 +02:00
chrisr3d 009dac1e43
add: [Diagnostic] Added maec python library requirements 2018-06-11 16:27:13 +02:00
Raphaël Vinot 551aa0baab
Bump recommended version of PyMISP 2018-06-07 12:08:26 +02:00
iglocska 1917ebd096 Merge branch 'deadlockfix' into 2.4 2018-06-05 18:07:06 +02:00
iglocska ed09fdedbf new: [performance] Made the deadlock fix optional 
- old behaviour by default or if the setting is disabled
- new behaviour with non transactional attribute add / correlation add
 2018-06-05 18:06:02 +02:00
Alexandre Dulaunoy a4535c1c31
Merge pull request #3301 from LDO-CERT/2.4 
fix Typo in MISP settings
 2018-05-31 15:37:15 +02:00
garanews 7fbae76191 fix Typo in MISP settings 
fix Typo in MISP settings
 2018-05-31 14:51:54 +02:00
iglocska 93333dceff chg: Added remaining parts of the pymisp / new stix diagnostic tool 2018-05-31 14:35:11 +02:00
garanews 01d4934668 fix Typo in MISP settings 
fix Typo in MISP settings
 2018-05-31 14:20:01 +02:00
iglocska 205e29bd8f fix: [CLI] Allow for empty baseurl via the CLI 2018-05-29 06:37:10 +02:00
iglocska 2ed4ecec02 new: Stricter validation of baseurl when coming via the API tool 2018-05-26 06:55:28 +02:00
Richard van den Berg f8dba9c3b7 Fix STIX diagnostics: use python3 2018-05-22 21:30:39 +02:00
iglocska bef3980a86 chg: [documentation] Better description of command line APIs / automation 2018-05-22 12:33:49 +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 d47cfefe17 fix: Added documentation of server setting modifications via the console 
- also added left-off server setting for enabling attachments via ZMQ
 2018-05-11 11:37:20 +02:00
iglocska 0ec042c71d chg: only run the automatic worker restart on upgrade if background processing is enabled 2018-05-09 10:04:53 +02:00
iglocska 39f66eb868 fix: Restart the workers due to the new cakephp version causing issues 2018-05-09 09:15:18 +02:00
iglocska 2af8bfec4e new: Added event enrichment functionality 
- select and run a set of enrichments on all applicable attributes of the event
- exposed to the API
- exposed to the command line tool
- adheres to attribute distributions
 2018-04-24 16:41:09 +02:00
iglocska 79f4730294 fix: Session.cookie_timeout could not be saved correctly, fixes #3182, fixes #3171 2018-04-24 10:07:28 +02:00
iglocska 3135031168 fix: Fixed the text of the cookie_timeout setting 2018-04-20 10:36:45 +02:00
iglocska 27cc7611f5 new: Added the cookie_timeout setting 
- still needs some back-end changes for it to be active
 2018-04-18 16:44:08 +02:00
iglocska af460f544b fix: Removed actual file path from the command line functions path 2018-04-16 10:14:05 +02:00
iglocska 3347ca2a11 Merge branch 'disable_auto_download' into 2.4 2018-04-16 08:12:10 +02:00
iglocska 0d2f907339 chg: Moved the command line functions' description to the server model 2018-04-16 07:57:06 +02:00
iglocska 570fe32764 new: Added improvements to the Cortex settings 
- allow for configuring SSL options for Cortex
- previously the API key was not passed to Cortex on GET requests only on POST, breaking Cortex 2 compatibility
 2018-04-13 14:22:08 +02:00
iglocska 474d2c2ab1 fix: autoregenerate causes intermittent logouts, changed the setting description and guidance in the server settings to reflect this 2018-04-11 14:11:28 +02:00
iglocska cf49732799 fix: Fixed issues with non string server settings when changing them via the console 2018-04-08 23:11:51 +02:00
iglocska a057bc64a7 fix: Don't try to run the testBaseURL server setting check if the user comes from the CLI 2018-04-01 17:36:51 +02:00