Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 45 files changed
  • 0 commit comments
  • 1 contributor
Showing with 81 additions and 81 deletions.
  1. +1 −1  CHANGELOG
  2. +1 −1  Gemfile
  3. +43 −44 Gemfile.lock
  4. +36 −35 README.md
  5. BIN  vendor/cache/actionmailer-3.2.0.gem
  6. BIN  vendor/cache/actionmailer-3.2.2.gem
  7. BIN  vendor/cache/actionpack-3.2.0.gem
  8. BIN  vendor/cache/actionpack-3.2.2.gem
  9. BIN  vendor/cache/activemodel-3.2.0.gem
  10. BIN  vendor/cache/activemodel-3.2.2.gem
  11. BIN  vendor/cache/activerecord-3.2.0.gem
  12. BIN  vendor/cache/activerecord-3.2.2.gem
  13. BIN  vendor/cache/activeresource-3.2.0.gem
  14. BIN  vendor/cache/activeresource-3.2.2.gem
  15. BIN  vendor/cache/activesupport-3.2.0.gem
  16. BIN  vendor/cache/activesupport-3.2.2.gem
  17. BIN  vendor/cache/arel-3.0.0.gem
  18. BIN  vendor/cache/arel-3.0.2.gem
  19. BIN  vendor/cache/childprocess-0.2.2.gem
  20. BIN  vendor/cache/childprocess-0.3.1.gem
  21. BIN  vendor/cache/factory_girl-2.2.0.gem
  22. BIN  vendor/cache/factory_girl-3.0.0.gem
  23. BIN  vendor/cache/journey-1.0.0.gem
  24. BIN  vendor/cache/journey-1.0.3.gem
  25. BIN  vendor/cache/json-1.6.5.gem
  26. BIN  vendor/cache/json-1.6.6.gem
  27. BIN  vendor/cache/json_pure-1.6.1.gem
  28. BIN  vendor/cache/libv8-3.3.10.4-x86-darwin-10.gem
  29. BIN  vendor/cache/mail-2.4.1.gem
  30. BIN  vendor/cache/mail-2.4.4.gem
  31. BIN  vendor/cache/mime-types-1.17.2.gem
  32. BIN  vendor/cache/mime-types-1.18.gem
  33. BIN  vendor/cache/multi_json-1.0.4.gem
  34. BIN  vendor/cache/multi_json-1.2.0.gem
  35. BIN  vendor/cache/nokogiri-1.5.0.gem
  36. BIN  vendor/cache/nokogiri-1.5.2.gem
  37. BIN  vendor/cache/rack-cache-1.1.gem
  38. BIN  vendor/cache/rack-cache-1.2.gem
  39. BIN  vendor/cache/{rails-3.2.0.gem → rails-3.2.2.gem}
  40. BIN  vendor/cache/railties-3.2.0.gem
  41. BIN  vendor/cache/railties-3.2.2.gem
  42. BIN  vendor/cache/selenium-webdriver-2.13.0.gem
  43. BIN  vendor/cache/selenium-webdriver-2.20.0.gem
  44. BIN  vendor/cache/tzinfo-0.3.31.gem
  45. BIN  vendor/cache/tzinfo-0.3.32.gem
View
2  CHANGELOG
@@ -1,6 +1,6 @@
v2.10
- Feature requests implemented: #2312560
- - Bugs fixed: #55, #67
+ - Bugs fixed: #55, #67, #72
v2.9 (1st of February 2012)
- New Retina Network Security Scanner plugin
View
2  Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.0'
+gem 'rails', '3.2.2'
# Gems used only for assets and not required
# in production environments by default.
View
87 Gemfile.lock
@@ -2,34 +2,34 @@ GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.9)
- actionmailer (3.2.0)
- actionpack (= 3.2.0)
+ actionmailer (3.2.2)
+ actionpack (= 3.2.2)
mail (~> 2.4.0)
- actionpack (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
+ actionpack (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.0)
+ journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.0)
- activesupport (= 3.2.0)
+ activemodel (3.2.2)
+ activesupport (= 3.2.2)
builder (~> 3.0.0)
- activerecord (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
- arel (~> 3.0.0)
+ activerecord (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.0)
- activemodel (= 3.2.0)
- activesupport (= 3.2.0)
- activesupport (3.2.0)
+ activeresource (3.2.2)
+ activemodel (= 3.2.2)
+ activesupport (= 3.2.2)
+ activesupport (3.2.2)
i18n (~> 0.6)
multi_json (~> 1.0)
- arel (3.0.0)
+ arel (3.0.2)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -38,7 +38,7 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.2)
+ childprocess (0.3.1)
ffi (~> 1.0.6)
coffee-rails (3.2.1)
coffee-script (>= 2.2.0)
@@ -52,8 +52,8 @@ GEM
erubis (2.7.0)
execjs (1.2.13)
multi_json (~> 1.0)
- factory_girl (2.2.0)
- activesupport
+ factory_girl (3.0.0)
+ activesupport (>= 3.0.0)
ffi (1.0.11)
guard (0.8.8)
thor (~> 0.14.6)
@@ -61,39 +61,38 @@ GEM
guard (>= 0.8.4)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.0)
+ journey (1.0.3)
jquery-rails (1.0.18)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.5)
- json_pure (1.6.1)
+ json (1.6.6)
libv8 (3.3.10.4)
- mail (2.4.1)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- multi_json (1.0.4)
- nokogiri (1.5.0)
+ mime-types (1.18)
+ multi_json (1.2.0)
+ nokogiri (1.5.2)
polyglot (0.3.3)
rack (1.4.1)
- rack-cache (1.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.0)
- actionmailer (= 3.2.0)
- actionpack (= 3.2.0)
- activerecord (= 3.2.0)
- activeresource (= 3.2.0)
- activesupport (= 3.2.0)
+ rails (3.2.2)
+ actionmailer (= 3.2.2)
+ actionpack (= 3.2.2)
+ activerecord (= 3.2.2)
+ activeresource (= 3.2.2)
+ activesupport (= 3.2.2)
bundler (~> 1.0)
- railties (= 3.2.0)
- railties (3.2.0)
- actionpack (= 3.2.0)
- activesupport (= 3.2.0)
+ railties (= 3.2.2)
+ railties (3.2.2)
+ actionpack (= 3.2.2)
+ activesupport (= 3.2.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -125,10 +124,10 @@ GEM
railties (~> 3.2.0.beta)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.13.0)
- childprocess (>= 0.2.1)
- ffi (~> 1.0.9)
- json_pure
+ selenium-webdriver (2.20.0)
+ childprocess (>= 0.2.5)
+ ffi (~> 1.0)
+ multi_json (~> 1.0)
rubyzip
sprockets (2.1.2)
hike (~> 1.2)
@@ -142,7 +141,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
+ tzinfo (0.3.32)
uglifier (1.2.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -162,7 +161,7 @@ DEPENDENCIES
guard-rspec
jquery-rails
nokogiri
- rails (= 3.2.0)
+ rails (= 3.2.2)
rspec-rails
ruby-nmap
rubyzip (~> 0.9.6.1)
View
71 README.md
@@ -35,57 +35,33 @@ Some of the features:
* [Zed Attack Proxy](https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project)
-Getting started (stable release)
---------------------------------
+Getting started (git release, recommended)
+------------------------------------------
-In http://dradisframework.org/downloads.html you will find a Windows installer
-and .tar.gz and .tar.bz2 packages.
+On Debian-based operating systems (Ubuntu, BackTrack, etc.) use this script:
-Uncompress, verify and prepare the environment:
+ $ bash < <(curl -s https://raw.github.com/dradis/meta/master/install.sh)
- $ tar xvvjf dradis-vX.Y.Z.tar.bz2
- $ cd dradis-vX.Y/
- $ ./verify.sh
- # follow instructions / install dependencies
- $ ./reset.sh
+The script:
+ 1. Checks for system-level dependencies (git, openssl, etc.)
+ 2. Installs [RVM](http://beginrescueend.com/rvm/install/) and Ruby 1.9.3. It detects and reuses your existing RVM too.
+ 3. Downloads and prepares the git repo with Dradis code
-Once the environment is ready, you can start the server with:
+[View install.sh source](https://github.com/dradis/meta/blob/master/install.sh)
- $ ./start.sh
-
-And browse to https://localhost:3004 to start using Dradis. If you need to bind
-to a different address (so others can connect to your instance) or another port
-number, you can use the -b and -p switches respectively:
-
- $ ./start.sh -b 10.0.0.123 -p 443
-
-
-Getting started (git release)
------------------------------
-
-First, clone the repo:
+If you want to manually clone the repo:
$ mkdir dradis-git
$ cd dradis-git/
$ git clone https://github.com/dradis/dradisframework.git server
-Then download the verify, reset and start scripts to your dradis-git/ folder:
+Then download the reset and start scripts to your dradis-git/ folder:
- $ curl -O https://raw.github.com/dradis/meta/master/verify.sh
$ curl -O https://raw.github.com/dradis/meta/master/reset.sh
$ curl -O https://raw.github.com/dradis/meta/master/start.sh
$ chmod +x *.sh
- $ ./verify.sh
- # follow instructions / install dependencies
$ ./reset.sh
-Dradis runs on top of Ruby on Rails so you need an extra step to make sure all
-the JavaScript files and stylesheets are served swiftly:
-
- $ cd server/
- $ RAILS_ENV=production bundle exec rake assets:precompile
- $ cd ..
-
Once the environment is ready, you can start the server with:
$ ./start.sh
@@ -99,6 +75,31 @@ If you would like to make Dradis accessible to other people on the network:
The `-b` option defines Dradis' bind address and the `-p` option can be used to change the port.
+Getting started (stable release)
+--------------------------------
+
+In http://dradisframework.org/downloads.html you will find a Windows installer
+and .tar.gz and .tar.bz2 packages.
+
+Uncompress, verify and prepare the environment:
+
+ $ tar xvvjf dradis-vX.Y.Z.tar.bz2
+ $ cd dradis-vX.Y/
+ $ ./verify.sh
+ # follow instructions / install dependencies
+ $ ./reset.sh
+
+Once the environment is ready, you can start the server with:
+
+ $ ./start.sh
+
+And browse to https://localhost:3004 to start using Dradis. If you need to bind
+to a different address (so others can connect to your instance) or another port
+number, you can use the -b and -p switches respectively:
+
+ $ ./start.sh -b 10.0.0.123 -p 443
+
+
Getting help
------------
View
BIN  vendor/cache/actionmailer-3.2.0.gem
Binary file not shown
View
BIN  vendor/cache/actionmailer-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/actionpack-3.2.0.gem
Binary file not shown
View
BIN  vendor/cache/actionpack-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/activemodel-3.2.0.gem
Binary file not shown
View
BIN  vendor/cache/activemodel-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/activerecord-3.2.0.gem
Binary file not shown
View
BIN  vendor/cache/activerecord-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/activeresource-3.2.0.gem
Binary file not shown
View
BIN  vendor/cache/activeresource-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/activesupport-3.2.0.gem
Binary file not shown
View
BIN  vendor/cache/activesupport-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/arel-3.0.0.gem
Binary file not shown
View
BIN  vendor/cache/arel-3.0.2.gem
Binary file not shown
View
BIN  vendor/cache/childprocess-0.2.2.gem
Binary file not shown
View
BIN  vendor/cache/childprocess-0.3.1.gem
Binary file not shown
View
BIN  vendor/cache/factory_girl-2.2.0.gem
Binary file not shown
View
BIN  vendor/cache/factory_girl-3.0.0.gem
Binary file not shown
View
BIN  vendor/cache/journey-1.0.0.gem
Binary file not shown
View
BIN  vendor/cache/journey-1.0.3.gem
Binary file not shown
View
BIN  vendor/cache/json-1.6.5.gem
Binary file not shown
View
BIN  vendor/cache/json-1.6.6.gem
Binary file not shown
View
BIN  vendor/cache/json_pure-1.6.1.gem
Binary file not shown
View
BIN  vendor/cache/libv8-3.3.10.4-x86-darwin-10.gem
Binary file not shown
View
BIN  vendor/cache/mail-2.4.1.gem
Binary file not shown
View
BIN  vendor/cache/mail-2.4.4.gem
Binary file not shown
View
BIN  vendor/cache/mime-types-1.17.2.gem
Binary file not shown
View
BIN  vendor/cache/mime-types-1.18.gem
Binary file not shown
View
BIN  vendor/cache/multi_json-1.0.4.gem
Binary file not shown
View
BIN  vendor/cache/multi_json-1.2.0.gem
Binary file not shown
View
BIN  vendor/cache/nokogiri-1.5.0.gem
Binary file not shown
View
BIN  vendor/cache/nokogiri-1.5.2.gem
Binary file not shown
View
BIN  vendor/cache/rack-cache-1.1.gem
Binary file not shown
View
BIN  vendor/cache/rack-cache-1.2.gem
Binary file not shown
View
BIN  vendor/cache/rails-3.2.0.gem → vendor/cache/rails-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/railties-3.2.0.gem
Binary file not shown
View
BIN  vendor/cache/railties-3.2.2.gem
Binary file not shown
View
BIN  vendor/cache/selenium-webdriver-2.13.0.gem
Binary file not shown
View
BIN  vendor/cache/selenium-webdriver-2.20.0.gem
Binary file not shown
View
BIN  vendor/cache/tzinfo-0.3.31.gem
Binary file not shown
View
BIN  vendor/cache/tzinfo-0.3.32.gem
Binary file not shown

No commit comments for this range

Something went wrong with that request. Please try again.