@@ -30,14 +30,19 @@ def initialize(info = {})
3030 stdapi_sys_config_getenv
3131 ]
3232 }
33+ } ,
34+ 'Notes' => {
35+ 'Stability' => [ CRASH_SAFE ] ,
36+ 'SideEffects' => [ ] ,
37+ 'Reliability' => [ ]
3338 }
3439 )
3540 )
3641 register_options (
3742 [
3843 OptString . new ( 'PASSPHRASE' , [ false , 'The hardcoded passphrase used for encryption' ] ) ,
3944 OptInt . new ( 'ITERATION_COUNT' , [ false , 'The iteration count used in key derivation' , 10 ] )
40- ] , super . class
45+ ]
4146 )
4247 end
4348
@@ -138,6 +143,7 @@ def parse_new_config_file(raw_xml)
138143 db = { }
139144 dbfound = false
140145 version_found = false
146+
141147 # fetch config file
142148 raw_xml . each_line do |line |
143149 if version_found == false
@@ -155,7 +161,7 @@ def parse_new_config_file(raw_xml)
155161 db [ :Namespace ] = ''
156162 end
157163 # save
158- dbs << db if ( db [ :Alias ] && db [ :Type ] && db [ :Server ] && db [ :Port ] )
164+ dbs << db if db [ :Alias ] && db [ :Type ] && db [ :Server ] && db [ :Port ]
159165 db = { }
160166 end
161167
@@ -204,21 +210,31 @@ def parse_new_config_file(raw_xml)
204210 end
205211
206212 # Fill the tab and report eligible servers
207- dbs . each do |db |
208- if ::Rex ::Socket . is_ipv4? ( db [ :Server ] . to_s )
209- print_good ( "Reporting #{ db [ :Server ] } " )
210- report_host ( host : db [ :Server ] )
213+ dbs . each do |database |
214+ if ::Rex ::Socket . is_ipv4? ( database [ :Server ] . to_s )
215+ print_good ( "Reporting #{ database [ :Server ] } " )
216+ report_host ( host : database [ :Server ] )
211217 end
212218
213- db_table << [ db [ :Alias ] , db [ :Type ] , db [ :Server ] , db [ :Port ] , db [ :Database ] , db [ :Namespace ] , db [ :UserID ] , db [ :Password ] ]
219+ db_table << [
220+ database [ :Alias ] ,
221+ database [ :Type ] ,
222+ database [ :Server ] ,
223+ database [ :Port ] ,
224+ database [ :Database ] ,
225+ database [ :Namespace ] ,
226+ database [ :UserID ] ,
227+ database [ :Password ]
228+ ]
214229 report_cred (
215- ip : db [ :Server ] ,
216- port : db [ :Port ] . to_i ,
217- service_name : db [ :Type ] ,
218- username : db [ :UserID ] ,
219- password : db [ :Password ]
230+ ip : database [ :Server ] ,
231+ port : database [ :Port ] . to_i ,
232+ service_name : database [ :Type ] ,
233+ username : database [ :UserID ] ,
234+ password : database [ :Password ]
220235 )
221236 end
237+
222238 return db_table
223239 end
224240
@@ -245,15 +261,15 @@ def parse_old_config_file(raw_xml)
245261 # fetch config file
246262 raw_xml . each_line do |line |
247263 if version_found == false
248- vesrion_found = find_version ( line )
264+ version_found = find_version ( line )
249265 end
250266
251267 if line =~ /<Database id=/
252268 dbfound = true
253269 elsif line =~ %r{</Database>}
254270 dbfound = false
255271 # save
256- dbs << db if ( db [ :Alias ] && db [ :Url ] )
272+ dbs << db if db [ :Alias ] && db [ :Url ]
257273 db = { }
258274 end
259275
@@ -287,33 +303,40 @@ def parse_old_config_file(raw_xml)
287303 end
288304
289305 # Fill the tab
290- dbs . each do |db |
291- if ( db [ :URL ] =~ %r{[\S +\s +]+/+([\S +\s +]+):[\S +]+}i )
306+ dbs . each do |database |
307+ if ( database [ :URL ] =~ %r{[\S +\s +]+/+([\S +\s +]+):[\S +]+}i )
292308 server = ::Regexp . last_match ( 1 )
293309 if ::Rex ::Socket . is_ipv4? ( server )
294310 print_good ( "Reporting #{ server } " )
295311 report_host ( host : server )
296312 end
297313 end
298- db_table << [ db [ :Alias ] , db [ :Type ] , db [ :URL ] , db [ :UserID ] , db [ :Password ] ]
314+ db_table << [
315+ database [ :Alias ] ,
316+ database [ :Type ] ,
317+ database [ :URL ] ,
318+ database [ :UserID ] ,
319+ database [ :Password ]
320+ ]
299321 report_cred (
300322 ip : server ,
301323 port : '' ,
302- service_name : db [ :Type ] ,
303- username : db [ :UserID ] ,
304- password : db [ :Password ]
324+ service_name : database [ :Type ] ,
325+ username : database [ :UserID ] ,
326+ password : database [ :Password ]
305327 )
306328 end
329+
307330 return db_table
308331 end
309332
310333 def find_version ( tag )
311- found = false
312334 if tag =~ %r{<Version>([\S +\s +]+)</Version>}i
313- found = true
314335 print_good ( "DbVisualizer version: #{ ::Regexp . last_match ( 1 ) } " )
336+ return true
315337 end
316- found
338+
339+ false
317340 end
318341
319342 def report_cred ( opts )
@@ -349,7 +372,7 @@ def decrypt_password(enc_password)
349372 des . decrypt
350373 des . key = dk
351374 des . iv = iv
352- password = des . update ( enc_password ) + des . final
375+ des . update ( enc_password ) + des . final
353376 end
354377
355378 def get_derived_key
0 commit comments