Magic-Mirror/ftpd
1
0
Fork 0
mirror of https://github.com/mtheall/ftpd.git synced 2024-11-23 09:39:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle keep-alive during transfers

Browse Source 
Closes #123
This commit is contained in:
Michael Theall 2020-11-18 13:19:40 +01:00
parent c7bbb93fd5
commit bc3c096b39
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/ftpSession.cpp
View File

@ -1478,8 +1478,9 @@ void FtpSession::readCommand (int const events_)
else if (m_state != State::COMMAND) else if (m_state != State::COMMAND)
{ {
// only some commands are available during data transfer // only some commands are available during data transfer
if (::strcasecmp (command, "ABOR") != 0 && ::strcasecmp (command, "STAT") != 0 && if (::strcasecmp (command, "ABOR") != 0 && ::strcasecmp (command, "NOOP") != 0 &&
::strcasecmp (command, "QUIT") != 0) ::strcasecmp (command, "PWD") != 0 && ::strcasecmp (command, "QUIT") != 0 &&
::strcasecmp (command, "STAT") != 0 && ::strcasecmp (command, "XPWD") != 0)
{ {
sendResponse ("503 Invalid command during transfer\r\n"); sendResponse ("503 Invalid command during transfer\r\n");
setState (State::COMMAND, true, true); setState (State::COMMAND, true, true);
@ -2339,12 +2340,16 @@ void FtpSession::PORT (char const *args_)
void FtpSession::PWD (char const *args_) void FtpSession::PWD (char const *args_)
{ {
setState (State::COMMAND, false, false); // handle keep-alive
if (m_state == State::COMMAND)
if (!authorized ())
{ {
sendResponse ("530 Not logged in\r\n"); setState (State::COMMAND, false, false);
return;
if (!authorized ())
{
sendResponse ("530 Not logged in\r\n");
return;
}
} }
auto const path = encodePath (m_cwd); auto const path = encodePath (m_cwd);