Skip to content

Commit

Permalink
Merge dev into master for v1.12.0b0
Browse files Browse the repository at this point in the history
  • Loading branch information
@zeroSteiner
zeroSteiner committed Jul 27, 2018
2 parents 11d28ae + 682f6ee commit e9db072
Show file tree
Hide file tree
Showing 63 changed files with 2,117 additions and 769 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Expand Up @@ -29,13 +29,15 @@ data/client/king_phisher/#king-phisher-client.ui#
data/client/king_phisher/king-phisher-client.ui~
data/server/king_phisher/plugins/*
data/client/king_phisher/style/.sass-cache/*
!.github/*.yml
!data/client/king_phisher/plugin-documentation.html
!data/server/docker/docker-compose.yml
!data/server/king_phisher/error_*.html
!data/server/king_phisher/server_config.yml
!data/server/king_phisher/server_config_verification.yml
!data/server/king_phisher/service_files/*
!data/*/king_phisher/*/*.html
!.github/*.yml
!readthedocs.yml

# ignore mprofile output
mprofile_*.dat
Expand Down
1 change: 0 additions & 1 deletion KingPhisher
View file
Expand Up @@ -43,7 +43,6 @@ if getattr(sys, 'frozen', False):

from king_phisher import color
from king_phisher import find
from king_phisher import its
from king_phisher import utilities
from king_phisher import version
from king_phisher.client import application
Expand Down
1 change: 1 addition & 0 deletions data/client/king_phisher/client_config.json
View file
@@ -1,4 +1,5 @@
{
"cache.age": "4h",
"catalogs": [
"https://raw.githubusercontent.com/securestate/king-phisher-plugins/master/catalog.json"
],
Expand Down
276 changes: 199 additions & 77 deletions data/client/king_phisher/king-phisher-client.ui
View file

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions data/client/king_phisher/plugin-documentation.html
View file
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<title>{{ plugin.title }}</title>
<style>
body {margin: 5% auto; background: #f2f2f2; color: #444444; font-size: 16px; line-height: 1.8; text-shadow: 0 1px 0 #ffffff; max-width: 80%;}
code {color: #5d84a8;}
a {border-bottom: 1px solid #444444; color: #444444; text-decoration: none;}
a:hover {border-bottom: 0;}
</style>
</head>
<body>
<h1>{{ plugin.title }}</h1>
{{ markdown }}
</body>
</html>
100 changes: 100 additions & 0 deletions data/king_phisher/schemas/json/king-phisher.catalog.collections.json
View file
Expand Up @@ -22,6 +22,15 @@
"minItems": 1,
"type": "array"
},
"classifiers": {
"id": "/properties/collections/properties/plugins/client/items/properties/classifiers",
"items": {
"id": "/properties/collections/properties/plugins/client/items/properties/classifiers/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"description": {
"id": "/properties/collections/properties/plugins/client/items/properties/description",
"type": "string"
Expand Down Expand Up @@ -66,9 +75,22 @@
"id": "/properties/collections/properties/plugins/client/items/properties/name",
"type": "string"
},
"reference_urls": {
"id": "/properties/collections/properties/plugins/client/items/properties/reference_urls",
"items": {
"id": "/properties/collections/properties/plugins/client/items/properties/reference_urls/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"requirements": {
"id": "/properties/collections/properties/plugins/client/items/properties/requirements",
"properties": {
"minimum-python-version": {
"id": "/properties/collections/properties/plugins/client/items/properties/requirements/properties/minimum-python-version",
"type": "string"
},
"minimum-version": {
"id": "/properties/collections/properties/plugins/client/items/properties/requirements/properties/minimum-version",
"type": "string"
Expand All @@ -79,6 +101,16 @@
"id": "/properties/collections/properties/plugins/client/items/properties/requirements/properties/packages/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"platforms": {
"id": "/properties/collections/properties/plugins/client/items/properties/requirements/properties/platforms",
"items": {
"id": "/properties/collections/properties/plugins/client/items/properties/requirements/properties/platforms/items",
"type": "string"
},
"minItems": 1,
"type": "array"
}
},
Expand Down Expand Up @@ -119,6 +151,15 @@
"minItems": 1,
"type": "array"
},
"classifiers": {
"id": "/properties/collections/properties/plugins/server/items/properties/classifiers",
"items": {
"id": "/properties/collections/properties/plugins/server/items/properties/classifiers/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"description": {
"id": "/properties/collections/properties/plugins/server/items/properties/description",
"type": "string"
Expand Down Expand Up @@ -163,9 +204,22 @@
"id": "/properties/collections/properties/plugins/server/items/properties/name",
"type": "string"
},
"reference_urls": {
"id": "/properties/collections/properties/plugins/server/items/properties/reference_urls",
"items": {
"id": "/properties/collections/properties/plugins/server/items/properties/reference_urls/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"requirements": {
"id": "/properties/collections/properties/plugins/server/items/properties/requirements",
"properties": {
"minimum-python-version": {
"id": "/properties/collections/properties/plugins/server/items/properties/requirements/properties/minimum-python-version",
"type": "string"
},
"minimum-version": {
"id": "/properties/collections/properties/plugins/server/items/properties/requirements/properties/minimum-version",
"type": "string"
Expand All @@ -176,6 +230,16 @@
"id": "/properties/collections/properties/plugins/server/items/properties/requirements/properties/packages/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"platforms": {
"id": "/properties/collections/properties/plugins/server/items/properties/requirements/properties/platforms",
"items": {
"id": "/properties/collections/properties/plugins/server/items/properties/requirements/properties/platforms/items",
"type": "string"
},
"minItems": 1,
"type": "array"
}
},
Expand Down Expand Up @@ -216,6 +280,15 @@
"minItems": 1,
"type": "array"
},
"classifiers": {
"id": "/properties/collections/properties/templates/client/items/properties/classifiers",
"items": {
"id": "/properties/collections/properties/templates/client/items/properties/classifiers/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"description": {
"id": "/properties/collections/properties/templates/client/items/properties/description",
"type": "string"
Expand Down Expand Up @@ -260,6 +333,15 @@
"id": "/properties/collections/properties/templates/client/items/properties/name",
"type": "string"
},
"reference_urls": {
"id": "/properties/collections/properties/templates/client/items/properties/reference_urls",
"items": {
"id": "/properties/collections/properties/templates/client/items/properties/reference_urls/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"title": {
"id": "/properties/collections/properties/templates/client/items/properties/title",
"type": "string"
Expand Down Expand Up @@ -295,6 +377,15 @@
"minItems": 1,
"type": "array"
},
"classifiers": {
"id": "/properties/collections/properties/templates/server/items/properties/classifiers",
"items": {
"id": "/properties/collections/properties/templates/server/items/properties/classifiers/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"description": {
"id": "/properties/collections/properties/templates/server/items/properties/description",
"type": "string"
Expand Down Expand Up @@ -339,6 +430,15 @@
"id": "/properties/collections/properties/templates/server/items/properties/name",
"type": "string"
},
"reference_urls": {
"id": "/properties/collections/properties/templates/server/items/properties/reference_urls",
"items": {
"id": "/properties/collections/properties/templates/server/items/properties/reference_urls/items",
"type": "string"
},
"minItems": 1,
"type": "array"
},
"title": {
"id": "/properties/collections/properties/templates/server/items/properties/title",
"type": "string"
Expand Down

0 comments on commit e9db072

Please sign in to comment.