diff options
| author |   Dong-hee Na <donghee.na92@gmail.com> | 2017-07-28 04:47:46 +0900 |
|---|---|---|
| committer |   larryhastings <larry@hastings.org> | 2017-07-27 12:47:46 -0700 |
| commit | 2a5a26c87e82c7d9a348792891feccd1b5e9a769 (patch) | |
| tree | 510d9702e66e842dcfaafca5f5a205af4f0a6798 | |
| parent | Post-release bump for 3.4.7rc1. (diff) | |
| download | cpython-2a5a26c87e82c7d9a348792891feccd1b5e9a769.tar.gz cpython-2a5a26c87e82c7d9a348792891feccd1b5e9a769.tar.bz2 cpython-2a5a26c87e82c7d9a348792891feccd1b5e9a769.zip | |
[3.4] bpo-30119: fix ftplib.FTP.putline() to throw an error for a illegal command (#1214) (#2893)
| -rw-r--r-- | Lib/ftplib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_ftplib.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2017-07-26-21-50-13.bpo-30119.DZ6C_S.rst | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Lib/ftplib.py b/Lib/ftplib.py index 1d3bd9ef21d..47f02f8b39b 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -187,6 +187,8 @@ class FTP: # Internal: send one line to the server, appending CRLF def putline(self, line): + if '\r' in line or '\n' in line: + raise ValueError('an illegal newline character should not be contained') line = line + CRLF if self.debugging > 1: print('*put*', self.sanitize(line)) diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index d3be7d6d007..1d448d5c6e2 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -482,6 +482,9 @@ class TestFTPClass(TestCase): self.assertEqual(self.client.sanitize('PASS 12345'), repr('PASS *****')) def test_exceptions(self): + self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\r\n0') + self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\n0') + self.assertRaises(ValueError, self.client.sendcmd, 'echo 40\r0') self.assertRaises(ftplib.error_temp, self.client.sendcmd, 'echo 400') self.assertRaises(ftplib.error_temp, self.client.sendcmd, 'echo 499') self.assertRaises(ftplib.error_perm, self.client.sendcmd, 'echo 500') @@ -490,7 +493,8 @@ class TestFTPClass(TestCase): def test_all_errors(self): exceptions = (ftplib.error_reply, ftplib.error_temp, ftplib.error_perm, - ftplib.error_proto, ftplib.Error, OSError, EOFError) + ftplib.error_proto, ftplib.Error, OSError, + EOFError) for x in exceptions: try: raise x('exception not included in all_errors set') diff --git a/Misc/NEWS.d/next/Library/2017-07-26-21-50-13.bpo-30119.DZ6C_S.rst b/Misc/NEWS.d/next/Library/2017-07-26-21-50-13.bpo-30119.DZ6C_S.rst new file mode 100644 index 00000000000..a37d3703842 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-07-26-21-50-13.bpo-30119.DZ6C_S.rst @@ -0,0 +1,2 @@ +ftplib.FTP.putline() now throws ValueError on commands that contains CR or +LF. Patch by Dong-hee Na. |