@@ -108,9 +108,9 @@ def grab_email
108
108
print_good ( "#{ peer } -- Email Settings:" )
109
109
return unless data . first =~ /([\x00 ]{8,}(?=.{1,255}$)[0-9A-Z](?:(?:[0-9A-Z]|-){0,61}[0-9A-Z])?(?:\. [0-9A-Z](?:(?:[0-9A-Z]|-){0,61}[0-9A-Z])?)*\. ?+:\d +)/i
110
110
if mailhost = Regexp . last_match [ 1 ] . split ( ':' )
111
- print_status ( " Server: #{ mailhost [ 0 ] } " ) unless mailhost [ 0 ] . blank?
112
- print_status ( " Server Port: #{ mailhost [ 1 ] } " ) unless mailhost [ 1 ] . blank?
113
- print_status ( " Destination Email: #{ data [ 1 ] } " ) unless data [ 1 ] . blank?
111
+ print_status ( "#{ peer } -- Server: #{ mailhost [ 0 ] } " ) unless mailhost [ 0 ] . blank?
112
+ print_status ( "#{ peer } -- Server Port: #{ mailhost [ 1 ] } " ) unless mailhost [ 1 ] . blank?
113
+ print_status ( "#{ peer } -- Destination Email: #{ data [ 1 ] } " ) unless data [ 1 ] . blank?
114
114
mailserver = "#{ mailhost [ 0 ] } "
115
115
mailport = "#{ mailhost [ 1 ] } "
116
116
muser = "#{ data [ 5 ] } "
@@ -131,7 +131,7 @@ def grab_ddns
131
131
ddns_table = Rex ::Ui ::Text ::Table . new (
132
132
'Header' => 'Dahua DDNS Settings' ,
133
133
'Indent' => 1 ,
134
- 'Columns' => [ 'DDNS Service' , 'DDNS Server' , 'DDNS Port' , 'Domain' , 'Username' , 'Password' ]
134
+ 'Columns' => [ 'Peer' , ' DDNS Service', 'DDNS Server' , 'DDNS Port' , 'Domain' , 'Username' , 'Password' ]
135
135
)
136
136
data . each_with_index do |val , index |
137
137
next if index == 0
@@ -142,7 +142,7 @@ def grab_ddns
142
142
ddns_domain = val [ 3 ]
143
143
ddns_user = val [ 4 ]
144
144
ddns_pass = val [ 5 ]
145
- ddns_table << [ ddns_service , ddns_server , ddns_port , ddns_domain , ddns_user , ddns_pass ]
145
+ ddns_table << [ peer , ddns_service , ddns_server , ddns_port , ddns_domain , ddns_user , ddns_pass ]
146
146
unless ddns_server . blank? && ddns_port . blank? && ddns_user . blank? && ddns_pass . blank?
147
147
if datastore [ 'VERBOSE' ]
148
148
ddns_table . print
@@ -167,10 +167,10 @@ def grab_nas
167
167
ftpuser . strip!
168
168
ftppass . strip!
169
169
unless ftpuser . blank? || ftppass . blank?
170
- print_good ( " NAS Server: #{ server } " )
171
- print_good ( " NAS Port: #{ port } " )
172
- print_good ( " FTP User: #{ ftpuser } " )
173
- print_good ( " FTP Pass: #{ ftppass } " )
170
+ print_good ( "#{ peer } -- NAS Server: #{ server } " )
171
+ print_good ( "#{ peer } -- NAS Port: #{ port } " )
172
+ print_good ( "#{ peer } -- FTP User: #{ ftpuser } " )
173
+ print_good ( "#{ peer } -- FTP Pass: #{ ftppass } " )
174
174
report_creds (
175
175
host : server ,
176
176
port : port ,
0 commit comments