Commit graph

568 commits

Author SHA1 Message Date
Terrtia
2589fc2161
chg: [merge] merge master into update branche 2019-04-10 15:43:15 +02:00
85d2ea578c
Merge pull request #335 from 5thColumn/docker
Add docker-compose support
2019-03-13 21:38:12 +01:00
Jason Hedden
23fb91d326 Add docker-compose support
This commit separates the AIL Framework services into individual Docker
containers that can be managed with docker-compose. It's intended to ease the
installation, development and troubleshooting procedures for all-in-one
deployments.

No changes to architecture or base code are required in this commit.

Changes to existing files:
.gitignore
  * Ignore pystemon archive directory

Dockerfile:
  * Add AIL shell environment variables
  * Install pystemon and crawler pip requirements into AIL virtual environment

Docker-compose notes:
  * All containers are participating in a service network `network_mode:
  service:flask`.  This allows the containers to share the same IP namespace
  to accommodate hard-coded localhost entries.
  * By default persistent data is saved to the following directories in the
  local AIL framework git directory: PASTES, HASHS, CRAWLED_SCREENSHOTS,
  pystemon/archives

This was tested with docker-ce on Ubuntu 16.04 and MacOS. A typical deployment
would look like:
```
git clone https://github.com/CIRCL/AIL-framework.git
cd AIL-framework
cp bin/packages/config.cfg.docker-compose-sample bin/packages/config.cfg
	(optionally enable activate_crawler in config.cfg)
docker-compose build
docker-compose up -d
```
2019-03-11 19:46:34 -05:00
Jason Hedden
9eae25bdf5 Fix current_selected amount and action vars
This commit fixes issue #268

```
  File "./bin/ModulesInformationV2.py", line 319, in _setValue
    action = current_selected_action + " " + str(current_selected_amount) + "x"
```

`current_selected_action` was defined twice. The second occurance should be `current_selected_amount`.

This also fixes the generic exception from failing when `current_selected_value` is not defined.
2019-02-22 12:39:27 -06:00
Terrtia
3d36ddbc1e
fix: [CVE] fix stat regex 2019-02-21 10:51:05 +01:00
Terrtia
1114aa2ffd
chg: [CVE] add stat script 2019-02-21 09:58:10 +01:00
Terrtia
709d5487b8
fix: [Onion] filter too many subdomain 2019-02-13 16:53:38 +01:00
Terrtia
b87707e8bc
fix: [Crawler] typo 2019-02-12 15:54:42 +01:00
Terrtia
37276e52a3
fix: [Crawler] typo 2019-02-12 15:53:40 +01:00
Terrtia
7cb03fc769
fix: [Crawler] typo 2019-02-12 15:51:19 +01:00
Terrtia
7a4989ce10
fix: [Global Crawler] max filename size 2019-02-12 15:45:58 +01:00
Thirion Aurélien
44c513dcbb
chg: [Crawler] add onion to blacklist 2019-01-31 16:56:45 +01:00
Xavier Mertens
43d08d0d3e Cleanup 2019-01-30 22:36:10 +01:00
Xavier Mertens
1be91b88bf Fix: reset alarm timeout 2019-01-30 22:30:07 +01:00
Xavier Mertens
0372a78704 Merge remote-tracking branch 'upstream/master' 2019-01-30 22:27:44 +01:00
Xavier Mertens
b099e2ae4a Update LAUNCH.sh 2019-01-30 22:27:33 +01:00
Terrtia
92d192238b
fix: [Crawler] change max page crawled 2019-01-29 17:04:45 +01:00
Terrtia
6c7086f4eb
fix: [Crawler] first_seen 2019-01-29 16:54:39 +01:00
Terrtia
ad04cf7bb2
fix: [Onion] typo 2019-01-29 16:27:12 +01:00
Terrtia
88eaaeae93
chg: [Crawler] add priority queue, fix #263 2019-01-29 16:08:59 +01:00
Terrtia
c1b34bd99c
fix: [Crawler] limit max crawled pages 2019-01-29 15:38:00 +01:00
Terrtia
64ffdd52e8
fix: [Onion] loop 2019-01-29 14:39:57 +01:00
Terrtia
2dc0eca4a9
fix: [Crawler] fix crawler cache info 2019-01-29 12:09:19 +01:00
Terrtia
bb301a870c
fix: [Crawler] fix onion blacklist + add crawler info 2019-01-29 12:00:14 +01:00
Terrtia
535f44044d
fix: [Onion] add timeout signal 2019-01-29 09:46:03 +01:00
Thirion Aurélien
f4ba21e492
blacklist onion debian manpages 2019-01-14 11:08:53 +01:00
raggadhub
74c726d5fa
fix path_to_send path
Hi,

Missing slash between pastes_directory and paste in path_to_send = pastes_directory+paste 

path error example:
/opt/AIL-framework/PASTESarchive/pastebin.com_pro/2019/01/07/cAgqsY2U.gz
2019-01-09 13:15:58 +01:00
Terrtia
b3b75ccbea
fix: [Crawler] Restart Splash on failure, limit unbound in memory cache (maxrss) 2019-01-04 15:51:08 +01:00
Terrtia
6ee4b7bf93
Merge branch 'master' into update 2018-12-19 15:23:34 +01:00
Terrtia
4d04333f54
fix: [Splash server] add debug output 2018-12-19 09:30:24 +01:00
Terrtia
f842194c57
fix: [Crawler] retry when splash is not available 2018-12-17 16:04:12 +01:00
Terrtia
4e08aaa80f
chg: [UI Crawled Domains] show crawled domains by date range (options: domains tags, up domains, down domains)
todo: Shows domain history
2018-12-17 15:58:48 +01:00
Steve Clement
b60fd55efe chg: [bash] Small PATH precedence issue. 2018-11-22 16:16:31 +09:00
Steve Clement
f82c899e7b fix: [bash] fixed log_subscriber path 2018-11-22 15:48:12 +09:00
Steve Clement
88e561aa20 chg: [bash] Replace '' with "" 2018-11-22 15:41:45 +09:00
Steve Clement
33bc23a297 fix: [bash] evoking bash -c and splitting vars in this fashion wants to be changed in future revisions. 2018-11-22 15:22:35 +09:00
Steve Clement
6522cffd57 chg: [doc] Added note that redis-server is bundled during install 2018-11-22 15:10:57 +09:00
Steve Clement
41a34b3519 fix: [bash] As we instantiate from a subdirectory, we need to take this into account. 2018-11-22 15:08:59 +09:00
Steve Clement
e4ced241eb chg: [python] Added necessary checks in LAUNCH.sh to be able to launch the script without doing bin/activate
chg: [doc] Added correct pystemon path
fix: [zmq] Small ZMQ test fix.
fix: [doc] Moved the print statement in feeder so it is less verbose but still useful
2018-11-22 14:57:24 +09:00
Terrtia
31a8dfe0b3
fix: [AIL] use only relative paths
pastes duplicates are fixed on the fly
2018-11-21 16:45:25 +01:00
Terrtia
cb41c54135
fix: [lib_refine] add dns configuration 2018-11-21 08:49:58 +01:00
Terrtia
4e680aabf0
chg: [Overview] add doc 2018-11-20 14:39:45 +01:00
Terrtia
108fdb868e
chg: update Overview 2018-11-15 10:39:41 +01:00
Terrtia
d9b776d58a
merge master 2018-11-14 15:55:42 +01:00
Terrtia
b31618eb6a
chg: [Mixer] config default feeder name #291 2018-11-09 15:26:26 +01:00
Terrtia
c3903ab203
fix: [MISP_The_Hive_feeder] handle not saved pastes 2018-11-09 13:58:09 +01:00
Sami Mokaddem
62e46b6dc1
Merge pull request #287 from CIRCL/term_management
Term management upgrade
2018-11-08 14:10:25 +01:00
Terrtia
e3764ca575
fix: [MISP_the_Hive_feeder] force absolute path 2018-11-08 11:22:23 +01:00
Terrtia
979472df15
chg: [Terms] tag tracked terms 2018-11-06 13:38:37 +01:00
Terrtia
7ef5cc3205
fix:[MISP_The_Hive_feeder] typo 2018-11-05 16:40:25 +01:00