Skip to content

Commit eb7ac02

Browse files
committed
Normalize handlers names
1 parent 1d602d3 commit eb7ac02

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Diff for: lib/msf/core/exploit/smb/server/share.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,17 @@ def smb_cmd_dispatch(cmd, c, buff)
145145
when CONST::SMB_COM_SESSION_SETUP_ANDX
146146
word_count = pkt['Payload']['SMB'].v['WordCount']
147147
if word_count == 0x0D # Share Security Mode sessions
148-
smb_cmd_session_setup(c, buff)
148+
smb_cmd_session_setup_andx(c, buff)
149149
else
150150
print_status("SMB Share - #{smb[:ip]} Unknown SMB_COM_SESSION_SETUP_ANDX request type , ignoring... ")
151151
smb_error(cmd, c, CONST::SMB_STATUS_SUCCESS)
152152
end
153153
when CONST::SMB_COM_TRANSACTION2
154-
smb_cmd_trans(c, buff)
154+
smb_cmd_trans2(c, buff)
155155
when CONST::SMB_COM_NT_CREATE_ANDX
156-
smb_cmd_create(c, buff)
156+
smb_cmd_nt_create_andx(c, buff)
157157
when CONST::SMB_COM_READ_ANDX
158-
smb_cmd_read(c, buff)
158+
smb_cmd_read_andx(c, buff)
159159
when CONST::SMB_COM_CLOSE
160160
smb_cmd_close(c, buff)
161161
else

Diff for: lib/msf/core/exploit/smb/server/share/command/nt_create_andx.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module NtCreateAndx
88
#
99
# Responds to a client NT_CREATE_ANDX request
1010
#
11-
def smb_cmd_create(c, buff)
11+
def smb_cmd_nt_create_andx(c, buff)
1212
smb = @state[c]
1313
pkt = CONST::SMB_CREATE_PKT.make_struct
1414
pkt.from_s(buff)

Diff for: lib/msf/core/exploit/smb/server/share/command/read_andx.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module ReadAndx
1111
# by reading the offset and length requested by the client
1212
# and sending the appropriate chunk of the payload
1313
#
14-
def smb_cmd_read(c, buff)
14+
def smb_cmd_read_andx(c, buff)
1515
pkt = CONST::SMB_READ_PKT.make_struct
1616
pkt.from_s(buff)
1717

Diff for: lib/msf/core/exploit/smb/server/share/command/session_setup_andx.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module SessionSetupAndx
88
#
99
# Sets up an SMB session in response to a SESSION_SETUP_ANDX request
1010
#
11-
def smb_cmd_session_setup(c, buff)
11+
def smb_cmd_session_setup_andx(c, buff)
1212
tree_connect_response = CONST::SMB_TREE_CONN_ANDX_RES_PKT.make_struct
1313
tree_connect_response.v['WordCount'] = 7
1414
tree_connect_response.v['AndXCommand'] = CONST::SMB_COM_NO_ANDX_COMMAND

Diff for: lib/msf/core/exploit/smb/server/share/command/trans2.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module Trans2
1616
# QUERY_FILE_INFO (Basic, Standard and Internal)
1717
# QUERY_PATH_INFO (Basic and Standard)
1818
#
19-
def smb_cmd_trans(c, buff)
19+
def smb_cmd_trans2(c, buff)
2020
pkt = CONST::SMB_TRANS2_PKT.make_struct
2121
pkt.from_s(buff)
2222

0 commit comments

Comments
 (0)