Merge branch 'master' into dev

d-Rickyy-b · Sep 3, 2019 · 686a174 · 686a174
2 parents b02cee7 + b81ea3b
commit 686a174
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 410 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,10 @@
 language: python
 sudo: require
 python:
+  - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
 # command to install dependencies
 install:
   - pip install -r requirements.txt

diff --git a/README.md b/README.md
@@ -1,9 +1,12 @@
+![Logo](documentation/pastepwn_logo.png)
+
+
+
+# pastepwn - Paste-Scraping Python Framework
 [![Build Status](https://travis-ci.org/d-Rickyy-b/pastepwn.svg?branch=master)](https://travis-ci.org/d-Rickyy-b/pastepwn)
 [![PyPI version](https://badge.fury.io/py/pastepwn.svg)](https://badge.fury.io/py/pastepwn)
 [![Coverage Status](https://coveralls.io/repos/github/d-Rickyy-b/pastepwn/badge.svg?branch=master)](https://coveralls.io/github/d-Rickyy-b/pastepwn?branch=master)
 
-# pastepwn - Paste-Scraping Python Framework
-
 [Pastebin](https://pastebin.com) is a very helpful tool to store or rather share ascii encoded data online. In the world of OSINT, pastebin is being used by [researchers all around the world](https://www.troyhunt.com/introducing-paste-searches-and/) to retreive e.g. leaked account data, in order to find indicators about security breaches.
 
 *Pastepwn* is a framework to scrape pastes and scan them for certain indicators. There are several analyzers and actions to be used out-of-the-box, but it is also easily extensible - you can create your own analyzers and actions on the fly.

diff --git a/documentation/pastepwn_logo.png b/documentation/pastepwn_logo.png
diff --git a/pastepwn/api/__init__.py b/pastepwn/api/__init__.py
diff --git a/pastepwn/api/api.py b/pastepwn/api/api.py
diff --git a/pastepwn/api/apiresponse.py b/pastepwn/api/apiresponse.py
diff --git a/pastepwn/api/apiroutes.py b/pastepwn/api/apiroutes.py
diff --git a/pastepwn/api/apiserver.py b/pastepwn/api/apiserver.py
diff --git a/pastepwn/api/documentation/pastepwn.yaml b/pastepwn/api/documentation/pastepwn.yaml