diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-12-10 03:38:36 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-12-10 03:38:36 +0100 |
commit | 161cfeb34f81883ae0d720804f1285446afc1bd8 (patch) | |
tree | 330bfb0b530fae41eb328253b3a9f20057ab6b41 | |
parent | 674c9666d3405bac361677c72d2fb7c16f31dbad (diff) | |
parent | aaa7cbd25bc14e3457d72d5b0e00a0777f59ed28 (diff) | |
download | libcore-161cfeb34f81883ae0d720804f1285446afc1bd8.tar.gz libcore-161cfeb34f81883ae0d720804f1285446afc1bd8.tar.bz2 libcore-161cfeb34f81883ae0d720804f1285446afc1bd8.zip |
Merge remote-tracking branch 'lineageos/cm-13.0' into replicant-6.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0
-rw-r--r-- | luni/src/main/java/libcore/net/url/FtpURLConnection.java | 23 | ||||
-rw-r--r-- | luni/src/test/java/libcore/net/url/FtpURLConnectionTest.java | 60 |
2 files changed, 83 insertions, 0 deletions
diff --git a/luni/src/main/java/libcore/net/url/FtpURLConnection.java b/luni/src/main/java/libcore/net/url/FtpURLConnection.java index 021bfa261..a2c515178 100644 --- a/luni/src/main/java/libcore/net/url/FtpURLConnection.java +++ b/luni/src/main/java/libcore/net/url/FtpURLConnection.java @@ -503,7 +503,30 @@ public class FtpURLConnection extends URLConnection { } } + // @VisibleForTesting + public static void validateCommand(String command) throws IOException { + final int terminatorIdx = command.length() - 2; + + // First check that the command is terminated correctly, it must + // always end with '<CR><LF>'. + if (terminatorIdx < 0 || + command.charAt(terminatorIdx) != '\r' || + command.charAt(terminatorIdx + 1) != '\n') { + throw new IOException("Command terminated incorrectly"); + } + + // Then check that there are no <CR><LF> characters elsewhere in the + // command. + // + // NOTE: If we're being really pedantic, we'll need to check that this + // is the lower half of ASCII as well. + if (command.indexOf('\r') < terminatorIdx || command.indexOf('\n') < terminatorIdx) { + throw new IOException("Invalid character in command"); + } + } + private void write(String command) throws IOException { + validateCommand(command); ctrlOutput.write(command.getBytes(StandardCharsets.ISO_8859_1)); } } diff --git a/luni/src/test/java/libcore/net/url/FtpURLConnectionTest.java b/luni/src/test/java/libcore/net/url/FtpURLConnectionTest.java new file mode 100644 index 000000000..e2c24eb43 --- /dev/null +++ b/luni/src/test/java/libcore/net/url/FtpURLConnectionTest.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package libcore.net.url; + +import java.io.IOException; + +import junit.framework.TestCase; + +import libcore.net.url.FtpURLConnection; + +public class FtpURLConnectionTest extends TestCase { + public void testValidateCommand() throws Exception { + FtpURLConnection.validateCommand("\r\n"); + FtpURLConnection.validateCommand("USER foo\r\n"); + + try { + FtpURLConnection.validateCommand("\r"); + fail(); + } catch (IOException expected) { + } + + try { + FtpURLConnection.validateCommand("\n"); + fail(); + } catch (IOException expected) { + } + + try { + FtpURLConnection.validateCommand("USER foo\rbar\r\n"); + fail(); + } catch (IOException expected) { + } + + try { + FtpURLConnection.validateCommand("USER foo\nbar\r\n"); + fail(); + } catch (IOException expected) { + } + + try { + FtpURLConnection.validateCommand("USER foo\r\nbar\r\n"); + fail(); + } catch (IOException expected) { + } + } +} |