Bug fix for lack of errors on requests with invalid ports

net/url_request/ftp_protocol_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/ftp_protocol_handler.h"
 
 #include "base/logging.h"
+#include "net/base/net_errors.h"
+#include "net/base/net_util.h"

[mmenke, 2012/07/27 19:12:22]

Should probably include "googleurl/src/gurl.h" as well.

[shalev, 2012/07/30 02:27:00]

Done.

+#include "net/url_request/url_request.h"
+#include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_ftp_job.h"
 
 namespace net {
 
 FtpProtocolHandler::FtpProtocolHandler(
     NetworkDelegate* network_delegate,
     FtpTransactionFactory* ftp_transaction_factory,
     FtpAuthCache* ftp_auth_cache)
     : network_delegate_(network_delegate),
       ftp_transaction_factory_(ftp_transaction_factory),
       ftp_auth_cache_(ftp_auth_cache) {
   DCHECK(ftp_transaction_factory_);
   DCHECK(ftp_auth_cache_);
 }
 
 URLRequestJob* FtpProtocolHandler::MaybeCreateJob(
     URLRequest* request) const {
+  int port = request->url().IntPort();
+  if (request->url().has_port() &&
+      !IsPortAllowedByFtp(port) && !IsPortAllowedByOverride(port)) {
+    return new URLRequestErrorJob(request, ERR_UNSAFE_PORT);
+  }
+
   return new URLRequestFtpJob(request,
                               network_delegate_,
                               ftp_transaction_factory_,
                               ftp_auth_cache_);
 }
 
 }  // namespace net