33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
diff --git a/src/clients/FtpGateway.cc b/src/clients/FtpGateway.cc
|
|
index da9867f..e992638 100644
|
|
--- a/src/clients/FtpGateway.cc
|
|
+++ b/src/clients/FtpGateway.cc
|
|
@@ -1084,16 +1084,17 @@ Ftp::Gateway::checkAuth(const HttpHeader * req_hdr)
|
|
void
|
|
Ftp::Gateway::checkUrlpath()
|
|
{
|
|
- static SBuf str_type_eq("type=");
|
|
- auto t = request->url.path().rfind(';');
|
|
-
|
|
- if (t != SBuf::npos) {
|
|
- auto filenameEnd = t-1;
|
|
- if (request->url.path().substr(++t).cmp(str_type_eq, str_type_eq.length()) == 0) {
|
|
- t += str_type_eq.length();
|
|
- typecode = (char)xtoupper(request->url.path()[t]);
|
|
- request->url.path(request->url.path().substr(0,filenameEnd));
|
|
- }
|
|
+ // If typecode was specified, extract it and leave just the filename in
|
|
+ // url.path. Tolerate trailing garbage or missing typecode value. Roughly:
|
|
+ // [filename] ;type=[typecode char] [trailing garbage]
|
|
+ static const SBuf middle(";type=");
|
|
+ const auto typeSpecStart = request->url.path().find(middle);
|
|
+ if (typeSpecStart != SBuf::npos) {
|
|
+ const auto fullPath = request->url.path();
|
|
+ const auto typecodePos = typeSpecStart + middle.length();
|
|
+ typecode = (typecodePos < fullPath.length()) ?
|
|
+ static_cast<char>(xtoupper(fullPath[typecodePos])) : '\0';
|
|
+ request->url.path(fullPath.substr(0, typeSpecStart));
|
|
}
|
|
|
|
int l = request->url.path().length();
|