docker-compose fixed

This commit is contained in:
Good Evening 2018-08-04 14:44:27 +03:00
parent 27291adf71
commit 29058d9529
9 changed files with 30 additions and 12 deletions

View File

@ -20,12 +20,12 @@ services:
service: RQExecutor service: RQExecutor
storage: pool storage: pool
redis: redis:
host: "127.0.0.1" host: redis
tg_feed: tg_feed:
package: lib.plugin.base.lib.Telegram package: lib.plugin.base.lib.Telegram
service: TelegramFeed service: TelegramFeed
storage: pool storage: pool
token: "358947212354:" token: "3"
chats: chats:
- id: aiWeipeighah7vufoHa0ieToipooYe - id: aiWeipeighah7vufoHa0ieToipooYe
if: if:
@ -40,12 +40,14 @@ storage:
pool: pool:
package: lib.plugin.base.lib.Mongo package: lib.plugin.base.lib.Mongo
service: MongoStorage service: MongoStorage
url: mongo
size: 0 size: 0
db: "medved" db: "medved"
coll: 'pool' coll: 'pool'
ip_source: ip_source:
package: lib.plugin.base.lib.Mongo package: lib.plugin.base.lib.Mongo
service: MongoStorage service: MongoStorage
url: mongo
size: 800 size: 800
db: "medved" db: "medved"
coll: 'ip_source' coll: 'ip_source'
@ -150,5 +152,5 @@ tasks:
path: lib/plugin/iscan/templates/ftp.tpl path: lib/plugin/iscan/templates/ftp.tpl
logging: logging:
Storage: DEBUG Storage: INFO
Loader: DEBUG Loader: INFO

View File

@ -51,6 +51,8 @@ services:
mongo: mongo:
image: mongo:latest image: mongo:latest
command:
- '--quiet'
volumes: volumes:
- ./docker/lib/mongo:/data/ - ./docker/lib/mongo:/data/
env_file: env_file:

View File

@ -7,6 +7,7 @@ export REDIS_IP=$(host ${REDIS_IP} | head -n1 | grep -Po "(\d+\.?){4}")
/tmp/confd -onetime -backend env /tmp/confd -onetime -backend env
sudo -u tor tor #sudo -u tor tor
cd /mdvd && proxychains -q python3 medved.py #cd /mdvd && proxychains -q python3 medved.py
cd /mdvd && python3 medved.py

View File

@ -1,5 +1,16 @@
FROM medved_base:latest FROM medved_base:latest
RUN pacman -S --noconfirm --needed git libpcap linux-headers clang tor
RUN git clone https://github.com/robertdavidgraham/masscan && \
cd masscan && \
make -j && \
mv bin/masscan /usr/bin/masscan
RUN wget -N http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz && gunzip GeoLiteCity.dat.gz
RUN mkdir -p /usr/share/GeoIP/ && mv GeoLiteCity.dat /usr/share/GeoIP/GeoIPCity.dat
ADD files/run.sh /tmp/run.sh ADD files/run.sh /tmp/run.sh
CMD ["/tmp/run.sh"] CMD ["/tmp/run.sh"]

View File

@ -4,4 +4,4 @@ export CORE_IP=$(host ${CORE_IP} | head -n1 | grep -Po "(\d+\.?){4}")
/tmp/confd -onetime -backend env /tmp/confd -onetime -backend env
cd /mdvd && proxychains -q rq worker high normal low -u "redis://${REDIS_IP}:6379/" cd /mdvd && rq worker high normal low -u "redis://${REDIS_IP}:6379/"

View File

@ -42,7 +42,7 @@ class MasScanTask(Task):
self._logger.debug("Starting scan, ip_list=%s, port_list=%s", ip_list, port_list) self._logger.debug("Starting scan, ip_list=%s, port_list=%s", ip_list, port_list)
ms = MasScan() ms = MasScan(bin_path=self.lcnf.get('bin_path', "/usr/bin/masscan"))
hosts = ms.scan(ip_list=ip_list, port_list=port_list) hosts = ms.scan(ip_list=ip_list, port_list=port_list)
self._logger.debug(hosts) self._logger.debug(hosts)

View File

@ -94,7 +94,7 @@ class FTPListFilesTask(Task):
try: try:
if len(filelist) == 0 or filelist[0] == "total 0": if len(filelist) == 0 or filelist[0] == "total 0":
raise self.PipelineError("Empty server") item['data']['filter'] = "Empty server"
except IndexError: except IndexError:
pass pass

View File

@ -23,6 +23,7 @@ class GopherFindTask(Task):
return ''.join(total_data) return ''.join(total_data)
def _process(self, item): def _process(self, item):
item['steps'][self._id] = False
sock = socket.socket() sock = socket.socket()
sock.settimeout(self.lcnf.get('timeout', 20)) sock.settimeout(self.lcnf.get('timeout', 20))
sock.connect((item['data']['ip'], int(70))) sock.connect((item['data']['ip'], int(70)))
@ -46,5 +47,5 @@ class GopherFindTask(Task):
item['data']['files'].append(node) item['data']['files'].append(node)
if not item['data']['files']: if not item['data']['files']:
item['steps'][self._id] = False
raise Exception("Empty server (not Gopher?)") raise Exception("Empty server (not Gopher?)")
item['steps'][self._id] = True

View File

@ -12,3 +12,4 @@ zmq
jsoncomment jsoncomment
rq rq
pyyaml pyyaml
jinja2