@@ -30,7 +30,6 @@ def initialize
30
30
'Brandon Knight' ,
31
31
'Pete (Bokojan) Arzamendi, #Outlook 2013 updates'
32
32
] ,
33
-
34
33
'License' => MSF_LICENSE ,
35
34
'Actions' =>
36
35
[
@@ -61,7 +60,7 @@ def initialize
61
60
'InboxCheck' => /Inbox|location(\x20 *)=(\x20 *)"\\ \/ (\w +)\\ \/ logoff\. owa|A mailbox couldn\' t be found|\< a .+onclick="return JumpTo\( 'logoff\. aspx.+\" >/
62
61
}
63
62
] ,
64
- [
63
+ [
65
64
'OWA_2013' ,
66
65
{
67
66
'Description' => 'OWA version 2013' ,
@@ -72,9 +71,9 @@ def initialize
72
71
]
73
72
] ,
74
73
'DefaultAction' => 'OWA_2010' ,
75
- 'DefaultOptions' => {
76
- 'SSL' => true
77
- }
74
+ 'DefaultOptions' => {
75
+ 'SSL' => true
76
+ }
78
77
)
79
78
80
79
@@ -162,8 +161,6 @@ def try_user_pass(opts)
162
161
vhost = opts [ "vhost" ]
163
162
domain = opts [ "domain" ]
164
163
165
-
166
-
167
164
user = domain + '\\' + user if domain
168
165
169
166
headers = {
@@ -208,8 +205,8 @@ def try_user_pass(opts)
208
205
return :abort
209
206
end
210
207
if action . name == "OWA_2013"
211
- #Check for a response code to make sure login was valid. Changes from 2010 to 2013.
212
- #Check if the password needs to be changed.
208
+ #Check for a response code to make sure login was valid. Changes from 2010 to 2013.
209
+ #Check if the password needs to be changed.
213
210
if res . headers [ 'location' ] =~ /expiredpassword/
214
211
print_good ( "#{ msg } SUCCESSFUL LOGIN. '#{ user } ' : '#{ pass } ': NOTE password change required" )
215
212
report_hash = {
@@ -225,13 +222,13 @@ def try_user_pass(opts)
225
222
return :next_user
226
223
end
227
224
228
- #No password change required moving on.
225
+ #No password change required moving on.
229
226
reason = res . headers [ 'location' ] . split ( 'reason=' ) [ 1 ]
230
- if reason == nil
227
+ if reason == nil
231
228
headers [ 'Cookie' ] = 'PBack=0;' << res . get_cookies
232
- else
229
+ else
233
230
#Login didn't work. no point on going on.
234
- vprint_error ( "#{ msg } FAILED LOGIN. '#{ user } ' : '#{ pass } '" )
231
+ vprint_error ( "#{ msg } FAILED LOGIN. '#{ user } ' : '#{ pass } '" )
235
232
return :Skip_pass
236
233
end
237
234
else
0 commit comments