pop3pot 2.0.0.dev0__tar.gz → 2.0.2__tar.gz

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/CHANGELOG.md

@@ -5,11 +5,41 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.2]
+
+### Added in version 2.0.2
+
+* Nothing
+
+### Changed in version 2.0.2
+
+* Increased the version number
+* The `restart` command wasn't working correctly on Windows due to a race
+  condition. Fixed.
+* Fixed a problem in the MySQL plugin that made it unresponsive under high
+  traffic
+
+## [2.0.1]
+
+### Added in version 2.0.1
+
+* Nothing
+
+### Changed in version 2.0.1
+
+* Increased the version number
+* The `datadog`, `discord`, `nlcvapi`, and `telegram` plugins now use a secure
+  connection (HTTPS) by default
+* The `elastic` plugin now warns if the `ssl` is set while certificate
+  verification (`verify_certs`) is off
+* The `couch` plugin now uses authentication mechanism that does not pass the
+  username and password in the URL
+
 ## [2.0.0]
 
 ### Added in version 2.0.0
 
-* Made the project installable from PyPi
+* Made the project installable from PyPI
 * `.gitlab-ci.yml` file to scan for secrets
 
 ### Changed in version 2.0.0
@@ -20,7 +50,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Got rid of `getlist()`
 * Updated the documentation with information how to start the honeypot at boot
 time
+* Fixed bugs in the Discord, PostgreSQL, Slack, and Telegram output plugins
 * Fixed a bug in the reporting (`ip` was referenced before being determined)
+* Better error checking if another process is already listening to the same port
+* Better Python 2.x/3.x compatibility
+* Completely rewritten `Dockerfile`, uses hardened images
 
 ## [1.0.0]
 
@@ -42,7 +76,7 @@ time
   * Discord
   * Elasticsearch
   * HPFeeds
-  * InfluxDB 2.0
+  * InfluxDB 2.0 (Python 3.6+ only)
   * JSON
   * Kafka
   * MongoDB

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/LICENSE

@@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    ElasticPot
+    POP3Pot
     Copyright (C) 2020  Vesselin Bontchev
 
     This program is free software: you can redistribute it and/or modify
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    ElasticPot  Copyright (C) 2020  Vesselin Bontchev
+    POP3Pot  Copyright (C) 2020  Vesselin Bontchev
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

pop3pot-2.0.2/MANIFEST.in

@@ -0,0 +1,8 @@
+include CHANGELOG.md
+include LICENSE
+include README.md
+include honeypot.py
+graft core
+graft output_plugins
+graft pop3pot
+prune pop3pot/data/test/develop

pop3pot-2.0.2/PKG-INFO

@@ -0,0 +1,157 @@
+Metadata-Version: 2.4
+Name: pop3pot
+Version: 2.0.2
+Summary: A POP3 Honeypot
+Home-page: https://gitlab.com/bontchev/pop3pot
+Author: Vesselin Bontchev
+Author-email: vbontchev@yahoo.com
+License: GPL-3.0-only
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: Science/Research
+Classifier: Intended Audience :: System Administrators
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Security
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: configparser>=3.5.0
+Requires-Dist: geoip2>=2.7.0
+Requires-Dist: ipaddress; python_version < "3"
+Requires-Dist: maxminddb>=1.3.0
+Requires-Dist: pytz
+Requires-Dist: requests<=2.27.1; python_version < "3"
+Requires-Dist: requests; python_version >= "3"
+Requires-Dist: service_identity<=18.1.0; python_version < "3"
+Requires-Dist: service_identity; python_version >= "3"
+Requires-Dist: twisted<21,>=20.3.0; python_version < "3"
+Requires-Dist: twisted>=21; python_version >= "3"
+Provides-Extra: couchdb
+Requires-Dist: couchdb; extra == "couchdb"
+Provides-Extra: datadog
+Requires-Dist: certifi; extra == "datadog"
+Requires-Dist: cryptography<=2.8; python_version < "3" and extra == "datadog"
+Requires-Dist: pyOpenSSL<=18.0.0; python_version < "3" and extra == "datadog"
+Requires-Dist: cryptography; python_version >= "3" and extra == "datadog"
+Requires-Dist: pyOpenSSL; python_version >= "3" and extra == "datadog"
+Provides-Extra: discord
+Requires-Dist: certifi; extra == "discord"
+Provides-Extra: elastic
+Requires-Dist: elasticsearch<=7.13; python_version < "3" and extra == "elastic"
+Requires-Dist: numpy<=1.16.6; python_version < "3" and extra == "elastic"
+Requires-Dist: elasticsearch8<9.0.0,>=8.12.0; python_version >= "3" and extra == "elastic"
+Requires-Dist: numpy; python_version >= "3" and extra == "elastic"
+Provides-Extra: hpfeed
+Requires-Dist: Automat<20; python_version < "3" and extra == "hpfeed"
+Requires-Dist: hpfeeds>=3.0.0; extra == "hpfeed"
+Provides-Extra: influx2
+Requires-Dist: influxdb-client; python_version >= "3" and extra == "influx2"
+Provides-Extra: jsonlog
+Provides-Extra: kafka
+Requires-Dist: confluent-kafka<1.0; python_version < "3" and extra == "kafka"
+Requires-Dist: confluent-kafka; python_version >= "3" and extra == "kafka"
+Provides-Extra: localsyslog
+Provides-Extra: mongodb
+Requires-Dist: pymongo<=3.13.0; python_version < "3" and extra == "mongodb"
+Requires-Dist: dnspython; python_version < "3" and extra == "mongodb"
+Requires-Dist: pymongo; python_version >= "3" and extra == "mongodb"
+Provides-Extra: mysql
+Requires-Dist: PyMySQL; python_version < "3" and extra == "mysql"
+Requires-Dist: mysqlclient>=1.3.12; python_version >= "3" and extra == "mysql"
+Provides-Extra: nlcvapi
+Requires-Dist: certifi; extra == "nlcvapi"
+Requires-Dist: pyOpenSSL<=18.0.0; python_version < "3" and extra == "nlcvapi"
+Requires-Dist: pyOpenSSL; python_version >= "3" and extra == "nlcvapi"
+Provides-Extra: postgres
+Requires-Dist: psycopg2-binary; extra == "postgres"
+Provides-Extra: redisdb
+Requires-Dist: redis<=3.5.3; python_version < "3" and extra == "redisdb"
+Requires-Dist: redis; python_version >= "3" and extra == "redisdb"
+Provides-Extra: rethinkdblog
+Requires-Dist: rethinkdb>=2.4; extra == "rethinkdblog"
+Requires-Dist: looseversion; extra == "rethinkdblog"
+Provides-Extra: slack
+Requires-Dist: slackclient<3; python_version < "3" and extra == "slack"
+Requires-Dist: slack-sdk; python_version >= "3" and extra == "slack"
+Provides-Extra: socketlog
+Provides-Extra: sqlite
+Provides-Extra: telegram
+Requires-Dist: certifi; extra == "telegram"
+Provides-Extra: textlog
+Provides-Extra: xmpp
+Requires-Dist: xmpppy>=0.7.3; extra == "xmpp"
+Provides-Extra: all
+Requires-Dist: Automat<20; python_version < "3" and extra == "all"
+Requires-Dist: PyMySQL; python_version < "3" and extra == "all"
+Requires-Dist: certifi; extra == "all"
+Requires-Dist: confluent-kafka; python_version >= "3" and extra == "all"
+Requires-Dist: confluent-kafka<1.0; python_version < "3" and extra == "all"
+Requires-Dist: couchdb; extra == "all"
+Requires-Dist: cryptography; python_version >= "3" and extra == "all"
+Requires-Dist: cryptography<=2.8; python_version < "3" and extra == "all"
+Requires-Dist: dnspython; python_version < "3" and extra == "all"
+Requires-Dist: elasticsearch8<9.0.0,>=8.12.0; python_version >= "3" and extra == "all"
+Requires-Dist: elasticsearch<=7.13; python_version < "3" and extra == "all"
+Requires-Dist: hpfeeds>=3.0.0; extra == "all"
+Requires-Dist: influxdb-client; python_version >= "3" and extra == "all"
+Requires-Dist: looseversion; extra == "all"
+Requires-Dist: mysqlclient>=1.3.12; python_version >= "3" and extra == "all"
+Requires-Dist: numpy; python_version >= "3" and extra == "all"
+Requires-Dist: numpy<=1.16.6; python_version < "3" and extra == "all"
+Requires-Dist: psycopg2-binary; extra == "all"
+Requires-Dist: pyOpenSSL; python_version >= "3" and extra == "all"
+Requires-Dist: pyOpenSSL<=18.0.0; python_version < "3" and extra == "all"
+Requires-Dist: pymongo; python_version >= "3" and extra == "all"
+Requires-Dist: pymongo<=3.13.0; python_version < "3" and extra == "all"
+Requires-Dist: redis; python_version >= "3" and extra == "all"
+Requires-Dist: redis<=3.5.3; python_version < "3" and extra == "all"
+Requires-Dist: rethinkdb>=2.4; extra == "all"
+Requires-Dist: slack-sdk; python_version >= "3" and extra == "all"
+Requires-Dist: slackclient<3; python_version < "3" and extra == "all"
+Requires-Dist: xmpppy>=0.7.3; extra == "all"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# POP3Pot: a POP3 Honeypot
+
+This is a honeypot simulating a POP3 e-mail server.
+
+The honeypot does not emulate a full POP3 server after a successful login -
+it only records the IP of the attacker, as well as the username and password
+used, and the other commands used, if any, and returns a "bad login
+credentials" error.
+
+## Prerequisites
+
+- a working database server (only if you use an output plugin that outputs to
+a database - e.g., MySQL)
+
+## Usage
+
+Check the [Linux installation guide](https://gitlab.com/bontchev/pop3pot/-/blob/master/pop3pot/data/docs/INSTALL.md) or the
+[Windows installation guide](https://gitlab.com/bontchev/pop3pot/-/blob/master/pop3pot/data/docs/INSTALLWIN.md) for complete
+instructions on how to install, configure, and run the honeypot.

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/README.md

@@ -14,5 +14,6 @@ a database - e.g., MySQL)
 
 ## Usage
 
-Check the [installation document](pop3pot/data/docs/INSTALL.md) for more
-information how to properly install, configure, and run the honeypot.
+Check the [Linux installation guide](pop3pot/data/docs/INSTALL.md) or the
+[Windows installation guide](pop3pot/data/docs/INSTALLWIN.md) for complete
+instructions on how to install, configure, and run the honeypot.

pop3pot-2.0.2/core/httpclient.py

@@ -0,0 +1,71 @@
+from __future__ import absolute_import
+
+from io import open
+
+from twisted.internet.ssl import Certificate, trustRootFromCertificates
+from twisted.python.log import msg
+from twisted.web.client import Agent, BrowserLikePolicyForHTTPS
+
+
+class _LegacyWebClientContextFactory(object):
+    @staticmethod
+    def build():
+        from twisted.internet.ssl import ClientContextFactory
+
+        class WebClientContextFactory(ClientContextFactory):
+            def getContext(self, hostname, port):
+                return ClientContextFactory.getContext(self)
+
+        return WebClientContextFactory()
+
+
+def _load_trust_root_from_pem_bundle(pem_path):
+    with open(pem_path, 'r', encoding='utf-8') as fh:
+        content = fh.read()
+    certs = []
+    end_marker = '-----END CERTIFICATE-----'
+    for chunk in content.split(end_marker):
+        chunk = chunk.strip()
+        if not chunk:
+            continue
+        pem = chunk + '\n' + end_marker + '\n'
+        certs.append(Certificate.loadPEM(pem))
+    if not certs:
+        return None
+    return trustRootFromCertificates(certs)
+
+
+def _trust_root(ca_certs):
+    if ca_certs:
+        try:
+            return _load_trust_root_from_pem_bundle(ca_certs)
+        except Exception as e:
+            msg('Failed to load CA bundle {}: {}'.format(ca_certs, e))
+            return None
+
+    try:
+        import certifi
+        return _load_trust_root_from_pem_bundle(certifi.where())
+    except Exception:
+        return None
+
+
+def create_http_agent(reactor, pool, plugin_name, verify_tls=True, ca_certs=None):
+    """
+    Build a Twisted Agent with sane HTTPS defaults.
+    verify_tls=True uses BrowserLikePolicyForHTTPS for cert + hostname checks.
+    verify_tls=False falls back to a legacy context factory for compatibility.
+    """
+    if verify_tls:
+        return Agent(
+            reactor,
+            contextFactory=BrowserLikePolicyForHTTPS(trustRoot=_trust_root(ca_certs)),
+            pool=pool
+        )
+
+    msg('{}: TLS certificate verification is disabled.'.format(plugin_name))
+    return Agent(
+        reactor,
+        contextFactory=_LegacyWebClientContextFactory.build(),
+        pool=pool
+    )

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/core/protocol.py

@@ -1,4 +1,7 @@
 
+from __future__ import absolute_import
+
+
 from ipaddress import ip_address, ip_network
 from sys import version_info
 from time import time

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/core/tools.py

@@ -15,12 +15,14 @@ from twisted.python.log import msg
 try:
     from urllib.request import urlopen
 except ImportError:
-    from urllib import urlopen
+    from urllib2 import urlopen # type: ignore
 
 
 if version_info[0] >= 3:
     def decode(x):
-        return x.decode('utf-8', errors='ignore')
+        if isinstance(x, bytes):
+            return x.decode('utf-8', errors='ignore')
+        return x
     def encode(x):
         return x.encode()
     def ord(x):
@@ -85,10 +87,7 @@ def stop_plugins(cfg):
 
 def get_public_ip(ip_reporter):
     try:
-        if version_info[0] < 3:
-            return urlopen(ip_reporter).read().decode('latin1', errors='replace').encode('utf-8')
-        else:
-            return decode(urlopen(ip_reporter).read())
+        return decode(urlopen(ip_reporter, timeout=10).read())
     except:
         return None
 

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/honeypot.py

@@ -18,11 +18,12 @@ from core.tools import (
     stop_plugins,
 )
 
+from twisted.internet import error
 from twisted.internet.reactor import listenTCP, run
 from twisted.python.log import msg
 
 
-__VERSION__ = '2.0.0-dev0'
+__VERSION__ = '2.0.2'
 __description__ = 'A POP3 Honeypot'
 __license__ = 'GPLv3'
 __uri__ = 'https://gitlab.com/bontchev/pop3pot'
@@ -101,7 +102,12 @@ def main():
 
     cfg_options['output_plugins'] = import_plugins(cfg_options)
 
-    listenTCP(cfg_options['port'], MyPOP3Factory(cfg_options))
+    try:
+        listenTCP(cfg_options['port'], MyPOP3Factory(cfg_options))
+    except error.CannotListenError as e:
+        msg('Cannot listen on port {}: {}'.format(e.port, e.socketError.strerror))
+        stop_plugins(cfg_options)
+        return
     run()
     msg('Shutdown requested, exiting...')
     stop_plugins(cfg_options)

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/output_plugins/couch.py

@@ -1,4 +1,6 @@
 
+from __future__ import absolute_import
+
 from core import output
 from core.config import CONFIG
 from core.tools import geolocate
@@ -11,6 +13,7 @@ from twisted.python.log import msg
 class Output(output.Output):
 
     def start(self):
+        scheme = CONFIG.get('output_couch', 'scheme', fallback='http')
         host = CONFIG.get('output_couch', 'host', fallback='localhost')
         port = CONFIG.getint('output_couch', 'port', fallback=5984)
         username = CONFIG.get('output_couch', 'username', fallback='pop3pot', raw=True)
@@ -18,7 +21,10 @@ class Output(output.Output):
         db_name = CONFIG.get('output_couch', 'database', fallback='pop3pot')
 
         try:
-            couchserver = Server('http://{}:{}@{}:{}'.format(username, password, host, port))
+            base_url = '{}://{}:{}'.format(scheme, host, port)
+            couchserver = Server(base_url)
+            if username:
+                couchserver.resource.credentials = (username, password)
 
             if db_name in couchserver:
                 self.couch_db = couchserver[db_name]

{pop3pot-2.0.0.dev0 → pop3pot-2.0.2}/output_plugins/datadog.py

@@ -2,23 +2,21 @@
 Simple Datadog HTTP logger.
 """
 
+from __future__ import absolute_import
+
 from io import BytesIO
 from json import dumps
 from platform import node
 
 from core import output
 from core.config import CONFIG
+from core.httpclient import create_http_agent
+from core.tools import to_bytes
 
 from twisted.internet import reactor
 from twisted.python.log import msg
 from twisted.web import client, http_headers
 from twisted.web.client import FileBodyProducer
-from twisted.internet.ssl import ClientContextFactory
-
-
-class WebClientContextFactory(ClientContextFactory):
-    def getContext(self, hostname, port):
-        return ClientContextFactory.getContext(self)
 
 
 class QuietHTTP11ClientFactory(client._HTTP11ClientFactory):
@@ -27,19 +25,20 @@ class QuietHTTP11ClientFactory(client._HTTP11ClientFactory):
 
 class Output(output.Output):
     def start(self):
-        self.url = CONFIG.get('output_datadog', 'url').encode('utf-8')
-        self.api_key = CONFIG.get('output_datadog', 'api_key', fallback='').encode('utf-8')
+        self.url = CONFIG.get('output_datadog', 'url')
+        self.api_key = CONFIG.get('output_datadog', 'api_key', fallback='')
         if len(self.api_key) == 0:
-            msg('Datadog output module: API key is not defined.')
+            msg('output_datadog: API key is not defined.')
         self.ddsource = CONFIG.get('output_datadog', 'ddsource', fallback='pop3pot')
         self.ddtags = CONFIG.get('output_datadog', 'ddtags', fallback='env:dev')
         self.service = CONFIG.get('output_datadog', 'service', fallback='honeypot')
         self.hostname = CONFIG.get('output_datadog', 'hostname', fallback=node())
+        verify_tls = CONFIG.getboolean('output_datadog', 'verify_tls', fallback=True)
+        ca_certs = CONFIG.get('output_datadog', 'ca_certs', fallback=None)
 
-        contextFactory = WebClientContextFactory()
         myQuietPool = client.HTTPConnectionPool(reactor)
         myQuietPool._factory = QuietHTTP11ClientFactory
-        self.agent = client.Agent(reactor, contextFactory=contextFactory, pool=myQuietPool)
+        self.agent = create_http_agent(reactor, myQuietPool, 'output_datadog', verify_tls, ca_certs)
 
     def stop(self):
         pass
@@ -63,9 +62,9 @@ class Output(output.Output):
         base_headers = {
             b'Accept': [b'application/json'],
             b'Content-Type': [b'application/json'],
-            b'DD-API-KEY': [self.api_key],
+            b'DD-API-KEY': [to_bytes(self.api_key)],
         }
         headers = http_headers.Headers(base_headers)
-        body = FileBodyProducer(BytesIO(dumps(entry).encode('utf-8')))
-        self.agent.request(b'POST', self.url, headers, body)
+        body = FileBodyProducer(BytesIO(to_bytes(dumps(entry, sort_keys=True))))
+        self.agent.request(b'POST', to_bytes(self.url), headers, body)
 

pop3pot-2.0.2/output_plugins/discord.py

@@ -0,0 +1,133 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Simple Discord webhook logger
+"""
+
+from __future__ import absolute_import
+
+from io import BytesIO
+from json import dumps, loads
+from time import gmtime, strftime, time
+
+from core import output
+from core.config import CONFIG
+from core.httpclient import create_http_agent
+from core.tools import decode, to_bytes
+
+from twisted.internet import reactor
+from twisted.internet.task import deferLater
+from twisted.python.log import msg
+from twisted.web.client import (
+    FileBodyProducer,
+    HTTPConnectionPool,
+    _HTTP11ClientFactory,
+    readBody
+)
+from twisted.web.http_headers import Headers
+
+
+class QuietHTTP11ClientFactory(_HTTP11ClientFactory):
+    noisy = False
+
+
+class Output(output.Output):
+
+    def start(self):
+        self.url = to_bytes(CONFIG.get('output_discord', 'url'))
+        self.delay = CONFIG.getfloat('output_discord', 'delay', fallback=2.0)
+        verify_tls = CONFIG.getboolean('output_discord', 'verify_tls', fallback=True)
+        ca_certs = CONFIG.get('output_discord', 'ca_certs', fallback=None)
+        pool = HTTPConnectionPool(reactor)
+        pool._factory = QuietHTTP11ClientFactory
+        self.agent = create_http_agent(reactor, pool, 'output_discord', verify_tls, ca_certs)
+        self.last_sent = 0
+        self.requests_list = []
+
+    def stop(self):
+        pass
+
+    def write(self, event):
+        operation = event['operation'].lower()
+
+        message = '__New event__\n'
+        message += '[{} UTC] [POP3Pot on {} ({})]: {}'.format(
+            strftime('%Y-%m-%d %H:%M:%S', gmtime(event['unixtime'])), event['sensor'],
+            event['session'], operation.capitalize()
+        )
+
+        if operation == 'unknown':
+            message += ' operation: "{}"'.format(event['username'])
+        elif operation == 'command':
+            message += ' "{}'.format(event['command'])
+            if event['args']:
+                message += ' {}'.format(event['args'])
+            message += '"'
+
+        message += ' from {}:{}'.format(event['src_ip'], event['dst_port'])
+
+        if operation == 'login':
+            message += ', username: "{}", password: "{}"'.format(event['username'], event['password'])
+        message += '.\n'
+
+        self.requests_list.append({'content': message})
+        self._drain()
+
+    def _drain(self):
+        """
+        Send the next queued entry if the rate-limit window has elapsed.
+        If entries remain, schedule another drain after self.delay seconds.
+        """
+        if not self.requests_list:
+            return
+        now = time()
+        elapsed = now - self.last_sent
+        if elapsed < self.delay:
+            deferLater(reactor, self.delay - elapsed, self._drain)
+            return
+        self.last_sent = now
+        entry = self.requests_list.pop(0)
+        d = self._post(entry)
+        if self.requests_list:
+            deferLater(reactor, self.delay, self._drain)
+        return d
+
+    def _post(self, entry):
+
+        def cbBody(body):
+            return processResult(body)
+
+        def cbPartial(failure):
+            """
+            Google HTTP Server does not set Content-Length. Twisted marks it as partial
+            """
+            failure.printTraceback()
+            return processResult(failure.value)
+
+        def cbResponse(response):
+            if response is None or response.code in [200, 201, 204]:
+                return
+            msg('Discord error: {} {}'.format(response.code, decode(response.phrase)))
+            d = readBody(response)
+            d.addCallback(cbBody)
+            d.addErrback(cbPartial)
+            return d
+
+        def cbError(failure):
+            failure.printTraceback()
+
+        def processResult(result):
+            if result:
+                try:
+                    j = loads(result)
+                    msg('Discord response: {}'.format(j.get('message', '')))
+                except Exception:
+                    pass
+
+        headers = Headers({b'Content-Type': [b'application/json']})
+        body = FileBodyProducer(BytesIO(to_bytes(dumps(entry, sort_keys=True))))
+        d = self.agent.request(b'POST', self.url, headers, body)
+        d.addCallback(cbResponse)
+        d.addErrback(cbError)
+        return d