diff options
| author | Philipp Hancke <philipp.hancke@googlemail.com> | 2020-02-22 12:01:41 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-24 20:07:48 +0000 |
| commit | 98d5bbba58081aa07daf20c30e564d7509bda9a5 (patch) | |
| tree | 8353f4a763a284eed84e4f22d128d911ea09727e /p2p/base | |
| parent | ce515f76259347d60dc7b62f3ba3823e2d52391a (diff) | |
| download | webrtc-98d5bbba58081aa07daf20c30e564d7509bda9a5.tar.gz | |
loosen ice-ufrag/ice-pwd ice-char restrictions further
Loosen the restrictions for ice-char by also allowing
'#' (known to break) and '_' (urlsafe base64) in addition
to the existing exceptions for '-' and '='.
Also fixes typo in log message.
BUG=chromium:1053756
Change-Id: I8f254a7c25f780276452fa3e27245b6b7ad1a3ce
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168943
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30596}
Diffstat (limited to 'p2p/base')
| -rw-r--r-- | p2p/base/transport_description.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/p2p/base/transport_description.cc b/p2p/base/transport_description.cc index 841bc2bf98..5491d44fda 100644 --- a/p2p/base/transport_description.cc +++ b/p2p/base/transport_description.cc @@ -25,14 +25,14 @@ namespace cricket { namespace { bool IsIceChar(char c) { - // Note: '-' and '=' are *not* valid ice-chars but temporarily permitted - // in order to allow external software to upgrade. - if (c == '-' || c == '=') { + // Note: '-', '=', '#' and '_' are *not* valid ice-chars but temporarily + // permitted in order to allow external software to upgrade. + if (c == '-' || c == '=' || c == '#' || c == '_') { RTC_LOG(LS_WARNING) - << "'-' and '=' are not valid ice-char and thus not permitted in " - << "ufrag or pwd. This is a protocol violation that is permitted " - << "for to allow upgrading but will be rejected in the future. " - << "See https://crbug.com/1053756"; + << "'-', '=', '#' and '-' are not valid ice-char and thus not " + << "permitted in ufrag or pwd. This is a protocol violation that " + << "is permitted to allow upgrading but will be rejected in " + << "the future. See https://crbug.com/1053756"; return true; } return absl::ascii_isalnum(c) || c == '+' || c == '/'; |