aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ftp: indent FTPParseResponse again

Browse Source
pull/4839/head
Philippe Antoine 5 years ago committed by Victor Julien
parent a6294d6ec2
commit 699d6682da
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File

106
src/app-layer-ftp.c
Unescape Escape View File

@ -742,77 +742,77 @@ static AppLayerResult FTPParseResponse(Flow *f, void *ftp_state, AppLayerParserS
state->direction = 1; state->direction = 1;
while (FTPGetLine(state) >= 0) { while (FTPGetLine(state) >= 0) {
FTPTransaction *tx = FTPGetOldestTx(state); FTPTransaction *tx = FTPGetOldestTx(state);
if (tx == NULL) { if (tx == NULL) {
tx = FTPTransactionCreate(state); tx = FTPTransactionCreate(state);
} }
if (unlikely(tx == NULL)) { if (unlikely(tx == NULL)) {
SCReturnStruct(APP_LAYER_ERROR); SCReturnStruct(APP_LAYER_ERROR);
} }
if (state->command == FTP_COMMAND_UNKNOWN || tx->command_descriptor == NULL) { if (state->command == FTP_COMMAND_UNKNOWN || tx->command_descriptor == NULL) {
/* unknown */ /* unknown */
tx->command_descriptor = &FtpCommands[FTP_COMMAND_MAX -1]; tx->command_descriptor = &FtpCommands[FTP_COMMAND_MAX -1];
}
state->curr_tx = tx;
if (state->command == FTP_COMMAND_AUTH_TLS) {
if (state->current_line_len >= 4 && SCMemcmp("234 ", state->current_line, 4) == 0) {
AppLayerRequestProtocolTLSUpgrade(f);
} }
}
if (state->command == FTP_COMMAND_EPRT) { state->curr_tx = tx;
uint16_t dyn_port = rs_ftp_active_eprt(state->port_line, state->port_line_len); if (state->command == FTP_COMMAND_AUTH_TLS) {
if (dyn_port == 0) { if (state->current_line_len >= 4 && SCMemcmp("234 ", state->current_line, 4) == 0) {
goto tx_complete; AppLayerRequestProtocolTLSUpgrade(f);
}
} }
state->dyn_port = dyn_port;
state->active = true;
tx->dyn_port = dyn_port;
tx->active = true;
SCLogDebug("FTP active mode (v6): dynamic port %"PRIu16"", dyn_port);
}
if (state->command == FTP_COMMAND_PORT) { if (state->command == FTP_COMMAND_EPRT) {
if ((flags & STREAM_TOCLIENT)) { uint16_t dyn_port = rs_ftp_active_eprt(state->port_line, state->port_line_len);
uint16_t dyn_port = rs_ftp_active_port(state->port_line, state->port_line_len);
if (dyn_port == 0) { if (dyn_port == 0) {
goto tx_complete; goto tx_complete;
} }
state->dyn_port = dyn_port; state->dyn_port = dyn_port;
state->active = true; state->active = true;
tx->dyn_port = state->dyn_port; tx->dyn_port = dyn_port;
tx->active = true; tx->active = true;
SCLogDebug("FTP active mode (v4): dynamic port %"PRIu16"", dyn_port); SCLogDebug("FTP active mode (v6): dynamic port %"PRIu16"", dyn_port);
} }
}
if (state->command == FTP_COMMAND_PASV) { if (state->command == FTP_COMMAND_PORT) {
if (state->current_line_len >= 4 && SCMemcmp("227 ", state->current_line, 4) == 0) { if ((flags & STREAM_TOCLIENT)) {
FTPParsePassiveResponse(f, ftp_state, state->current_line, state->current_line_len); uint16_t dyn_port = rs_ftp_active_port(state->port_line, state->port_line_len);
if (dyn_port == 0) {
goto tx_complete;
}
state->dyn_port = dyn_port;
state->active = true;
tx->dyn_port = state->dyn_port;
tx->active = true;
SCLogDebug("FTP active mode (v4): dynamic port %"PRIu16"", dyn_port);
}
} }
}
if (state->command == FTP_COMMAND_EPSV) { if (state->command == FTP_COMMAND_PASV) {
if (state->current_line_len >= 4 && SCMemcmp("229 ", state->current_line, 4) == 0) { if (state->current_line_len >= 4 && SCMemcmp("227 ", state->current_line, 4) == 0) {
FTPParsePassiveResponseV6(f, ftp_state, state->current_line, state->current_line_len); FTPParsePassiveResponse(f, ftp_state, state->current_line, state->current_line_len);
}
} }
}
if (likely(state->current_line_len)) { if (state->command == FTP_COMMAND_EPSV) {
FTPString *response = FTPStringAlloc(); if (state->current_line_len >= 4 && SCMemcmp("229 ", state->current_line, 4) == 0) {
if (likely(response)) { FTPParsePassiveResponseV6(f, ftp_state, state->current_line, state->current_line_len);
response->len = CopyCommandLine(&response->str, state->current_line, state->current_line_len); }
TAILQ_INSERT_TAIL(&tx->response_list, response, next);
} }
}
/* Handle preliminary replies -- keep tx open */ if (likely(state->current_line_len)) {
if (FTPIsPPR(state->current_line, state->current_line_len)) { FTPString *response = FTPStringAlloc();
continue; if (likely(response)) {
} response->len = CopyCommandLine(&response->str, state->current_line, state->current_line_len);
tx_complete: TAILQ_INSERT_TAIL(&tx->response_list, response, next);
tx->done = true; }
}
/* Handle preliminary replies -- keep tx open */
if (FTPIsPPR(state->current_line, state->current_line_len)) {
continue;
}
tx_complete:
tx->done = true;
} }
SCReturnStruct(APP_LAYER_OK); SCReturnStruct(APP_LAYER_OK);

Write Preview
Loading…
Cancel
Save