From 4c4f7ae301d8ca6dfa79bb8091db1b113686ca1c Mon Sep 17 00:00:00 2001 From: HD Moore Date: Tue, 26 Sep 2006 03:42:54 +0000 Subject: [PATCH] Updates to models/lists git-svn-id: file:///home/svn/framework3/trunk@3963 4d416f70-5f16-0410-b530-b9f4589650da --- .../app/controllers/auxiliaries_controller.rb | 1 + data/msfweb/app/controllers/jobs_controller.rb | 1 + .../app/controllers/sessions_controller.rb | 1 + data/msfweb/app/models/auxiliary.rb | 6 +++++- data/msfweb/app/models/job.rb | 4 +++- data/msfweb/app/models/session.rb | 4 +++- data/msfweb/app/views/auxiliaries/list.rhtml | 16 ++++++++++++++-- data/msfweb/app/views/jobs/list.rhtml | 15 +++++++++++++-- data/msfweb/app/views/sessions/list.rhtml | 15 +++++++++++++-- 9 files changed, 54 insertions(+), 9 deletions(-) diff --git a/data/msfweb/app/controllers/auxiliaries_controller.rb b/data/msfweb/app/controllers/auxiliaries_controller.rb index 575db7616b..9d798f2f6c 100644 --- a/data/msfweb/app/controllers/auxiliaries_controller.rb +++ b/data/msfweb/app/controllers/auxiliaries_controller.rb @@ -1,6 +1,7 @@ class AuxiliariesController < ApplicationController def list + @all_auxiliary = Auxiliary.get_available() end def view diff --git a/data/msfweb/app/controllers/jobs_controller.rb b/data/msfweb/app/controllers/jobs_controller.rb index c66f4962e9..23b8b54cdb 100644 --- a/data/msfweb/app/controllers/jobs_controller.rb +++ b/data/msfweb/app/controllers/jobs_controller.rb @@ -1,6 +1,7 @@ class JobsController < ApplicationController def list + @all_jobs = Job.get_available() end def stop diff --git a/data/msfweb/app/controllers/sessions_controller.rb b/data/msfweb/app/controllers/sessions_controller.rb index fa11f671f6..a40f66563b 100644 --- a/data/msfweb/app/controllers/sessions_controller.rb +++ b/data/msfweb/app/controllers/sessions_controller.rb @@ -1,6 +1,7 @@ class SessionsController < ApplicationController def list + @all_sessions = Session.get_available() end def stop diff --git a/data/msfweb/app/models/auxiliary.rb b/data/msfweb/app/models/auxiliary.rb index bddc6e7e81..0712a195f1 100644 --- a/data/msfweb/app/models/auxiliary.rb +++ b/data/msfweb/app/models/auxiliary.rb @@ -1,3 +1,7 @@ class Auxiliary - + def self.get_available() + mods = [] + $msframework.auxiliary.each_module { |n,m| mods << m.new } + mods + end end diff --git a/data/msfweb/app/models/job.rb b/data/msfweb/app/models/job.rb index e12b80d77f..3c0f74fc4c 100644 --- a/data/msfweb/app/models/job.rb +++ b/data/msfweb/app/models/job.rb @@ -1,3 +1,5 @@ class Job - + def self.get_available() + $msframework.jobs + end end diff --git a/data/msfweb/app/models/session.rb b/data/msfweb/app/models/session.rb index 7775ee6c41..005c35d6a0 100644 --- a/data/msfweb/app/models/session.rb +++ b/data/msfweb/app/models/session.rb @@ -1,3 +1,5 @@ class Session - + def self.get_available() + $msframework.sessions + end end diff --git a/data/msfweb/app/views/auxiliaries/list.rhtml b/data/msfweb/app/views/auxiliaries/list.rhtml index 9b2a62d832..c1fddc5455 100644 --- a/data/msfweb/app/views/auxiliaries/list.rhtml +++ b/data/msfweb/app/views/auxiliaries/list.rhtml @@ -1,2 +1,14 @@ -

Auxiliaries#list

-

Find me in app/views/auxiliaries/list.rhtml

+ + + + + + + + + + <% @all_auxiliary.each do |m| %> + + <% end %> + +
NameDescriptionModule
<%= m.name %><%= m.description %><%= m.refname %>
diff --git a/data/msfweb/app/views/jobs/list.rhtml b/data/msfweb/app/views/jobs/list.rhtml index 316ccf9573..3ed8317902 100644 --- a/data/msfweb/app/views/jobs/list.rhtml +++ b/data/msfweb/app/views/jobs/list.rhtml @@ -1,2 +1,13 @@ -

Jobs#list

-

Find me in app/views/jobs/list.rhtml

+ + + + + + + + + <% @all_jobs.each_pair do |n,m| %> + + <% end %> + +
IDDescription
<%= n %><%= m %>
diff --git a/data/msfweb/app/views/sessions/list.rhtml b/data/msfweb/app/views/sessions/list.rhtml index 326b5b6159..381e30fdd3 100644 --- a/data/msfweb/app/views/sessions/list.rhtml +++ b/data/msfweb/app/views/sessions/list.rhtml @@ -1,2 +1,13 @@ -

Sessions#list

-

Find me in app/views/sessions/list.rhtml

+ + + + + + + + + <% @all_sessions.each_pair do |n,m| %> + + <% end %> + +
IDDescription
<%= n %><%= m %>