Update directory enumeration and FTP server #2271
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slaff
reviewed
Mar 18, 2021
| @@ -28,11 +31,14 @@ void connectFail(const String& ssid, MacAddress bssid, WifiDisconnectReason reas | |||
|
|
|||
| void init() | |||
| { | |||
| spiffs_mount(); // Mount file system, in order to work with files | |||
|
|
|||
| Serial.begin(SERIAL_BAUD_RATE); // 115200 by default | |||
There was a problem hiding this comment.
@mikee47 I know that this is not something that you have added but would it be possible to remove also the unnecessary comment from line 26 ?
// .. some you code for configuration ..
| Serial.begin(SERIAL_BAUD_RATE); // 115200 by default | ||
| Serial.systemDebugOutput(true); // Enable debug output to serial | ||
|
|
||
| // Mount file system, in order to work with files |
There was a problem hiding this comment.
Maybe you can add a bit more text explaining the difference between the three mount commands.
Put spiffs_mount() after serial init, so any error messages can be seen Add FWFS volume to make file listing a bit more interesting
`canTransfer` doesn't seem to be necessary, so remove `onSent` not required
Set default data port to 20 as per spec.
Check folder for write access if file doesn't exist Displayed 'w' value combines READ attribute with user permissions
Applications may choose to restrict FTP access to separate filesystem
mikee47
force-pushed
the
feature/directory-enumeration
branch
from
cbc42aa to
208928a
Compare
slaff
added
3.5 - Approved - Waiting for CI results
and removed
3 - Review
3.5 - Approved - Waiting for CI results
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR deals with directory listings in the framework.
Using a Vector is inefficient,
Directoryobject is almost as simple and more flexible.The FTP framework and sample have been updated accordingly, with improvements to demonstrate use of
IFS file permissions.
Fully deprecate
fileListand update framework usingDirectoryobject insteadFix command handler in Host mode - requires different EOL character
Various minor updates and fixes to IFS component.
Revise FTP Server
Fix bad TcpConnection write calls
Simplify operation - some logic involving
canTransferdoesn't seem to be necessaryRe-structure command handling, add login and file access checks.
More commands available if user isn't logged in, permissions handled by filesystem
Note: Default file permissions for new files written to SPIFFS are read/write for Admin only.
Extended directory listings: displayed 'w' value combines READ attribute with user permissions
Add HELP, NLST, CDUP, XCWD and XPWD commands
Base
FtpServeronCustomFtpServerclass, user may choose to manage users differentlyFTP server can use separate filesystem if required
Update FtpServer_Files sample
Add FWFS and mount together with SPIFFS as a hybrid volume (makes things a bit more interesting)
Add another two user accounts with different roles