resloved conflicts

data/client/king_phisher/client_config.json

@@ -1,4 +1,7 @@
 {
+  "catalogs": [
+    "https://raw.githubusercontent.com/securestate/king-phisher-plugins/master/catalog.json"
+  ],
   "dashboard.bottom": "VisitsTimeline",
   "dashboard.top_left": "Overview",
   "dashboard.top_right": "VisitorInfo",
@@ -13,6 +16,7 @@
   "filter.campaign.other_users": false,
   "plugins": {},
   "plugins.enabled": [],
+  "plugins.installed": {},
   "rpc.serializer": null,
   "server": "localhost:22",
   "server_remote_port": 80,

data/client/king_phisher/style/theme.v1.css

@@ -433,3 +433,19 @@ GtkWindow:hover {
 .background-remove {
   background-image: none;
 }
+
+.multilineentry {
+  background-color: alpha(white, 0.8);
+  background-image: none;
+  border: 0px;
+  border-radius: 3px;
+  padding: 5px 5px 6px; }
+  .multilineentry:insensitive {
+    background-color: alpha(darkgray, 0.8); }
+  .multilineentry > GtkTextView {
+    background-color: transparent;
+    background-image: none;
+    color: @theme_color_0; }
+    .multilineentry > GtkTextView:selected {
+      background-color: @theme_color_1;
+      color: white; }

data/client/king_phisher/style/theme.v2.scss

@@ -75,6 +75,36 @@
   }
 }
 
+
+.multilineentry {
+  background-color: gtkalpha(white, 0.8);
+  @include bo-opaque();
+  &:disabled {
+    background-color: gtkalpha(darkgray, 0.8);
+  }
+  > textview.view {
+    background-color: transparent;
+    background-image: none;
+    border-radius: 2px;
+    padding-bottom: 7px;
+    padding-left: 8px;
+    padding-right: 8px;
+    padding-top: 6px;
+    text {
+      background: transparent;
+      color: $theme_color_0;
+      min-height: 32px;
+      &:disabled {
+        color: white;
+      }
+      > selection {
+        background-color: $theme_color_1;
+        color: white;
+      }
+    }
+  }
+}
+
 .titlebar {
   background-color: mix($theme_color_0, $theme_color_1, 0.4);
   background-image: none;
@@ -149,13 +179,13 @@ entry {
   @include bo-opaque();
   background-color: gtkalpha(white, 0.8);
   background-image: none;
-  border-radius: 3px;
   color: $theme_color_0;
+  min-height: 32px;
   &:disabled {
     background-color: gtkalpha(darkgray, 0.8);
     color: white;
   }
-  &:selected {
+  > selection {
     background-color: $theme_color_1;
     color: white;
   }
@@ -341,6 +371,10 @@ scrollbar {
   &.right { border-left: 1px solid $theme_color_bg; }
 }
 
+scrolledwindow {
+  min-height: 32px;
+}
+
 spinbutton {
   background-color: transparent;
   background-image: none;

docs/requirements.rtd.txt

@@ -10,9 +10,9 @@ ecdsa>=0.13
 email-validator>=1.0.2
 geoip2>=2.5.0
 geojson>=1.3.5
-graphene>=1.4
-graphene-sqlalchemy>=1.1.1
-graphql-relay>=0.4.5
+graphene==2.0.1
+graphene-sqlalchemy==2.0.0
+graphql-relay==0.4.5
 icalendar>=3.11.4
 ipaddress>=1.0.18              ; python_version < '3.3'
 jsonschema>=2.6.0

docs/source/change_log.rst

@@ -10,17 +10,21 @@ Version 1.x.x
 Version 1.9.x
 ^^^^^^^^^^^^^
 
-*In Progress*
+Released :release:`1.9.0` on November 22nd, 2017
 
 * Support resetting plugins options to their respective defaults
 * Moved Office 2007+ metadata removal to a new plugin
+* Added support for installing plugins from remote sources through the UI
+* Added timeout support for SPF DNS queries
+* Support for installing on Arch Linux
 
 * Multiple server improvements
 
    * Upgrade AdvancedHTTPServer to v2.0.11 to support async SSL handshakes
    * Support using an include directive in the server configuration file
    * Added a ``request-handle`` signal for custom HTTP request handlers
    * Removed ``address`` support from the server config in favor of ``addresses``
+   * Support ``login`` as an alias of the ``username`` parameter for credentials
 
 Version 1.8.0
 ^^^^^^^^^^^^^

docs/source/client/gobject_signals.rst

@@ -205,6 +205,18 @@ The following are the signals for the
 
    :signal flags: ``SIGNAL_RUN_FIRST``
 
+.. py:function:: send-message(target, message)
+
+   This signal is emitted when the message for a target has been loaded and
+   constructed. Subscribers to this signal may use it as an oppertunity to
+   modify the message object prior to it being sent.
+
+   :signal flags: ``SIGNAL_RUN_FIRST``
+   :param target: The target for the message.
+   :type target: :py:class:`~king_phisher.client.mailer.MessageTarget`
+   :param message: The message about to be sent to the target.
+   :type message: :py:class:`~king_phisher.client.mailer.TopMIMEMultipart`
+
 .. py:function:: send-precheck()
 
    This signal is emitted when the user is about to start sending phishing

docs/source/development/release_steps.rst

@@ -23,7 +23,7 @@ Release Steps
 
    #. Upload the final Windows build
    #. Insert the changes from the change log
-   #. Insert the MD5 and SHA1 hashes of the Windows build
+   #. Insert the MD5, SHA1, SHA512 hashes of the Windows build
 
 #. Update the Docker build
 #. Publicize the release

docs/source/king_phisher/client/gui_utilities.rst

@@ -22,6 +22,8 @@ Functions
 
 .. autofunction:: king_phisher.client.gui_utilities.gobject_get_value
 
+.. autofunction:: king_phisher.client.gui_utilities.gobject_set_value
+
 .. autofunction:: king_phisher.client.gui_utilities.gobject_signal_accumulator
 
 .. autofunction:: king_phisher.client.gui_utilities.gobject_signal_blocked

docs/source/king_phisher/client/plugins.rst

@@ -7,6 +7,12 @@
 Classes
 -------
 
+.. autoclass:: king_phisher.client.plugins.ClientCatalogManager
+   :show-inheritance:
+   :members:
+   :inherited-members:
+   :special-members: __init__
+
 .. autoclass:: king_phisher.client.plugins.ClientOptionBoolean
    :show-inheritance:
    :members:

docs/source/king_phisher/client/widget/extras.rst

@@ -17,6 +17,12 @@ Classes
    :special-members: __init__
    :undoc-members:
 
+.. autoclass:: king_phisher.client.widget.extras.MultilineEntry
+   :show-inheritance:
+   :members:
+   :special-members: __init__
+   :undoc-members:
+
 .. autoclass:: king_phisher.client.widget.extras.WebKitHTMLView
    :show-inheritance:
    :members:

docs/source/server/graphql.rst

@@ -42,8 +42,8 @@ string parameter and optional query variables. This can be used for easily
 testing queries. It should be noted however that using this utility directly on
 the server does not restrict access to data as the RPC interface does.
 
-Example Query
--------------
+Example Queries
+---------------
 
 The following query is an example of retrieving the first 3 users from the
 users table. The query includes the necessary information to perform subsequent
@@ -79,5 +79,43 @@ queries to iterate over all entries.
       }
    }
 
+.. code-block:: none
+
+   # Get a summary of all of the campaigns
+   query getCampaigns {
+      db {
+         campaigns {
+            # get the total number of campaigns
+            total
+            edges {
+               node {
+                  id
+                  created
+                  name
+                  # get the details about the user that created this campaign
+                  user {
+                     id
+                     phoneNumber
+                  }
+                  # get the total number of messages in this campaign
+                  messages {
+                     total
+                  }
+                  # get the total number of visits in this campaign
+                  visits {
+                     total
+                  }
+               }
+            }
+         }
+      }
+   }
+
+.. code-block:: none
+
+   # This query does not define the operation type or an operation name
+   # and is condensed to a single line
+   { plugins { total edges { node { name title authors } } } }
+
 .. _GraphQL: http://graphql.org/
 .. _Relay: https://facebook.github.io/relay/graphql/connections.htm