Normalize handlers names
parent
1d602d38c9
commit
eb7ac02d1a
|
@ -145,17 +145,17 @@ module Msf
|
||||||
when CONST::SMB_COM_SESSION_SETUP_ANDX
|
when CONST::SMB_COM_SESSION_SETUP_ANDX
|
||||||
word_count = pkt['Payload']['SMB'].v['WordCount']
|
word_count = pkt['Payload']['SMB'].v['WordCount']
|
||||||
if word_count == 0x0D # Share Security Mode sessions
|
if word_count == 0x0D # Share Security Mode sessions
|
||||||
smb_cmd_session_setup(c, buff)
|
smb_cmd_session_setup_andx(c, buff)
|
||||||
else
|
else
|
||||||
print_status("SMB Share - #{smb[:ip]} Unknown SMB_COM_SESSION_SETUP_ANDX request type , ignoring... ")
|
print_status("SMB Share - #{smb[:ip]} Unknown SMB_COM_SESSION_SETUP_ANDX request type , ignoring... ")
|
||||||
smb_error(cmd, c, CONST::SMB_STATUS_SUCCESS)
|
smb_error(cmd, c, CONST::SMB_STATUS_SUCCESS)
|
||||||
end
|
end
|
||||||
when CONST::SMB_COM_TRANSACTION2
|
when CONST::SMB_COM_TRANSACTION2
|
||||||
smb_cmd_trans(c, buff)
|
smb_cmd_trans2(c, buff)
|
||||||
when CONST::SMB_COM_NT_CREATE_ANDX
|
when CONST::SMB_COM_NT_CREATE_ANDX
|
||||||
smb_cmd_create(c, buff)
|
smb_cmd_nt_create_andx(c, buff)
|
||||||
when CONST::SMB_COM_READ_ANDX
|
when CONST::SMB_COM_READ_ANDX
|
||||||
smb_cmd_read(c, buff)
|
smb_cmd_read_andx(c, buff)
|
||||||
when CONST::SMB_COM_CLOSE
|
when CONST::SMB_COM_CLOSE
|
||||||
smb_cmd_close(c, buff)
|
smb_cmd_close(c, buff)
|
||||||
else
|
else
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Msf
|
||||||
#
|
#
|
||||||
# Responds to a client NT_CREATE_ANDX request
|
# Responds to a client NT_CREATE_ANDX request
|
||||||
#
|
#
|
||||||
def smb_cmd_create(c, buff)
|
def smb_cmd_nt_create_andx(c, buff)
|
||||||
smb = @state[c]
|
smb = @state[c]
|
||||||
pkt = CONST::SMB_CREATE_PKT.make_struct
|
pkt = CONST::SMB_CREATE_PKT.make_struct
|
||||||
pkt.from_s(buff)
|
pkt.from_s(buff)
|
||||||
|
|
|
@ -11,7 +11,7 @@ module Msf
|
||||||
# by reading the offset and length requested by the client
|
# by reading the offset and length requested by the client
|
||||||
# and sending the appropriate chunk of the payload
|
# and sending the appropriate chunk of the payload
|
||||||
#
|
#
|
||||||
def smb_cmd_read(c, buff)
|
def smb_cmd_read_andx(c, buff)
|
||||||
pkt = CONST::SMB_READ_PKT.make_struct
|
pkt = CONST::SMB_READ_PKT.make_struct
|
||||||
pkt.from_s(buff)
|
pkt.from_s(buff)
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Msf
|
||||||
#
|
#
|
||||||
# Sets up an SMB session in response to a SESSION_SETUP_ANDX request
|
# Sets up an SMB session in response to a SESSION_SETUP_ANDX request
|
||||||
#
|
#
|
||||||
def smb_cmd_session_setup(c, buff)
|
def smb_cmd_session_setup_andx(c, buff)
|
||||||
tree_connect_response = CONST::SMB_TREE_CONN_ANDX_RES_PKT.make_struct
|
tree_connect_response = CONST::SMB_TREE_CONN_ANDX_RES_PKT.make_struct
|
||||||
tree_connect_response.v['WordCount'] = 7
|
tree_connect_response.v['WordCount'] = 7
|
||||||
tree_connect_response.v['AndXCommand'] = CONST::SMB_COM_NO_ANDX_COMMAND
|
tree_connect_response.v['AndXCommand'] = CONST::SMB_COM_NO_ANDX_COMMAND
|
||||||
|
|
|
@ -16,7 +16,7 @@ module Msf
|
||||||
# QUERY_FILE_INFO (Basic, Standard and Internal)
|
# QUERY_FILE_INFO (Basic, Standard and Internal)
|
||||||
# QUERY_PATH_INFO (Basic and Standard)
|
# QUERY_PATH_INFO (Basic and Standard)
|
||||||
#
|
#
|
||||||
def smb_cmd_trans(c, buff)
|
def smb_cmd_trans2(c, buff)
|
||||||
pkt = CONST::SMB_TRANS2_PKT.make_struct
|
pkt = CONST::SMB_TRANS2_PKT.make_struct
|
||||||
pkt.from_s(buff)
|
pkt.from_s(buff)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue