owasp_zap 0.0.9 → 0.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b415e6b141e52526caacc96bdcdefb8186a7832
-  data.tar.gz: 1dc4d0e67c9f466d731e300c472656cf4f180133
+  metadata.gz: 22c87a0289c9453ee20a0469b2b5ac8dc07f4eb2
+  data.tar.gz: c030852ed5fa68a78b9b05c57cb4adc151505e8c
 SHA512:
-  metadata.gz: 9fc2f9b1fafb2b78a0d378b06b3e4a4473d0de8c2f4f576b8f9fff97cee535e711c4a8f4e1042e1ad84489cc5868e379268448faf7bb670cec3420298739f1f9
-  data.tar.gz: b61ec24d8efc9d1315968263fafe874e115059a9e2c81669eb901f3c30c78540d3ca02a0fa515d48d1bdcfa33e8ddf2f68d2703f2fb517182e583e20e6984769
+  metadata.gz: 2582b39e92c33b003ff9467c23a7e3f2e9653185f031baf8b8eab6c067917b8dfd55ceda503ee48e948bea5505e94347ef4f6e50028d1d9d2ab55fad90d70b4b
+  data.tar.gz: 90e8278dbca49dd80b6714896c6ec63248ddc5b46835b2f8e738dbf2208e3f44e243a68ddc234ab559e90b9341b21df98dabc053da83ea1dae751e687395e9a5

data/lib/owasp_zap/alert.rb

@@ -11,7 +11,7 @@ module OwaspZap
         def view(format = "JSON")
             raise OwaspZap::WrongFormatException,"Output format not accepted" unless ["JSON","HTML","XML"].include?(format)
             #http://localhost:8080/JSON/core/view/alerts/?zapapiformat=JSON&baseurl=http%3A%2F%2F192.168.1.113&start=&count=
-            url = Addressable::URI.parse "#{@base}/#{format}/core/view/alerts/"
+            url = Addressable::URI.parse "#{@base}/core/view/alerts/"
             url.query_values = {:zapapiformat=>format,:baseurl=>@target}
             RestClient::get url.normalize.to_str
         end

data/lib/owasp_zap/attack.rb

@@ -8,15 +8,15 @@ module OwaspZap
         end
 
         def start
-            url = Addressable::URI.parse "#{@base}/JSON/ascan/action/scan/"
+            url = Addressable::URI.parse "#{@base}/ascan/action/scan/"
             url.query_values = {:zapapiformat=>"JSON",:url=>@target}
             RestClient::get url.normalize.to_str
         end
 
         def status
-            ret = JSON.parse(RestClient::get("#{@base}/JSON/ascan/view/status/?zapapiformat=JSON"))
+            ret = JSON.parse(RestClient::get("#{@base}/ascan/view/status/?zapapiformat=JSON"))
             if ret.has_key? "status"
-                ret["status"].to_i
+                ret["status"]
             else
                 100 # it means no running
             end

data/lib/owasp_zap/spider.rb

@@ -10,26 +10,18 @@ module OwaspZap
 
         def start
             #http://localhost:8080/JSON/spider/action/scan/?zapapiformat=JSON&url=
-            url = Addressable::URI.parse "#{@base}/JSON/spider/action/scan/"
+            url = Addressable::URI.parse "#{@base}/spider/action/scan/"
             url.query_values = {:zapapiformat=>"JSON",:url=>@target}
             RestClient::get url.normalize.to_str
         end
 
         def stop
-            RestClient::get "#{@base}/JSON/spider/action/stop/?zapapiformat=JSON"
+            RestClient::get "#{@base}/spider/action/stop/?zapapiformat=JSON"
         end
 
         def status
-            ret = JSON.parse(RestClient::get("#{@base}/JSON/spider/view/status/?zapapiformat=JSON"))
-            if ret.has_key? "status"
-                ret["status"].to_i
-            else
-                100 # it means no running
-            end
-       end
+            RestClient::get "#{@base}/spider/view/status/?zapapiformat=JSON"
+        end
 
-       def running?
-            self.status != 100
-       end
     end
 end

data/lib/owasp_zap/version.rb

@@ -1,3 +1,3 @@
 module OwaspZap
-  VERSION = "0.0.9"
+  VERSION = "0.0.81"
 end

data/lib/owasp_zap.rb

@@ -20,7 +20,7 @@ module OwaspZap
        def initialize(params = {})
             #TODO
             # handle params
-            @base = params[:base] || "http://127.0.0.1:8080"
+            @base = params[:base] || "http://127.0.0.1:8080/JSON"
             @target = params[:target]
             @zap_bin = params [:zap] || "#{ENV['HOME']}/ZAP/zap.sh"
         end
@@ -83,7 +83,7 @@ module OwaspZap
 
         #shutdown zap
         def shutdown
-            RestClient::get "#{@base}/JSON/core/action/shutdown/"
+            RestClient::get "#{@base}/core/action/shutdown/"
         end
 
         #xml report

data/spec/zap_spec.rb

@@ -68,8 +68,8 @@ describe Zap do
         @zap.base.wont_be :nil?
     end
 
-    it "base default should be http://127.0.0.1:8080" do
-        assert_equal @zap.base, "http://127.0.0.1:8080"
+    it "base default should be http://127.0.0.1:8080/JSON" do
+        assert_equal @zap.base, "http://127.0.0.1:8080/JSON"
     end
 end
 
@@ -138,25 +138,4 @@ describe "status_for" do
     it "should return an unknown" do
         @h.status_for(:foo).wont_be_nil
     end
-
-    it "should return an integer" do
-        @h.spider.status.must_be_kind_of Numeric
-    end
-    it "should return an integer" do
-        @h.spider.status.must_be_kind_of Numeric
-    end
 end 
-
-describe "running? method" do
-    before do
-        @h = Zap::Zap.new :target=>"http://127.0.0.1"
-        stub_request(:get, "http://127.0.0.1:8080/JSON/spider/view/status/?zapapiformat=JSON").to_return(:status => 200, :body => {:status=>"90"}.to_json, :headers => {})
-        stub_request(:get, "http://127.0.0.1:8080/JSON/ascan/view/status/?zapapiformat=JSON").to_return(:status => 200, :body => {:status=>"100"}.to_json, :headers => {})
-    end
-    it "should return true" do
-        @h.spider.running?.must_equal true
-    end
-    it "should return false" do
-        @h.ascan.running?.must_equal false
-    end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: owasp_zap
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.81
 platform: ruby
 authors:
 - Victor Pereira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler