Merge c6067d0 into 68702a4

.coveragerc

@@ -5,21 +5,17 @@ omit =
     conpot/core/loggers/hpfriends.py
     conpot/core/loggers/log_worker.py
     conpot/core/loggers/syslog.py
-    conpot/core/loggers/mysql_log.py
     conpot/core/loggers/sqlite_log.py
     conpot/core/loggers/stix_transform.py
     conpot/core/loggers/taxii_log.py
     conpot/utils/mac_addr.py
-    # New features.. Just to avoid coverage drop - before we actually write some tests
-    conpot/core/auth.py
     .tox/*
 
 
 exclude_lines =
     pragma: no cover
     raise AssertionError
     raise NotImplementedError
-    if 0:
     if __name__ == .__main__.:
 
 ignore_errors = True

.travis.yml

@@ -13,8 +13,6 @@ before_install:
   - echo $REPO
   - echo $TRAVIS_TAG
   - pwd
-services:
-  - mysql
 addons:
   apt:
     packages:
@@ -26,7 +24,6 @@ install:
   - pip install tox
   - pip install -r requirements.txt
 before_script:
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS conpot_unittest;'
   - chmod +x "$REPO/bin/conpot"
 script:
   - tox

Dockerfile

@@ -1,7 +1,6 @@
 FROM python:3.8 AS conpot-builder
 
 RUN apt-get update && apt-get install -y \
-    libmariadb-dev \
     gcc \
     && rm -rf /var/lib/apt/lists/*
 
@@ -19,16 +18,10 @@ RUN pip3 install --user --no-cache-dir /opt/conpot
 # Run container
 FROM python:3.8-slim
 
-RUN apt-get update && apt-get install -y \
-    wget \
-    && rm -rf /var/lib/apt/lists/*
-
 RUN adduser --disabled-password --gecos "" conpot
 WORKDIR /home/conpot
 
 COPY --from=conpot-builder --chown=conpot:conpot /home/conpot/.local/ /home/conpot/.local/
-RUN mkdir -p /etc/conpot /var/log/conpot /usr/share/wireshark \
-    && wget https://github.com/wireshark/wireshark/raw/master/manuf -o /usr/share/wireshark/manuf
 
 # Create directories
 RUN mkdir -p /var/log/conpot/ \

conpot/core/databus.py

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import logging
-import json
 import inspect
 
 # this is needed because we use it in the xml.
@@ -105,13 +104,6 @@ def initialize(self, config_file):
                 raise Exception("Unknown value type: {0}".format(value_type))
         self.initialized.set()
 
-    def get_shapshot(self):
-        # takes a snapshot of the internal honeypot state and returns it as json.
-        snapsnot = {}
-        for key in list(self._data.keys()):
-            snapsnot[key] = self.get_value(key)
-        return json.dumps(snapsnot)
-
     def reset(self):
         logger.debug("Resetting databus.")
 

conpot/core/filesystem.py

@@ -16,7 +16,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import time
-import typing
 import stat
 import tempfile
 import logging
@@ -28,7 +27,6 @@
 from os import F_OK, R_OK, W_OK
 from typing import Optional, Union, Text, Any, List
 from fs import open_fs, mirror, errors, subfs, base
-from fs.time import datetime_to_epoch
 from fs.mode import Mode
 from fs.wrapfs import WrapFS
 from fs.permissions import Permissions
@@ -43,8 +41,6 @@
 )
 from conpot.core.fs_utils import FSOperationNotPermitted
 
-_F = typing.TypeVar("_F", bound="FS", covariant=True)
-
 logger = logging.getLogger(__name__)
 
 

conpot/core/fs_utils.py

@@ -20,7 +20,6 @@
 """
 import fs
 from typing import Optional, Union
-from fs import errors
 from fs.permissions import Permissions
 import typing
 from fs.subfs import SubFS

conpot/core/loggers/json_log.py

@@ -50,6 +50,3 @@ def log(self, event):
         json.dump(data, self.fileHandle, default=json_default)
         self.fileHandle.write("\n")
         self.fileHandle.flush()
-
-    def log_session(self, session):
-        pass

conpot/core/loggers/log_worker.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (C) 2014 Lukas Rist <glaslos@gmail.com>
 #
 # This program is free software; you can redistribute it and/or
@@ -18,8 +17,6 @@
 
 import json
 import logging
-
-# import uuid
 import time
 
 from datetime import datetime
@@ -28,8 +25,6 @@
 from gevent.queue import Empty
 
 from conpot.core.loggers.sqlite_log import SQLiteLogger
-
-# from conpot.core.loggers.mysql_log import MySQLlogger
 from conpot.core.loggers.hpfriends import HPFriendsLogger
 from conpot.core.loggers.syslog import SysLogger
 from conpot.core.loggers.taxii_log import TaxiiLogger
@@ -45,7 +40,6 @@ def __init__(self, config, dom, session_manager, public_ip):
         self.log_queue = session_manager.log_queue
         self.session_manager = session_manager
         self.sqlite_logger = None
-        # self.mysql_logger = None
         self.json_logger = None
         self.friends_feeder = None
         self.syslog_client = None
@@ -55,17 +49,6 @@ def __init__(self, config, dom, session_manager, public_ip):
         if config.getboolean("sqlite", "enabled"):
             self.sqlite_logger = SQLiteLogger()
 
-        # if config.getboolean('mysql', 'enabled'):
-        #     host = config.get('mysql', 'host')
-        #     port = config.getint('mysql', 'port')
-        #     db = config.get('mysql', 'db')
-        #     username = config.get('mysql', 'username')
-        #     passphrase = config.get('mysql', 'passphrase')
-        #     logdevice = config.get('mysql', 'device')
-        #     logsocket = config.get('mysql', 'socket')
-        #     sensorid = config.get('common', 'sensorid')
-        #     self.mysql_logger = MySQLlogger(host, port, db, username, passphrase, logdevice, logsocket, sensorid)
-
         if config.getboolean("json", "enabled"):
             filename = config.get("json", "filename")
             sensorid = config.get("common", "sensorid")
@@ -137,9 +120,6 @@ def start(self):
                 if self.sqlite_logger:
                     self.sqlite_logger.log(event)
 
-                # if self.mysql_logger:
-                #     self.mysql_logger.log(event)
-
                 if self.syslog_client:
                     self.syslog_client.log(event)