Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Side by Side Diff: net/url_request/ftp_protocol_handler.cc

Issue 10834053: Bug fix for lack of errors on requests with invalid ports (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added include Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/url_request/ftp_protocol_handler.h" 5 #include "net/url_request/ftp_protocol_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/base/net_errors.h"
9 #include "net/base/net_util.h"
10 #include "net/url_request/url_request.h"
11 #include "net/url_request/url_request_error_job.h"
8 #include "net/url_request/url_request_ftp_job.h" 12 #include "net/url_request/url_request_ftp_job.h"
13 #include "googleurl/src/gurl.h"
9 14
10 namespace net { 15 namespace net {
11 16
12 FtpProtocolHandler::FtpProtocolHandler( 17 FtpProtocolHandler::FtpProtocolHandler(
13 NetworkDelegate* network_delegate, 18 NetworkDelegate* network_delegate,
14 FtpTransactionFactory* ftp_transaction_factory, 19 FtpTransactionFactory* ftp_transaction_factory,
15 FtpAuthCache* ftp_auth_cache) 20 FtpAuthCache* ftp_auth_cache)
16 : network_delegate_(network_delegate), 21 : network_delegate_(network_delegate),
17 ftp_transaction_factory_(ftp_transaction_factory), 22 ftp_transaction_factory_(ftp_transaction_factory),
18 ftp_auth_cache_(ftp_auth_cache) { 23 ftp_auth_cache_(ftp_auth_cache) {
19 DCHECK(ftp_transaction_factory_); 24 DCHECK(ftp_transaction_factory_);
20 DCHECK(ftp_auth_cache_); 25 DCHECK(ftp_auth_cache_);
21 } 26 }
22 27
23 URLRequestJob* FtpProtocolHandler::MaybeCreateJob( 28 URLRequestJob* FtpProtocolHandler::MaybeCreateJob(
24 URLRequest* request) const { 29 URLRequest* request) const {
30 int port = request->url().IntPort();
31 if (request->url().has_port() &&
32 !IsPortAllowedByFtp(port) && !IsPortAllowedByOverride(port)) {
33 return new URLRequestErrorJob(request, ERR_UNSAFE_PORT);
34 }
35
25 return new URLRequestFtpJob(request, 36 return new URLRequestFtpJob(request,
26 network_delegate_, 37 network_delegate_,
27 ftp_transaction_factory_, 38 ftp_transaction_factory_,
28 ftp_auth_cache_); 39 ftp_auth_cache_);
29 } 40 }
30 41
31 } // namespace net 42 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698