arachni 0.4.0.4 → 0.4.1

data/bin/arachni_rpcd_monitor

@@ -1,18 +1,24 @@
 #!/usr/bin/env ruby
 =begin
-                  Arachni
-  Copyright (c) 2010-2012 Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
+    Copyright 2010-2012 Tasos Laskos <tasos.laskos@gmail.com>
 
-  This is free software; you can copy and distribute and modify
-  this program under the term of the GPL v2.0 License
-  (See LICENSE file for details)
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 =end
 
-require_relative "../lib/arachni/options"
+require_relative '../lib/arachni'
 
-Arachni::Options.instance.parse!
+Arachni::Options.parse
 
-require Arachni::Options.instance.dir['lib'] + 'ui/rpc/dispatcher_monitor'
+require Arachni::Options.dir['lib'] + 'ui/rpc/dispatcher_monitor'
 
 Arachni::UI::DispatcherMonitor.new( Arachni::Options.instance ).run

data/bin/arachni_script

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+=begin
+    Copyright 2010-2012 Tasos Laskos <tasos.laskos@gmail.com>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+=end
+
+require_relative '../lib/arachni/ui/cli/output'
+require_relative '../lib/arachni'
+
+include Arachni
+include Utilities
+include UI::Output
+
+Options.parse( false )
+
+if Options.help
+    puts <<EOHELP
+#{BANNER}
+
+
+Usage: #{__FILE__} file1 [file2] [..]
+
+Pre-loads Arachni's libraries and loads and runs a series of Ruby scripts.
+
+(Call the 'mute' method to mute framework output.)
+EOHELP
+    exit
+end
+
+ARGV.each { |script| load script }

data/bin/arachni_web

@@ -1,27 +1,27 @@
 #!/usr/bin/env ruby
 =begin
-                  Arachni
-  Copyright (c) 2010-2012 Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
+    Copyright 2010-2012 Tasos Laskos <tasos.laskos@gmail.com>
 
-  This is free software; you can copy and distribute and modify
-  this program under the term of the GPL v2.0 License
-  (See LICENSE file for details)
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 =end
 
-require_relative "../lib/arachni/options"
+require_relative '../lib/arachni'
 
-Arachni::Options.instance.parse!
+Arachni::Options.parse
 
 def print_help( root )
         puts <<USAGE
-Arachni - Web Application Security Scanner Framework
-       Author: Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
-                                      <zapotek@segfault.gr>
-               (With the support of the community and the Arachni Team.)
-
-       Website:       http://arachni.segfault.gr - http://github.com/Zapotek/arachni
-       Documentation: http://github.com/Zapotek/arachni/wiki
+#{Arachni::BANNER}
 
   Usage:  arachni_web \[options\]
 
@@ -41,9 +41,8 @@ Arachni - Web Application Security Scanner Framework
 USAGE
 end
 
-options = Arachni::Options.instance
-if options.help
-    print_help( options.root_path )
+if Arachni::Options.help
+    print_help( Arachni::Options.root_path )
     exit
 end
 
@@ -51,5 +50,5 @@ require 'eventmachine'
 
 ::EM.run do
     # Sinatra will run automatically
-    require Arachni::Options.instance.dir['lib'] + 'ui/web/server'
-end
+    require Arachni::Options.dir['lib'] + 'ui/web/server'
+end

data/bin/arachni_web_autostart

@@ -1,38 +1,37 @@
 #!/usr/bin/env ruby
-
 =begin
-                  Arachni
-  Copyright (c) 2010-2012 Tasos "Zapotek" Laskos <tasos.laskos@gmail.com>
-
-  This is free software; you can copy and distribute and modify
-  this program under the term of the GPL v2.0 License
-  (See LICENSE file for details)
-
+    Copyright 2010-2012 Tasos Laskos <tasos.laskos@gmail.com>
 
-  Simple shell script to start all systems required for the WebUI.
-  Requires all arachni executables to be in PATH.
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
-    Original by: Brandon Potter <bpotter8705@gmail.com>
-    Modified by: Tasos Laskos <tasos.laskos@gmail.com>
+        http://www.apache.org/licenses/LICENSE-2.0
 
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 =end
 
+root = File.expand_path( File.dirname( __FILE__ ) )
+
 # the gemspec doesn't seem to able to handle shell scripts
 # so we hack around it
 exec  <<END
 
-export xterm="xterm -geometry 80X10 -hold"
-
 echo "[>] Starting the Arachni Dispatch server..."
-xterm -T "Arachni Dispatch server" -e "arachni_rpcd" &
+(#{root}/arachni_rpcd > arachni_rpcd.log) &
 sleep 5
 
 echo "[>] Starting the Arachni WebUI server..."
-xterm -T "Arachni WebUI server" -e "arachni_web" &
+(#{root}/arachni_web > arachni_web.log) &
 sleep 5
 
-echo "[>] Opening browser..."
-xdg-open http://127.0.0.1:4567
+echo "[>] The web interface is at: http://127.0.0.1:4567"
+echo "[>] --- It may take a while to startup, try refreshing the page a couple of times."
+echo
 
 echo "[>] Hit Ctrl+C to shut everything down."
 

data/external/metasploit/plugins/arachni.rb

@@ -6,7 +6,7 @@ class Plugin::Arachni < Msf::Plugin
 	#
 	# This class implements an exploitation platform for web app vulnerabilities
 	# discovered by the Arachni WebApp Security Scaner Framework
-	# (http://github.com/Zapotek/arachni)
+	# (http://github.com/Arachni/arachni)
 	#
 	###
 	class ArachniCommandDispatcher
@@ -56,13 +56,7 @@ class Plugin::Arachni < Msf::Plugin
 
 			@vulns    ||= []
 			@exploits ||= []
-			YAML.load( IO.read( metareport ) ).each do |vuln|
-				data = { }
-
-				vuln.ivars.keys.each do |k|
-					data[k.to_sym] = vuln.ivars[k]
-				end
-
+			YAML.load( IO.read( metareport ) ).each do |data|
 				begin
 					# the MSF doesn't much like hostnames, resolve to an IP address
 					# there's probably a beter way to do it...
@@ -508,10 +502,14 @@ class Plugin::Arachni < Msf::Plugin
 		super
 		# console dispatcher commands.
 		add_console_dispatcher( ArachniCommandDispatcher )
+		framework.modules.add_module_path(File.join(File.dirname(__FILE__),"arachni","modules")).each do |m|
+                        print_good("Added #{m.last} #{m.first.capitalize} modules for Arachni")
+                end
 	end
 
 	def cleanup
 		remove_console_dispatcher( 'Arachni' )
+		framework.modules.remove_module_path(File.join(File.dirname(__FILE__),"arachni","modules"))
 	end
 
 	def name
@@ -521,7 +519,7 @@ class Plugin::Arachni < Msf::Plugin
 	def desc
 		%q{Provides an exploitation platform for web app vulnerabilities
 		discovered by the Arachni WebApp Security Scaner Framework
-		(http://github.com/Zapotek/arachni)}
+		(http://github.com/Arachni/arachni)}
 	end
 
 end

data/external/metasploit/{modules → plugins/arachni/modules}/exploits/unix/webapp/arachni_exec.rb

@@ -27,7 +27,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision: 10642 $',
 			'References'     =>
 				[
-					['URL', 'http://github.com/Zapotek/arachni'],
+					['URL', 'http://github.com/Arachni/arachni'],
 				],
 			'Privileged'     => false,
 			'Payload'        =>

data/external/metasploit/{modules → plugins/arachni/modules}/exploits/unix/webapp/arachni_path_traversal.rb

@@ -1,6 +1,6 @@
 require 'msf/core'
 
-class Metasploit3 < Msf::Auxiliary
+class Metasploit3 < Msf::Exploit::Remote #Msf::Auxiliary
 
 	include Msf::Exploit::Remote::HttpClient
 
@@ -20,7 +20,7 @@ class Metasploit3 < Msf::Auxiliary
 			'Version'       => '$Revision: 9212 $',
 			'References'    =>
 				[
-					['URL', 'http://github.com/Zapotek/arachni']
+					['URL', 'http://github.com/Arachni/arachni']
 				]
 			))
 

data/external/metasploit/{modules → plugins/arachni/modules}/exploits/unix/webapp/arachni_php_eval.rb

@@ -26,7 +26,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision: 9392 $',
 			'References'     =>
 				[
-					['URL', 'http://github.com/Zapotek/arachni'],
+					['URL', 'http://github.com/Arachni/arachni'],
 				],
 			'Privileged'     => false,
 			'Platform'       => ['php'],

data/external/metasploit/{modules → plugins/arachni/modules}/exploits/unix/webapp/arachni_php_include.rb

@@ -29,7 +29,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Version'        => '$Revision: 10694 $',
 			'References'     =>
 				[
-					['URL', 'http://github.com/Zapotek/arachni'],
+					['URL', 'http://github.com/Arachni/arachni'],
 				],
 			'Privileged'     => false,
 			'Payload'        =>

data/external/metasploit/{modules → plugins/arachni/modules}/exploits/unix/webapp/arachni_sqlmap.rb

@@ -1,6 +1,6 @@
 require 'msf/core'
 
-class Metasploit3 < Msf::Auxiliary
+class Metasploit3 < Msf::Exploit::Remote #Msf::Auxiliary
 
   include Msf::Exploit::Remote::HttpClient
 
@@ -34,7 +34,7 @@ class Metasploit3 < Msf::Auxiliary
       'Version'       => '$Revision: 9212 $',
       'References'    =>
         [
-          ['URL', 'http://github.com/Zapotek/arachni'],
+          ['URL', 'http://github.com/Arachni/arachni'],
           ['URL', 'http://sqlmap.sourceforge.net'],
         ]
       ))

data/external/scripts/LICENSE.tpl

@@ -0,0 +1,174 @@
+                             Apache License
+                       Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.