dradis-mediawiki 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c378e90bf1d9d71f2e170609bf7168c8ab238823
-  data.tar.gz: 1f5e9af32a262de11680d35048d8242ddaefabe5
+  metadata.gz: acde37cc28ad603fdf19cab768a918b3d91b753c
+  data.tar.gz: 72d15dc77c7d0077452246f47594ebe5c4fea5c6
 SHA512:
-  metadata.gz: 7e31880a578fec2f829aadf688e0dbb5dd0d11dc3bd85ef5eefff21eaf4c07f9af6f3b9618cd0056345cc03c2829e4f341ebbda455f9e3e422712b956155862e
-  data.tar.gz: d85a3d9430b1ae94614a46983ac08f7f64060cef69dff3f2833472726882acc2d847f08749054ca42164318d0bec3d2d52076d705df3cfea4936f5e38d8bae3f
+  metadata.gz: b809ddc91d96d3d2813fc63b7d2a9e22e33e9d6cf5c23dcf31e908c51de8029687469bd221cc79bd45e381704ab7d48176453d2f1015ddde4555938e643e505c
+  data.tar.gz: fc448a660a1f042ccd1ee413f39b0ef9ca2c8ea821af46b1a5f21b2190192ec3c64b5336cc24cde8e680b95ec732c9e9ec948688c637bbf291d1ced99e1167a7

data/CHANGELOG.md

@@ -1,7 +1,10 @@
-## Dradis Framework 3.7 (July, 2017) ##
+## Dradis Framework 3.8 (September, 2017) ##
 
-*   No changes.
+*   Add https support
+
+## Dradis Framework 3.7 (July, 2017) ##
 
+*   Fix Net::HTTP not being required
 
 ## Dradis Framework 3.6 (March, 2017) ##
 

data/lib/dradis-mediawiki.rb

@@ -1 +1,2 @@
-require 'dradis/plugins/mediawiki'
+require 'net/http'
+require 'dradis/plugins/mediawiki'

data/lib/dradis/plugins/mediawiki/engine.rb

@@ -1,5 +1,4 @@
 module Dradis::Plugins::Mediawiki
-
   class Engine < ::Rails::Engine
     isolate_namespace Dradis::Plugins::Mediawiki
 
@@ -8,11 +7,11 @@ module Dradis::Plugins::Mediawiki
     description 'Import entries from an external MediaWiki'
 
     addon_settings :wikiimport do
+      settings.default_fields    = 'Title,Impact,Probability,Description,Recommendation'
       settings.default_host      = 'localhost'
-      settings.default_port      = 80
       settings.default_path      = 'mediawiki/api.php'
-      settings.default_fields    = 'Title,Impact,Probability,Description,Recommendation'
+      settings.default_port      = 443
+      settings.default_scheme    = 'http(s)'
     end
   end
-
 end

data/lib/dradis/plugins/mediawiki/filters.rb

@@ -3,9 +3,12 @@ module Dradis::Plugins::Mediawiki::Filters
     def query(params={})
       results = []
 
-      host = Dradis::Plugins::Mediawiki::Engine.settings.host
-      port = Dradis::Plugins::Mediawiki::Engine.settings.port
-      path = Dradis::Plugins::Mediawiki::Engine.settings.path
+      host   = Dradis::Plugins::Mediawiki::Engine.settings.host
+      path   = Dradis::Plugins::Mediawiki::Engine.settings.path
+      port   = Dradis::Plugins::Mediawiki::Engine.settings.port
+      scheme = Dradis::Plugins::Mediawiki::Engine.settings.scheme
+
+      port   = (scheme == 'https' ? 443 : 80) if port.blank?
 
       begin
         # Parameters required by MediaWiki API
@@ -21,7 +24,7 @@ module Dradis::Plugins::Mediawiki::Filters
         }
 
         # Get the results over HTTP
-        Net::HTTP.start(host, port) do |http|
+        Net::HTTP.start(host, port, use_ssl: scheme == 'https') do |http|
           res = http.get("#{path}?#{filter_params.to_query}")
           xml_doc = Nokogiri::XML( res.body )
           results += xml_doc.xpath('api/query/pages/page').map do |xml_page|

data/lib/dradis/plugins/mediawiki/gem_version.rb

@@ -9,7 +9,7 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 7
+        MINOR = 8
         TINY = 0
         PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-mediawiki
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins