owasp_zap 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b7b8a9a5e467df211b540b1e37397c2010a3cc
-  data.tar.gz: 59631214ffc42c20e952f1bc4e0fdf0aa0dda8ca
+  metadata.gz: 4b415e6b141e52526caacc96bdcdefb8186a7832
+  data.tar.gz: 1dc4d0e67c9f466d731e300c472656cf4f180133
 SHA512:
-  metadata.gz: bdd1bcfd595e647f0c78edd838052be844fe10b29f4b4f01d00f4e042f4ff814f87378282bce761b9841fe983b1a2147279d9bf089257722bd0ffb5fae762660
-  data.tar.gz: a1c5bee92a9674f37c2867127fb64aaa37d4d5266ced72e3dea4400bc9444d548f1540915dca9ffeb9da42b0e43abdf650a0ab527aaec005247b336685deeebc
+  metadata.gz: 9fc2f9b1fafb2b78a0d378b06b3e4a4473d0de8c2f4f576b8f9fff97cee535e711c4a8f4e1042e1ad84489cc5868e379268448faf7bb670cec3420298739f1f9
+  data.tar.gz: b61ec24d8efc9d1315968263fafe874e115059a9e2c81669eb901f3c30c78540d3ca02a0fa515d48d1bdcfa33e8ddf2f68d2703f2fb517182e583e20e6984769

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}/core/view/alerts/"
+            url = Addressable::URI.parse "#{@base}/#{format}/core/view/alerts/"
             url.query_values = {:zapapiformat=>format,:baseurl=>@target}
             RestClient::get url.normalize.to_str
         end

data/lib/owasp_zap/attack.rb

@@ -1,20 +1,29 @@
 module OwaspZap
     class Attack
         def initialize(params = {})
-            #TODO
-            #handle it
+            # TODO
+            # handle it
             @base = params[:base]
             @target = params[:target]
         end
 
         def start
-            url = Addressable::URI.parse "#{@base}/ascan/action/scan/"
+            url = Addressable::URI.parse "#{@base}/JSON/ascan/action/scan/"
             url.query_values = {:zapapiformat=>"JSON",:url=>@target}
             RestClient::get url.normalize.to_str
         end
 
         def status
-            JSON.parse RestClient::get("#{@base}/ascan/view/status/?zapapiformat=JSON")
+            ret = JSON.parse(RestClient::get("#{@base}/JSON/ascan/view/status/?zapapiformat=JSON"))
+            if ret.has_key? "status"
+                ret["status"].to_i
+            else
+                100 # it means no running
+            end
+        end
+
+        def running?
+            self.status != 100
         end
 
     end

data/lib/owasp_zap/spider.rb

@@ -10,18 +10,26 @@ module OwaspZap
 
         def start
             #http://localhost:8080/JSON/spider/action/scan/?zapapiformat=JSON&url=
-            url = Addressable::URI.parse "#{@base}/spider/action/scan/"
+            url = Addressable::URI.parse "#{@base}/JSON/spider/action/scan/"
             url.query_values = {:zapapiformat=>"JSON",:url=>@target}
             RestClient::get url.normalize.to_str
         end
 
         def stop
-            RestClient::get "#{@base}/spider/action/stop/?zapapiformat=JSON"
+            RestClient::get "#{@base}/JSON/spider/action/stop/?zapapiformat=JSON"
         end
 
         def status
-            RestClient::get "#{@base}/spider/view/status/?zapapiformat=JSON"
-        end
+            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
 
+       def running?
+            self.status != 100
+       end
     end
 end

data/lib/owasp_zap/version.rb

@@ -1,3 +1,3 @@
 module OwaspZap
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 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/JSON"
+            @base = params[:base] || "http://127.0.0.1:8080"
             @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}/core/action/shutdown/"
+            RestClient::get "#{@base}/JSON/core/action/shutdown/"
         end
 
         #xml report

data/spec/zap_spec.rb

@@ -8,31 +8,32 @@ describe Zap do
     end
 
     it "shouldnt be nil" do
-        @zap.wont_be :nil?
+        @zap.wont_be_nil
     end
 
     it "should have a target" do
-        @zap.respond_to? :target
+        @zap.must_respond_to :target
     end
 
     it "target shouldnt be nil" do
-        @zap.target.wont_be :nil?
+        @zap.target.wont_be_nil
     end
 
     it "should have a base" do
-        assert_respond_to @zap,:base
+        @zap.must_respond_to :base
+        #assert_respond_to @zap,:base
     end
 
     it "should have method start" do
-        assert_respond_to @zap,:start
+        @zap.must_respond_to :start
     end
 
     it "should have a method shutdown" do
-        assert_respond_to @zap,:shutdown
+        @zap.must_respond_to :shutdown
     end
 
     it "should respond_to to spider" do
-        assert_respond_to @zap,:spider
+        @zap.must_respond_to :spider
     end
 
     it "should call spider and get a spider object" do
@@ -40,7 +41,7 @@ describe Zap do
     end
 
     it "should respond_to auth" do
-        assert_respond_to @zap,:auth
+        @zap.must_respond_to :auth
     end
 
     it "should call auth and get an auth object" do
@@ -48,7 +49,7 @@ describe Zap do
     end
 
     it "should respond_to ascan" do 
-        assert_respond_to @zap,:ascan
+        @zap.must_respond_to :ascan
     end
 
     it "should call ascan and get an attack object" do
@@ -56,7 +57,7 @@ describe Zap do
     end
 
     it "should respond_to alerts" do
-        assert_respond_to @zap,:alerts
+        @zap.must_respond_to :alerts
     end
 
     it "should call alerts and get a alert object" do
@@ -67,8 +68,8 @@ describe Zap do
         @zap.base.wont_be :nil?
     end
 
-    it "base default should be http://127.0.0.1:8080/JSON" do
-        assert_equal @zap.base, "http://127.0.0.1:8080/JSON"
+    it "base default should be http://127.0.0.1:8080" do
+        assert_equal @zap.base, "http://127.0.0.1:8080"
     end
 end
 
@@ -86,7 +87,7 @@ describe "method shutdown" do
     end
 
     it "should receive a json as answer" do
-         @h.shutdown.wont_be :nil?
+         @h.shutdown.wont_be_nil
     end
     it "should request the shutdown url" do
         @h.shutdown
@@ -99,14 +100,14 @@ describe "StringExtension" do
     it "should not respond_to camel_case and snake_case" do
         @str = "" 
         [:camel_case,:snake_case].each do |m|
-            refute_respond_to(@str,m)
+            @str.wont_respond_to m
         end
     end
      it "should respond_to camel_case and snake_case" do
         @str = "" 
         @str.extend Zap::StringExtension
         [:camel_case,:snake_case].each do |m|
-            assert_respond_to @str,m
+            @str.must_respond_to m
         end
     end
     it "should answer to camel_case" do
@@ -129,12 +130,33 @@ describe "status_for" do
     end
 
     it "should create a ascan" do
-        @h.status_for(:ascan).wont_be :nil?
+        @h.status_for(:ascan).wont_be_nil
     end
     it "should create a spider" do
-        @h.status_for(:spider).wont_be :nil?
+        @h.status_for(:spider).wont_be_nil
     end
     it "should return an unknown" do
-        @h.status_for(:foo).wont_be :nil?
+        @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.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Victor Pereira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler