Merge branch 'master' into irc-action

README.md

@@ -29,8 +29,8 @@ To use the pastepwn framework you need to follow these simple steps:
 
 There are 2 ways to use this tool behind a proxy:
 
-* Define the following environment variables: `HTTP_PROXY`, `HTTPS_PROXY`, `NO_PROXY`.
-* When initializing the PastePwn object, use the `proxies` argument. `proxies` is a dict as defined in [requests' documentation](http://docs.python-requests.org/en/master/user/advanced/#proxies).
+- Define the following environment variables: `HTTP_PROXY`, `HTTPS_PROXY`, `NO_PROXY`.
+- When initializing the PastePwn object, use the `proxies` argument. `proxies` is a dict as defined in [requests' documentation](http://docs.python-requests.org/en/master/user/advanced/#proxies).
 
 ### ToDos
 There are quite some features which will be implemented in the (near) future.

pastepwn/__init__.py

@@ -1,3 +1,7 @@
+# -*- coding: utf-8 -*-
+# Do not mess with the order of the imports
+# Otherwise there will be circular imports -> bad
+
 from .core.pastepwn import PastePwn
 from .core.paste import Paste
 from .core.pastedispatcher import PasteDispatcher

pastepwn/actions/__init__.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 
 from .basicaction import BasicAction
-from .savefileaction import SaveFileAction
-from .telegramaction import TelegramAction
-from .logaction import LogAction
-from .genericaction import GenericAction
 from .databaseaction import DatabaseAction
-from .savejsonaction import SaveJSONAction
-from .twitteraction import TwitterAction
 from .discordaction import DiscordAction
+from .emailaction import EmailAction
 from .ircaction import IrcAction
+from .genericaction import GenericAction
+from .logaction import LogAction
 from .mispaction import MISPAction
-from .emailaction import EmailAction
+from .savefileaction import SaveFileAction
+from .savejsonaction import SaveJSONAction
+from .telegramaction import TelegramAction
+from .twitteraction import TwitterAction
 
 __all__ = (
     "BasicAction",

pastepwn/actions/discordaction.py

@@ -53,7 +53,7 @@ def _identify(self, ws_url):
             hello = json.loads(hello_str)
             if hello.get('op') != 10:
                 self.logger.warning('[ws] Expected Hello payload but received %s', hello_str)
-            
+
             # Send heartbeat and receive ACK
             yield from socket.send(json.dumps({"op": 1, "d": {}}))
             ack_str = yield from socket.recv()

pastepwn/actions/twitteraction.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import logging
-from string import Template
 
 import twitter
 
@@ -14,12 +13,12 @@ class TwitterAction(BasicAction):
     name = "TwitterAction"
 
     def __init__(
-        self,
-        consumer_key=None,
-        consumer_secret=None,
-        access_token_key=None,
-        access_token_secret=None,
-        template=None,
+            self,
+            consumer_key=None,
+            consumer_secret=None,
+            access_token_key=None,
+            access_token_secret=None,
+            template=None,
     ):
         super().__init__()
 

pastepwn/analyzers/basicanalyzer.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-from pastepwn.util import listify
 import logging
 
+from pastepwn.util import listify
+
 
 class BasicAnalyzer(object):
     """Basic analyzer class"""

pastepwn/analyzers/phonenumberanalyzer.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from .regexanalyzer import RegexAnalyzer
 
+
 class PhoneNumberAnalyzer(RegexAnalyzer):
     """Analyzer to match Phone Numbers"""
 

pastepwn/analyzers/slacktokenanalyzer.py

@@ -15,4 +15,3 @@ def __init__(self, actions):
         """
         regex = r'(xox[pboa]-[0-9]{12}-[0-9]{12}-[0-9]{12}-[a-z0-9]{32})'
         super().__init__(actions, regex)
-

pastepwn/analyzers/slackwebhookanalyzer.py

@@ -10,7 +10,7 @@ def __init__(self, action):
         Analyzer to match (likely) Slack Webhook URLs
         :param action: Single action or list of actions to be executed when a paste matches
         """
-        
+
         regex = r'https://hooks.slack.com/services/T[a-zA-Z0-9_]{8}/B[a-zA-Z0-9_]{8}/[a-zA-Z0-9_]{24}'
 
         super().__init__(action, regex)

pastepwn/analyzers/tests/adobekeyanalyzer_test.py

@@ -47,8 +47,8 @@ def test_match_negative(self):
         # Invalid length
         self.paste.body = "1118-1470-8779-0264-4009-32445"
         self.assertFalse(self.analyzer.match(self.paste))
-		
-		# Invalid length
+
+        # Invalid length
         self.paste.body = "1118-1470-8779-0264-4009-324"
         self.assertFalse(self.analyzer.match(self.paste))
 
@@ -58,4 +58,4 @@ def test_match_negative(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

pastepwn/analyzers/tests/facebookaccesstokenanalyzer_test.py

@@ -33,6 +33,7 @@ def test_match_negative(self):
 
         self.obj = None
         self.assertFalse(self.analyzer.match(self.obj))
+
     def test_match_negative(self):
         # random string
         self.obj.body = "Test"

pastepwn/analyzers/tests/microsoftkeyanalyzer_test.py

@@ -47,8 +47,8 @@ def test_match_negative(self):
         # Invalid length
         self.paste.body = "PNT6B-DKH2Q-GW4J2-DDT6T-PDHT76"
         self.assertFalse(self.analyzer.match(self.paste))
-		
-		# Invalid length
+
+        # Invalid length
         self.paste.body = "PNT6B-DKH2Q-GW4J2-DDT6T-PDHT"
         self.assertFalse(self.analyzer.match(self.paste))
 
@@ -58,4 +58,4 @@ def test_match_negative(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

pastepwn/analyzers/tests/originkeyanalyzer_test.py

@@ -54,4 +54,4 @@ def test_match_negative(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

pastepwn/analyzers/tests/privatekeyanalyzer_test.py

@@ -22,7 +22,6 @@ def test_match_positive(self):
         self.assertTrue(self.analyzer.match(self.paste))
         self.paste.body = "-----BEGIN OPENSSH PRIVATE KEY-----"
         self.assertTrue(self.analyzer.match(self.paste))
-
 
     def test_match_negative(self):
         """Test if negatives are not recognized"""

pastepwn/analyzers/tests/slackwebhookanalyzer_test.py

@@ -30,7 +30,7 @@ def test_match_positive(self):
 
         # part of a sentence
         self.paste.body = "here is the webhook url: The slack webhook key is " \
-                          "https://hooks.slack.com/services/T00000000/B00000000"\
+                          "https://hooks.slack.com/services/T00000000/B00000000" \
                           "/XXXXXXXXXXXXXXXXXXXXXXXX! how about that!"
         self.assertTrue(self.analyzer.match(self.paste))
 
@@ -53,11 +53,11 @@ def test_match_negative(self):
         # Invalid Length
         self.paste.body = "https://hooks.slack.com/services/T00000000/B0000000/XXXXXXXXXXXXXXXXXXXXXXXX"
         self.assertFalse(self.analyzer.match(self.paste))
-        
+
         # Invalid Format (/services/Z... vs /services/T...)
         self.paste.body = "https://hooks.slack.com/services/Z00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX"
         self.assertFalse(self.analyzer.match(self.paste))
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

pastepwn/core/__init__.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# Do not mess with the order of the imports
+# Otherwise there will be circular imports -> bad
 
 from .actionhandler import ActionHandler
 from .scrapinghandler import ScrapingHandler

pastepwn/core/pastepwn.py

@@ -7,9 +7,8 @@
 
 from pastepwn.actions import DatabaseAction
 from pastepwn.analyzers import AlwaysTrueAnalyzer
-from pastepwn.core import ScrapingHandler, ActionHandler
-from pastepwn.core.pastedispatcher import PasteDispatcher
-from pastepwn.util.request import Request
+from pastepwn.core import ScrapingHandler, ActionHandler, PasteDispatcher
+from pastepwn.util import Request
 
 
 class PastePwn(object):

pastepwn/database/__init__.py

@@ -2,7 +2,7 @@
 
 from .abstractdb import AbstractDB
 from .mongodb import MongoDB
-from .sqlitedb import SQLiteDB
 from .mysqldb import MysqlDB
+from .sqlitedb import SQLiteDB
 
 __all__ = ('AbstractDB', 'MongoDB', 'SQLiteDB', 'MysqlDB')

pastepwn/scraping/pastebin/exceptions/__init__.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from .ipnotregisterederror import IPNotRegisteredError
-from .pastenotreadyexception import PasteNotReadyException
 from .pastedeletedexception import PasteDeletedException
 from .pasteemptyexception import PasteEmptyException
+from .pastenotreadyexception import PasteNotReadyException
 
 __all__ = ('IPNotRegisteredError', 'PasteNotReadyException', 'PasteDeletedException', 'PasteEmptyException')

pastepwn/util/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from .request import Request
 from .dictwrapper import DictWrapper
-from .threadingutils import start_thread, join_threads
-from .templatingengine import TemplatingEngine
 from .listify import listify
+from .request import Request
+from .templatingengine import TemplatingEngine
+from .threadingutils import start_thread, join_threads
 
 __all__ = ('Request',
            'DictWrapper',

pastepwn/util/dictwrapper.py

@@ -7,5 +7,6 @@ class DictWrapper(dict):
     A wrapper around dicts which returns the key as string when missing.
     Used for the templating engine
     """
+
     def __missing__(self, key):
         return '{' + key + '}'

pastepwn/util/threadingutils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from threading import Thread, current_thread
 import logging
+from threading import Thread, current_thread
 
 
 def start_thread(target, name, exception_event, *args, **kwargs):