wepawet 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/wepawet/wepawet.rb

@@ -10,7 +10,12 @@ module Wepawet
 	
 	# Wepawet::Submit is used to submit new files and/or URLs into the wepawet system.
 	class Submit
-		def initialize(config)
+		def initialize(config = {
+			'wepawetSubmitUrl' => 'http://wepawet.cs.ucsb.edu/services/upload.php', 
+			'wepawetQueryUrl' => 'http://wepawet.cs.ucsb.edu/services/query.php',
+			'wepawetDomainUrl' => 'http://wepawet.cs.ucsb.edu/services/domain.php',
+			'wepawetUrlUrl' => 'http://wepawet.cs.ucsb.edu/services/url.php',
+		})
 			@config = config
 		end
 		
@@ -37,7 +42,6 @@ module Wepawet
 			['user','passwd','referer'].each do |opt|
 				params[opt] = @config[opt] if @config[opt]
 			end
-			puts @config['wepawetSubmitUrl']
 			uri = URI.parse(@config['wepawetSubmitUrl'])
 			http = Net::HTTP.new(uri.host, uri.port)
 			http.use_ssl = (uri.scheme == 'https')
@@ -59,7 +63,12 @@ module Wepawet
 	end
 	
 	class Query
-		def initialize(config)
+		def initialize(config = {
+			'wepawetSubmitUrl' => 'http://wepawet.cs.ucsb.edu/services/upload.php', 
+			'wepawetQueryUrl' => 'http://wepawet.cs.ucsb.edu/services/query.php',
+			'wepawetDomainUrl' => 'http://wepawet.cs.ucsb.edu/services/domain.php',
+			'wepawetUrlUrl' => 'http://wepawet.cs.ucsb.edu/services/url.php',
+		})
 			@config = config
 		end
 		

data/test/test_wepawet.rb

@@ -1,5 +1,5 @@
 require 'helper'
-
+require 'pp'
 class TestWepawet < Test::Unit::TestCase
 	should "submit submit http://example.com for analysis" do
 		config = {
@@ -13,8 +13,15 @@ class TestWepawet < Test::Unit::TestCase
 		assert_equal(32, hash.length)
 		assert(hash =~ /^[a-fA-F0-9]{32}$/)
 		q = Wepawet::Query.new(config)
+		begin
+			sleep 2
+			resp = q.by_taskid(hash)
+		end while resp['status'] == 'queued'
+		pp resp
 		resp = q.by_taskid(hash)
 		assert("http://example.com", resp['url'])
+		assert("benign", resp['result'])
+		assert("processed", resp['status'])
 		resp = q.by_domain("example.com")
 		assert("example.com", resp['domain'])
 		resp = q.by_url("http://example.com")

data/wepawet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wepawet}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Lee"]
-  s.date = %q{2011-04-24}
+  s.date = %q{2011-04-25}
   s.description = %q{Wepawet is a service for detecting and analyzing web-based malware. It currently handles Flash, JavaScript, and PDF files. http://wepawet.cs.ucsb.edu}
   s.email = %q{rubygems@chrislee.dhs.org}
   s.executables = ["wepawet"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wepawet
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris Lee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 Z
+date: 2011-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement