From 6bb46ec86231c754ede8bfcd077ea3aa080fe163 Mon Sep 17 00:00:00 2001 From: fab <> Date: Sat, 2 Jun 2007 20:10:24 +0000 Subject: [PATCH] minor update git-svn-id: file:///home/svn/framework3/trunk@4980 4d416f70-5f16-0410-b530-b9f4589650da --- data/msfgui/autopwn.xcf | Bin 14735 -> 0 bytes data/msfgui/msfgui.glade | 4 +-- data/msfgui/style/main.rc | 15 +++++++++ lib/msf/ui/gtk2/app.rb | 13 ++++---- lib/msf/ui/gtk2/opcode/groups.rb | 36 +++++++++++++--------- lib/msf/ui/gtk2/opcode/locales.rb | 38 +++++++++++++---------- lib/msf/ui/gtk2/opcode/metatypes.rb | 34 +++++++++++--------- lib/msf/ui/gtk2/opcode/modules.rb | 6 +++- lib/msf/ui/gtk2/opcode/platforms.rb | 40 ++++++++++++++---------- lib/msf/ui/gtk2/opcode/stats.rb | 46 ++++++++++++++++------------ lib/msf/ui/gtk2/opcode/types.rb | 42 ++++++++++++++----------- lib/msf/ui/gtk2/window/logs.rb | 3 ++ 12 files changed, 168 insertions(+), 109 deletions(-) delete mode 100644 data/msfgui/autopwn.xcf create mode 100644 data/msfgui/style/main.rc diff --git a/data/msfgui/autopwn.xcf b/data/msfgui/autopwn.xcf deleted file mode 100644 index 2f90ae84b066a4a882ac6cdbf21d2b1cf3f2348b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14735 zcmeI32~-u=8OJZ%dw_r_?pAy;#<~QnQ65m2V_j0UMNHhWMiCy5r)25nH7>O& z9+#-8vBs7}6Zh&db?L#nG{&eU)@pExTSQz~-!^Y<|KBk01`Ihlp6Ds2bIzxlpz z?%X?fc{3k(%$BrFLr!9{A=#2@Vn`bx^9Ya{LA<>1Ck*1>|82%dkeWbzAvt zSG1%hm`xGpEK3qfpyIszJ7!yFrJ4+ubgL;V+mvXvWTapI!^W24c`rPYEE`$LZT(zZ0PQ}7L>EFE|LDxa8Q zqFU!*^`YU76n^nhH zM*J}tfavh6S#E-@BN5z-@oY!aZ z)K|}r%oO#ICAj7{sRY(6dXHw>hp77T)0?t_4=(lB@fCf?M^q(WsA6UGk+hC-hJMN%i~D36{>#Bm+P@$ z=@ijnO4JlRrf_{1PknuP8WvxzJ@u`>YWGhAT2BLO{Bb-y{Mp6Zl~`2eQs%?lu`(@- zr8GVlc*yNtLUXB<`7wDfQ5n%(L4yP}tR|hh2A1O~NxnhzRiQ#b{~)R$>s~=y1g#dd zh^UhM-Viif&`d#AqAK#6CMaFdR6!|3Hu5tGnk;Cdpz%a@@*5}U8=c~(SQE+WAV0I9 zR6&`7l=?ZzFNbsr%@s7C$VJwLf|dwcAt;YXB0uF0DYQ=LHVWEI@dxu|#5>#3+$@YwnV^{@KC(xpe8gL<7P`Y+u=m>$vn_ zWg9$9`fvkQv8F7Lw^Z_QtYW@c(K>T~^ulKb=4O0MH= z)VwWLl4e*D8)5Ye#fnHPWDpBN8NpaYt2u;)C>+WHU<-hcjz=q^=TSJ0)av!P_lw!} zBbM*KUM2J9TwYGAfxaBSQGu-3KeT1L&OLe$iXAyV!JKZLJ%91Cl+A z%)lJpFN|EU>ly}@e3VQ>xt=>pkFJ^0rxD(V9U;A^ymO)gzt-|Tvc~aX?)du9s?`21 z@owev9k8;9H{$a9WE;i9Fz#I5ahvXAwA#x*+_3iDkDN4m^T-?za$elD@x3!V0Atks z(n&0T(#QFSY2dr)`bsGiscO6jFdC(+0+y;6ni%QvaGB-F`Pb)}SZ z=Z<`uSF~!mue^=IZB_r?w>Bq!#txk9Sc_N2pA>+q%63|(FUWiUGkS1vpF4}i*51y} zdC|*<$j^3g?r38(n!e|8D7i}Rp(5_WAQWx$=`bR9+m|w@^*M{Cw2VJa*U<&P@W)+% zssVT3Z;uyDcSv9INk(N|XO<4s!|D#bhAO#j{a7$_>te{<1qx^7zRa#cc<*!tzjeF< zS9DdJUDzDQwidl6%=^cqyL31xZEZo0gUeb_0(LKAp*ztvd89Bov3|)-4g&+=~Ec{qPN=V*l#wqD|0xwEXO1jqjDpPdrY=ip&{_uo%{dF`tk zH*bGkeD~h{ho$8eRW^r9lCip!KPbNSRndP6&wP5k;Lw4+JGbR;-sq3{?9KXcALg$- zE$OjV1Tb$!0;kbL`4`WduCN&TCVZE8_?w0t*Opl7Yq@&pZ z=mbCRzB-)7krSiPz1s(G{w|5HyNRBVGjQO=UB{XXzK(vbC~eMI#(QT!ZP=O~!>a}| zX5C&a^&5y0S~V1*2rf^x(v-8wc+X5|K2z$h-*U+oiphHjCgF-243j2!+o~oh^ zVTTdPxm{Zyc8Rf;NsNVeWUSo^vS~qqXFn+LqBOXc=L<@UpVGk|rQGdcAwO^~X zu!k1*D5EEK<%LHJd#FJXE$pF%J@D>P&%-fV*h33@XkiaEl=37(CeM1a^)5 z!+?xTOTh;eICz>-kIpDR0#aAhgEo_>sr|bu)QEbt-^*CfqT2fQXBq1pj}1uSjP-bv zY(M@tX03(Keq2Y3ddS*l4=!t)J?h(=bj|u`QIGl)fvVXr9f!mcNeOkB3`r(KY(h4LK0w(8AEZ`)DfD~~3L|)8Ah}@A z2QQ?r`N2yFj%h~;Z5|1Q_&|_6n>gtE7Bxkt06dq6dn7^?kw+k>R0q`-nGfAI2)=cR z+ymJU`5XDhxh aV$c>PskWGj&?Q35kg1Ri2-^SnZT&CH*$1Tn diff --git a/data/msfgui/msfgui.glade b/data/msfgui/msfgui.glade index 1c63d483fd..ed557a0bde 100644 --- a/data/msfgui/msfgui.glade +++ b/data/msfgui/msfgui.glade @@ -182,7 +182,7 @@ - + True gtk-network 1 @@ -225,7 +225,7 @@ - + True gtk-zoom-fit 1 diff --git a/data/msfgui/style/main.rc b/data/msfgui/style/main.rc new file mode 100644 index 0000000000..f6b4bccd78 --- /dev/null +++ b/data/msfgui/style/main.rc @@ -0,0 +1,15 @@ +# Define background for msfconsole + +style "textview" +{ + base[NORMAL] = { 0.0, 0.0, 0.0 } # black + fg[NORMAL] = { 1.0, 1.0, 1.0 } # white + text[NORMAL] = { 1.0, 1.0, 1.0 } # white + + fontset="-*-lucida-medium-r-*-*-14-*-*-*-*-*-*-*" +} + +# Attach style with the specific widget name +widget_class "GtkWindow.GtkVBox.GtkHBox.GtkNotebook.GtkScrolledWindow.GtkTextView" style "textview" + + diff --git a/lib/msf/ui/gtk2/app.rb b/lib/msf/ui/gtk2/app.rb index 1f4d4a57a5..d43d2fa848 100644 --- a/lib/msf/ui/gtk2/app.rb +++ b/lib/msf/ui/gtk2/app.rb @@ -83,6 +83,9 @@ module Msf include Msf::Ui::Gtk2::MyControls def initialize + # console_style = File.join(driver.resource_directory, 'style', 'main.rc') + # Gtk::RC.parse(console_style) + super('window') # Set a default icon for all widgets @@ -165,9 +168,7 @@ module Msf # Actions for OpCodes/Stats # def on_stats_activate - t_run = Thread.new do - MsfOpcode::Stats.new() - end + MsfOpcode::Stats.new() end # @@ -239,14 +240,14 @@ module Msf def on_options_activate MsfParameters::Options.new() end - + # # Action for "Window/Logs" menu # def on_logs_activate - MsfWindow::Logs.new + MsfWindow::Logs.new end - + # # The About Dialog # diff --git a/lib/msf/ui/gtk2/opcode/groups.rb b/lib/msf/ui/gtk2/opcode/groups.rb index d994eecc2d..ada378cb78 100644 --- a/lib/msf/ui/gtk2/opcode/groups.rb +++ b/lib/msf/ui/gtk2/opcode/groups.rb @@ -19,25 +19,31 @@ module Msf # call the parent super("Groups", comment) + + begin + textview = Gtk::TextView.new + textbuffer = Gtk::TextBuffer.new + stuff.pack_start(textview, true, true, 0) - textview = Gtk::TextView.new - textbuffer = Gtk::TextBuffer.new - stuff.pack_start(textview, true, true, 0) + gs = "\n" + $client.groups.each do |g| + gs << " - " + g.name + "\n" + end - gs = "\n" - $client.groups.each do |g| - gs << " - " + g.name + "\n" + textbuffer.set_text(gs) + + textview.set_buffer(textbuffer) + textview.set_editable(false) + textview.set_cursor_visible(false) + + show_all and run + destroy + rescue ::Exception => e + MsfDialog::Error.new(self, e) end - - textbuffer.set_text( gs ) - - textview.set_buffer(textbuffer) - textview.set_editable(false) - textview.set_cursor_visible(false) - - show_all and run - destroy + end + end end diff --git a/lib/msf/ui/gtk2/opcode/locales.rb b/lib/msf/ui/gtk2/opcode/locales.rb index 70991128d9..68da8a1489 100644 --- a/lib/msf/ui/gtk2/opcode/locales.rb +++ b/lib/msf/ui/gtk2/opcode/locales.rb @@ -21,27 +21,33 @@ module Msf super("Locales", comment) self.set_default_size(500, 230) + + begin + textview = Gtk::TextView.new + textbuffer = Gtk::TextBuffer.new + stuff.pack_start(textview, true, true, 0) - textview = Gtk::TextView.new - textbuffer = Gtk::TextBuffer.new - stuff.pack_start(textview, true, true, 0) + locales = "\n" + $client.locales.each do |locale| + locales << " -" + locale.name + "\n" + end - locales = "\n" - $client.locales.each do |locale| - locales << " -" + locale.name + "\n" + textbuffer.set_text( locales ) + + textview.set_buffer(textbuffer) + textview.set_editable(false) + textview.set_cursor_visible(false) + + show_all and run + destroy + rescue ::Exception => e + MsfDialog::Error.new(self, e) end - - textbuffer.set_text( locales ) - - textview.set_buffer(textbuffer) - textview.set_editable(false) - textview.set_cursor_visible(false) - - show_all and run - destroy + end + end - + end end diff --git a/lib/msf/ui/gtk2/opcode/metatypes.rb b/lib/msf/ui/gtk2/opcode/metatypes.rb index afcdc6b4f2..f65daeb76e 100644 --- a/lib/msf/ui/gtk2/opcode/metatypes.rb +++ b/lib/msf/ui/gtk2/opcode/metatypes.rb @@ -19,25 +19,31 @@ module Msf # call the parent super("Metatypes", comment) + + begin + textview = Gtk::TextView.new + textbuffer = Gtk::TextBuffer.new + stuff.pack_start(textview, true, true, 0) - textview = Gtk::TextView.new - textbuffer = Gtk::TextBuffer.new - stuff.pack_start(textview, true, true, 0) + mts = "\n" + $client.meta_types.each do |mt| + mts << " - " + mt.name + "\n" + end - mts = "\n" - $client.meta_types.each do |mt| - mts << " - " + mt.name + "\n" + textbuffer.set_text( mts ) + + textview.set_buffer(textbuffer) + textview.set_editable(false) + textview.set_cursor_visible(false) + + show_all and run + destroy + rescue ::Exception => e + MsfDialog::Error.new(self, e) end - textbuffer.set_text( mts ) - - textview.set_buffer(textbuffer) - textview.set_editable(false) - textview.set_cursor_visible(false) - - show_all and run - destroy end + end end diff --git a/lib/msf/ui/gtk2/opcode/modules.rb b/lib/msf/ui/gtk2/opcode/modules.rb index 6ddf4d16ea..905fef1bb9 100644 --- a/lib/msf/ui/gtk2/opcode/modules.rb +++ b/lib/msf/ui/gtk2/opcode/modules.rb @@ -66,7 +66,11 @@ module Msf signal_connect('response') do |dialog, response_id| if response_id == Gtk::Dialog::RESPONSE_OK - collect() + begin + collect() + rescue ::Exception => e + MsfDialog::Error.new(self, e) + end end end diff --git a/lib/msf/ui/gtk2/opcode/platforms.rb b/lib/msf/ui/gtk2/opcode/platforms.rb index dcdeaf4958..f33ddfac81 100644 --- a/lib/msf/ui/gtk2/opcode/platforms.rb +++ b/lib/msf/ui/gtk2/opcode/platforms.rb @@ -20,28 +20,34 @@ module Msf # call the parent super("Platforms", comment) - textview = Gtk::TextView.new - textbuffer = Gtk::TextBuffer.new + begin + textview = Gtk::TextView.new + textbuffer = Gtk::TextBuffer.new - scrolled_window = Gtk::ScrolledWindow.new - scrolled_window.add(textview) - stuff.pack_start(scrolled_window, true, true, 5) - scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC) + scrolled_window = Gtk::ScrolledWindow.new + scrolled_window.add(textview) + stuff.pack_start(scrolled_window, true, true, 5) + scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC) - ps = "\n" - $client.platforms.each do |p| - ps << " - " + p.desc + "\n" + ps = "\n" + $client.platforms.each do |p| + ps << " - " + p.desc + "\n" + end + + textbuffer.set_text( ps ) + + textview.set_buffer(textbuffer) + textview.set_editable(false) + textview.set_cursor_visible(false) + + show_all and run + destroy + rescue ::Exception => e + MsfDialog::Error.new(self, e) end - textbuffer.set_text( ps ) - - textview.set_buffer(textbuffer) - textview.set_editable(false) - textview.set_cursor_visible(false) - - show_all and run - destroy end + end end diff --git a/lib/msf/ui/gtk2/opcode/stats.rb b/lib/msf/ui/gtk2/opcode/stats.rb index c295617157..583b324530 100644 --- a/lib/msf/ui/gtk2/opcode/stats.rb +++ b/lib/msf/ui/gtk2/opcode/stats.rb @@ -22,31 +22,37 @@ module Msf self.set_default_size(500, 230) - stats = $client.statistics + begin + stats = $client.statistics - textview = Gtk::TextView.new - textbuffer = Gtk::TextBuffer.new - stuff.pack_start(textview, true, true, 0) + textview = Gtk::TextView.new + textbuffer = Gtk::TextBuffer.new + stuff.pack_start(textview, true, true, 0) - textbuffer.set_text( - "\n" + - "Last Updated : #{stats.last_update.to_s}\n" + - "Number of Opcodes : #{stats.opcodes}\n" + - "Number of Opcode Types : #{stats.opcode_types}\n" + - "Number of Platforms : #{stats.platforms}\n" + - "Number of Architectures : #{stats.architectures}\n" + - "Number of Modules : #{stats.modules}\n" + - "Number of Module Segments: #{stats.module_segments}\n" + - "Number of Module Imports : #{stats.module_imports}\n" + - "Number of Module Exports : #{stats.module_exports}\n\n") + textbuffer.set_text( + "\n" + + "Last Updated : #{stats.last_update.to_s}\n" + + "Number of Opcodes : #{stats.opcodes}\n" + + "Number of Opcode Types : #{stats.opcode_types}\n" + + "Number of Platforms : #{stats.platforms}\n" + + "Number of Architectures : #{stats.architectures}\n" + + "Number of Modules : #{stats.modules}\n" + + "Number of Module Segments: #{stats.module_segments}\n" + + "Number of Module Imports : #{stats.module_imports}\n" + + "Number of Module Exports : #{stats.module_exports}\n\n") - textview.set_buffer(textbuffer) - textview.set_editable(false) - textview.set_cursor_visible(false) + textview.set_buffer(textbuffer) + textview.set_editable(false) + textview.set_cursor_visible(false) - show_all and run - destroy + show_all and run + destroy + rescue ::Exception => e + MsfDialog::Error.new(self, e) + end + end + end end diff --git a/lib/msf/ui/gtk2/opcode/types.rb b/lib/msf/ui/gtk2/opcode/types.rb index a494817618..b62a094d40 100644 --- a/lib/msf/ui/gtk2/opcode/types.rb +++ b/lib/msf/ui/gtk2/opcode/types.rb @@ -20,28 +20,34 @@ module Msf # call the parent super("Types", comment) - textview = Gtk::TextView.new - textbuffer = Gtk::TextBuffer.new + begin + textview = Gtk::TextView.new + textbuffer = Gtk::TextBuffer.new - scrolled_window = Gtk::ScrolledWindow.new - scrolled_window.add(textview) - stuff.pack_start(scrolled_window, true, true, 5) - scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC) + scrolled_window = Gtk::ScrolledWindow.new + scrolled_window.add(textview) + stuff.pack_start(scrolled_window, true, true, 5) + scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC) - tps = "\n" - $client.types.each do |g| - tps << " - " + g.name + "\n" + tps = "\n" + $client.types.each do |g| + tps << " - " + g.name + "\n" + end + + textbuffer.set_text( tps ) + + textview.set_buffer(textbuffer) + textview.set_editable(false) + textview.set_cursor_visible(false) + + show_all and run + destroy + rescue ::Exception => e + MsfDialog::Error.new(self, e) end - - textbuffer.set_text( tps ) - - textview.set_buffer(textbuffer) - textview.set_editable(false) - textview.set_cursor_visible(false) - - show_all and run - destroy + end + end end diff --git a/lib/msf/ui/gtk2/window/logs.rb b/lib/msf/ui/gtk2/window/logs.rb index 241db2aedc..8e5228628c 100644 --- a/lib/msf/ui/gtk2/window/logs.rb +++ b/lib/msf/ui/gtk2/window/logs.rb @@ -12,6 +12,9 @@ module Msf include Msf::Ui::Gtk2::MyControls def initialize + console_style = File.join(driver.resource_directory, 'style', 'console.rc') + Gtk::RC.parse(console_style) + # call the parent super("MsfLogs")