gauntlt 0.0.6 → 0.0.7

data/README.md

@@ -95,10 +95,10 @@ Below are some tools we are targeting but don't let that stop you from adding yo
   * [w3af] [w3af]
   * [arachni] [arachni]
 
-Have questions?  Ask us anything on the [gauntlt google group](http://bit.ly/gauntlt_group).
 
-## ADD A MODULE
-See the wiki on how to add a module into gauntlt. We would love your contributions.
+## ADD AN ATTACK ADAPTER
+
+See the wiki on how to add an attack adapter to gauntlt. We would love your contributions.
 
 ## LICENSE
 

data/bin/gauntlt

@@ -44,7 +44,7 @@ cmd_opts = case cmd
 
 if cmd == "attack"
   if cmd_opts[:'attack-file_given'] && cmd_opts[:name]
-      puts Gauntlt.attack(cmd_opts[:name], :attack_file => cmd_opts[:'attack-file'])
+    puts Gauntlt.attack(cmd_opts[:name], :attack_file => cmd_opts[:'attack-file'])
   else
     puts "Available attacks:"
     puts ""

data/features/attack.feature

@@ -33,13 +33,21 @@ Feature: Verify the attack behaviour is correct
     When I run `gauntlt attack --name nmap --attack-file nmap.attack`
     Then it should pass
 
-  Scenario: Bad attack name specified
-    When I run `gauntlt attack --name thisattackwouldneverexist`
+  Scenario: Run attack with undefined steps
+    Given an attack "nmap" exists
+    And a file named "nmap.attack" with:
+    """
+    Feature: my non-existent attack
+      Scenario: Fail on undefined step definition
+        Given "thisattackwouldneverexist" is installed
+    """
+    When I run `gauntlt attack --name nmap --attack-file nmap.attack`
     Then it should fail with:
     """
-    must specify name and attack-file
+    Bad or undefined attack!
     """
 
+
   Scenario: No attack name specified
     When I run `gauntlt attack --attack-file thisattackwouldneverexist`
     Then it should fail with:

data/lib/gauntlt/attack.rb

@@ -4,6 +4,7 @@ require 'cucumber/cli/main'
 module Gauntlt
   class Attack
     class NotFound < Exception; end
+    class ExecutionFailed < Exception; end
 
     attr_accessor :name, :opts, :attack_file
 
@@ -26,7 +27,15 @@ module Gauntlt
     end
 
     def run
-      Cucumber::Cli::Main.execute([self.attack_file, '--strict', '--require', self.attacks_dir])
+      @out = StringIO.new ""
+
+      cli = Cucumber::Cli::Main.new([self.attack_file, '--strict', '--require', self.attacks_dir], @out)
+
+      if cli.execute! # cucumber failed, returning true
+        raise ExecutionFailed.new("Bad or undefined attack!")
+      else            # cucumber executed successfully, returning false
+        @out.string
+      end
     end
   end
 end

data/lib/gauntlt/attack_adapters/nmap.rb

@@ -13,12 +13,11 @@ When /^the target tcp_ping_ports are "(.*?)"$/ do |ports|
 end
 
 When /^I launch an "nmap" attack with:$/ do |command|
+  # hostname defined in Gauntlt::Support::ProfileHelper
   command.gsub!('<hostname>', hostname)
 
-  if tcp_ping_ports.nil?
-    else
-      command.gsub!('<tcp_ping_ports>', tcp_ping_ports)
-    end
+  # tcp_ping_ports defined in Gauntlt::Support::ProfileHelper
+  command.gsub!('<tcp_ping_ports>', tcp_ping_ports) if tcp_ping_ports
 
   run command
 end

data/lib/gauntlt/attack_adapters/support/profile_helper.rb

@@ -8,8 +8,6 @@ module Gauntlt
       end
 
       def tcp_ping_ports
-        #raise "No tcp_ping_ports defined" if @tcp_ping_ports.nil?
-
         @tcp_ping_ports
       end
 

data/lib/gauntlt/version.rb

@@ -1,3 +1,3 @@
 module Gauntlt
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/gauntlt/attack_spec.rb

@@ -50,9 +50,40 @@ describe Gauntlt::Attack do
     it "executes the attack file, specifies failure for undefined steps and specifies the attacks_dir" do
       subject.should_receive(:attacks_dir).and_return('/bar')
       subject.should_receive(:attack_file).and_return('/bar/baz.attack')
-      Cucumber::Cli::Main.should_receive(:execute).with(['/bar/baz.attack', '--strict', '--require', '/bar'])
+
+      mock_io = mock('io')
+      mock_io.stub(:string)
+      StringIO.stub(:new).and_return(mock_io)
+
+      mock_cli = mock(Cucumber::Cli::Main)
+      mock_cli.should_receive(:execute!)
+      Cucumber::Cli::Main.should_receive(:new).with(['/bar/baz.attack', '--strict', '--require', '/bar'], mock_io).and_return(mock_cli)
 
       subject.run
     end
+
+    it "returns nil if if Cucumber::Cli::Main.execute succeeds (i.e. returns nil)" do
+      subject.stub(:attacks_dir)
+      subject.stub(:attack_file)
+
+      mock_cli = mock(Cucumber::Cli::Main)
+      mock_cli.should_receive(:execute!).and_return(nil)
+      Cucumber::Cli::Main.stub(:new).and_return(mock_cli)
+
+      subject.run.should be_true
+    end
+
+    it "raises an error if Cucumber::Cli::Main.execute fails (i.e. returns true)" do
+      subject.stub(:attacks_dir)
+      subject.stub(:attack_file)
+
+      mock_cli = mock(Cucumber::Cli::Main)
+      mock_cli.should_receive(:execute!).and_return(true)
+      Cucumber::Cli::Main.stub(:new).and_return(mock_cli)
+
+      expect {
+        subject.run
+      }.to raise_error(subject.class::ExecutionFailed)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gauntlt
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber