Commit Graph

44 Commits (2cc45f34268dfa71d0034c9e1129940c4a1d9c61)

Author SHA1 Message Date
Ventz Petkov 2cc45f3426 Fixed redis restarts within supervisord - due to being daemonized. Thanks @cellango for reporting it! Upstream update sync to: a62bca4e169c919413bba4e6ce978e30aae9183e 2019-01-15 20:49:20 -05:00
Ventz Petkov c298bfcc8b Upstream update to install process: 9d0c6fa8fe6e8345f8053929bb18cc64007974a2 - install STIX2.0 library to support STIX 2.0 export. Also re-aranged install order a bit to match upstream. Due to recent upstream changes, there are still some things that are installed in a different order, but everything installed is now here. 2018-12-12 14:52:32 -05:00
Ventz Petkov ccab1de24a Upstream update to install process: 2050c864a4d838e93e69b839763b72e4a76c979a and 11a9b93a3e8cc67a78b03d4c904d3be50522ba6f - added python MAEC, and updated git submodule pulls to be recursive 2018-10-10 08:46:53 -04:00
Ventz Petkov c3e98ab669 Upstream update to install process: f72fc1f1f8a7fc901a54821d6f036fabc7540f6a - chmod of misp log rotate 2018-09-04 14:30:03 -04:00
Ventz Petkov 1d9fd16bb1 Upstream update to install process: 07ac2a0c5653546ceaf0433ea235be3cc8d4c2b5 and e1fc7b2e50580e7f826d6cae4bb0debf43658db2 - removal of checking out latest tagged version and changing pysqm and redis to pip3, which was already in place! 2018-08-22 23:47:17 -04:00
Ventz Petkov 5d07aec827 Created auto-build image from github now that dockerhub has better auto build resources. Sadly, this means we have to delete the manual image which has over 50,000 downloads. Also, upstream update to install process: 29dc4adbdfc1412989efbaf5463e5d7d897a153b - Init Submodules 2018-07-07 21:28:29 -04:00
Ventz Petkov 06cf081d6c
Merge pull request #27 from matt-saunders/patch-3
Better PHP resource/timeout configuration.
2018-06-21 03:55:10 -04:00
matt-saunders d885d9f33b
MISP recommended PHP settings
Saw this code in XME's [misp-docker](https://github.com/MISP/misp-docker/blob/master/misp-web/Dockerfile) and thought it would be a good idea to incorporate it.
2018-06-20 22:43:16 -04:00
Ventz Petkov dd0adb6d3e
Merge pull request #26 from matt-saunders/patch-2
Cybox library version error fix
2018-06-18 10:03:47 -04:00
matt-saunders af95d97b8b
Update Dockerfile 2018-06-15 00:16:12 -04:00
matt-saunders a607f025ab
Cybox library version error fix
After a clean install if you log into MISP and navigate to Administration -> Server Settings -> Diagnostics in the STIX and Cybox libraries section you will see the error CYBOX library version...Incorrect CyBox version installed, found 2.1.0.17 expecting 2.1.0.18.dev0.  I reached out the the developers of MISP and they told me to run pip3 uninstall cybox to uninstall the pip managed version.  To test it out I did I clean install and SSH'd into the container then ran the command and the error went away.  Not sure where the best place to incorporate this is, but this was were I tested it and I successfully ran a clean build with it.
2018-06-14 19:40:10 -04:00
Ventz Petkov a68109480c Updated latest build, and credit to Matt Saunders 2018-06-12 23:55:02 -04:00
Ventz Petkov c78024e4f7
Merge pull request #25 from matt-saunders/patch-1
Update to resolve install warnings and errors - git repository, jsonschema, pymisp/requests, and php 7.2 dir
2018-06-12 23:51:48 -04:00
matt-saunders fa43de5748
Update to resolve install issues
Added WORKDIR to line 34 to resolve the following errors:
fatal: not a git repository (or any of the parent directories): .git
fatal: not a git repository (or any of the parent directories): .git
fatal: not a git repository (or any of the parent directories): .git
fatal: not in a git directory

Added lines 60 and 61 to resolve the following errors:
ERROR [mispevent.py:52 - <module>() ] Cannot import jsonschema
Traceback (most recent call last):
  File "/var/www/MISP/PyMISP/pymisp/mispevent.py", line 50, in <module>
    import jsonschema
ModuleNotFoundError: No module named 'jsonschema'
WARNING [__init__.py:46 - <module>() ] Unable to load pymisp properly: No module named 'requests'

Edited line 136 to resolve the following error:
/bin/sh: 1: cannot create /etc/php/7.0/mods-available/ssdeep.ini: Directory nonexistent
WARNING: Module ssdeep ini file doesn't exist under /etc/php/7.2/mods-available
WARNING: Module ssdeep ini file doesn't exist under /etc/php/7.2/mods-available
2018-06-12 23:32:49 -04:00
Ventz Petkov 2c7beadb37
Merge pull request #23 from harvard-itsecurity/ubuntu-18.04
Moving MISP to Ubuntu 18.04 LTS following Official MISP project!
2018-05-31 23:30:14 -04:00
Ventz Petkov cd4bf042cc Cleanup 2018-05-31 23:10:56 -04:00
Ventz Petkov a301a4d6fb Upgrade to Ubuntu 18.04 LTS - following upstream as closely as possible, while solving Docker specific issues. Includes all changes from 16.04 LTS commit by Ventz - 3f50fbf7cb 2018-05-31 23:01:47 -04:00
Ventz Petkov 3f50fbf7cb Upstream update to install process: 9c134881ba836ae10919c3618fbc6541efb04a28 and 98414cf2befa0757e1d2c3aac85c6a226d366f75 and 1b72988e56b0118862fe61c1e60acab134c5073d - includes updated install and move to python3 for stix, cybox, and mixbox libraries. Install pymisp for python3. 2018-05-31 21:27:02 -04:00
Ventz Petkov 524de06d50
Merge pull request #19 from jbarlow-mcafee/expose-ports
Expose available ports in Dockerfile
2018-05-10 00:27:08 -04:00
Jeremy Barlow 95126eaff7 Expose available ports in Dockerfile
This commit includes an expose command in the Dockerfile for various
ports that the application uses - web server (80 and 443), mysql (3306),
and MISP ZeroMQ (50000).
2018-05-08 13:40:43 -07:00
Ventz Petkov 9b1cd2fddf Updated with PR #14 and #15 on 4-10-2018 - pushing new DockerHub image - thanks to @jbarlow-mcafee for discovering and proposing fixes 2018-04-10 16:40:19 -04:00
Ventz Petkov e2300e0163
Merge pull request #15 from jbarlow-mcafee/pip2-pyzmq-redis-install
Ensure pyzmq and redis also installed with pip2 for Python 2

Thanks to @jbarlow-mcafee for discovering this and proposing a fix!
2018-04-10 16:36:40 -04:00
Ventz Petkov c3d60977c0
Merge pull request #14 from jbarlow-mcafee/set-redis-conf-in-supervisord
Pass redis conf file to redis-server program in supervisord.conf and set the working directory to /var/lib/redis

Thanks to @jbarlow-mcafee for discovering this!
2018-04-10 16:32:52 -04:00
Jeremy Barlow 58933d4547 Set working directory for redis-server to /var/lib/redis
This commit changes the working directory used for the redis-server
process from /etc/redis, which the redis user does not have write access
to, to /var/lib/redis, which is writable by the redis user.
2018-04-10 13:28:58 -07:00
Jeremy Barlow 8ff5dc7912 Ensure pyzmq and redis also installed with pip2 for Python 2
Previously, pyzmq and redis were pip installed using the default pip,
which was for Python 3. This resulted in the pyzmq and redis packages
not being found when the MISP server spawned the mispzmq script using
the default python, which is version 2. With this commit, pyzmq and
redis would be installed for both Python 2 (via pip2) and Python 3
(via pip3), which should allow the packages to be available to scripts
which use it from different Python versions.
2018-04-10 13:22:17 -07:00
Jeremy Barlow 0bcf0d9ac3 Pass redis conf file to redis-server program in supervisord.conf
Previously, the redis-server program was started from supervisord.conf
without a configuration file specifying the data directory to use. This
resulted in redis "not able to persist to disk" errors when the mispzmq
script performed some redis commands. The error was due to the default
redis data directory, /etc/redis, not being writable by the user that
the redis process runs as, redis.

This commit passes the /etc/redis/redis.conf configuration file to the
redis-server process at startup. The configuration file already sets the
data directory to a directory that the redis user has write access to,
/var/lib/redis.
2018-04-10 13:16:41 -07:00
Ventz Petkov 91b928e31f 1.) Upstream update to install: 6df6cc79bc0dbbc0307d57767ac47c09f1a0bf1c - Added ssdeep install and php module. 2.) Updated README for Mac Docker users to clear up confusion around mount directories, thanks to Toby @datasci4security for bringing it up 3.) Added Latest Update date and Latest Upstream hash included 2018-03-07 18:48:48 -05:00
Ventz Petkov 9eee1c63d1 Fixed image name in README 2018-02-12 17:07:37 -05:00
Ventz Petkov bfecfdbaf2 Added detailed instructions around building your own image and thus customizing some of the arguments, versus pulling down the default dockerhub binary. 2018-02-12 17:06:08 -05:00
Ventz Petkov 7fe1f7e363 Added detailed instructions around building your own image and thus customizing some of the arguments, versus pulling down the default dockerhub binary. 2018-02-12 16:50:11 -05:00
Ventz Petkov f074a49568 Upstream update to install process: a2d17e3c5eaea60f5bb5875bbadef259bbd06070 - Added additional information for installation (Python 3 for stix2, a2enmod headers) 2018-01-23 13:48:33 -05:00
Ventz Petkov 9d6576f892 Removed 'Require all granted' even though we are using Ubuntu 16.04 and Apache 2.4 from Ubuntu. It seems that the 'patched' Apache 2.4 - Version: 2.4.18-2ubuntu3 as of now, is actually loading the Apache 2.2 access control module. Per Apache's documentation, this *should* be correct: https://httpd.apache.org/docs/current/upgrading.html -- however, in order to 'fix' it for MISP, we are inserting the 2.2 directive, and removing the 2.4 directive. 2018-01-11 23:58:10 -05:00
Ventz Petkov 670959dcaf Upstream update to install process: 82da6c5639d9e5f0531705cf4337154a9072c314 - added install of stix2, which depends on python3 and pip3. This covers everything up to and including the Jan 4, 2018 commit by adulau. 2018-01-11 23:37:13 -05:00
Ventz Petkov 59f63b7d6c Fix for issue #5 which was somehow left out of commit 50d2a42bbc. Also, updated certs to reflect crt everywhere - docs and other notes 2017-09-25 09:26:37 -04:00
Ventz Petkov 40ff7c71ef Another fix to upstream update to install process: 70939ef37d84e3e011207a8d074e719d74f5fbb2 - fix to issue #2278 found here: https://github.com/MISP/MISP/issues/2278. Removed old config 2017-07-13 10:21:59 -04:00
Ventz Petkov 50d2a42bbc Upstream update to install process: 70939ef37d84e3e011207a8d074e719d74f5fbb2 - fix to issue #2278 found here: https://github.com/MISP/MISP/issues/2278 2017-07-13 10:03:01 -04:00
Ventz Petkov 6807da5bab Upstream update to install process: 1db9f8c0744ae6804c51a67cfec1d6981c2e26f9 - Install mixbox to accomodate the new STIX dependencies 2017-06-20 12:35:16 -04:00
Ventz Petkov 4ac055fa55 Cleaned up of extra slash at the end of build 2017-03-21 17:49:37 -04:00
Ventz Petkov 8530a25dc8 Added name and email to contribute section, with permission from Conrad 2017-02-14 09:12:32 -05:00
Ventz Petkov b5c052eaac Upstream update to install process: 0bcb3376e56588c518ad97efd06d671a04802a01 and 2ccb10c198476f77f33ce34eae721c30fb99fc34 - added logrotation, however added it inline instead of in a separate config which is later copied. 2017-02-13 15:40:27 -05:00
Ventz Petkov 39b1e86237 Merged in @radder5's improvements on rng-tools, and misp-modules + README 2017-02-13 15:24:45 -05:00
Ventz Petkov 09c043f779 Added mysql chown to guarantee permissions on directories that are remote mounted and keep their own, and added rng-tools to help with entropy 'randomness' generation + a note about it and the security aspects. 2017-02-09 11:25:59 -05:00
Ventz Petkov 82adc8ae92 Upstream update to install process: 0675e993475fcfb6ba1f030fdf0d5270a8b23b5f - You need to install the package python-setuptools on Ubuntu 16.04/Mint 18 to use the setup.py for the STIX installation. 2016-10-11 16:37:35 -04:00
Ventz Petkov c27ae4ec77 Initial commit of autobuild Docker MISP container. 2016-09-27 02:49:04 -04:00