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

Side by Side Diff: jingle/notifier/base/notifier_options_util.cc

Issue 698633002: Enforce TLS for XMPP connections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« 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 "jingle/notifier/base/notifier_options_util.h" 5 #include "jingle/notifier/base/notifier_options_util.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "jingle/notifier/base/const_communicator.h" 8 #include "jingle/notifier/base/const_communicator.h"
9 #include "jingle/notifier/base/notifier_options.h" 9 #include "jingle/notifier/base/notifier_options.h"
10 #include "webrtc/libjingle/xmpp/constants.h" 10 #include "webrtc/libjingle/xmpp/constants.h"
11 #include "webrtc/libjingle/xmpp/jid.h" 11 #include "webrtc/libjingle/xmpp/jid.h"
12 12
13 namespace notifier { 13 namespace notifier {
14 14
15 buzz::XmppClientSettings MakeXmppClientSettings( 15 buzz::XmppClientSettings MakeXmppClientSettings(
16 const NotifierOptions& notifier_options, 16 const NotifierOptions& notifier_options,
17 const std::string& email, const std::string& token) { 17 const std::string& email, const std::string& token) {
18 buzz::Jid jid = buzz::Jid(email); 18 buzz::Jid jid = buzz::Jid(email);
19 DCHECK(!jid.node().empty()); 19 DCHECK(!jid.node().empty());
20 DCHECK(jid.IsValid()); 20 DCHECK(jid.IsValid());
21 21
22 buzz::XmppClientSettings xmpp_client_settings; 22 buzz::XmppClientSettings xmpp_client_settings;
23 xmpp_client_settings.set_user(jid.node()); 23 xmpp_client_settings.set_user(jid.node());
24 xmpp_client_settings.set_resource("chrome-sync"); 24 xmpp_client_settings.set_resource("chrome-sync");
25 xmpp_client_settings.set_host(jid.domain()); 25 xmpp_client_settings.set_host(jid.domain());
26 xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED); 26 xmpp_client_settings.set_use_tls(buzz::TLS_REQUIRED);
27 xmpp_client_settings.set_auth_token(notifier_options.auth_mechanism, 27 xmpp_client_settings.set_auth_token(notifier_options.auth_mechanism,
28 notifier_options.invalidate_xmpp_login ? 28 notifier_options.invalidate_xmpp_login ?
29 token + "bogus" : token); 29 token + "bogus" : token);
30 if (notifier_options.auth_mechanism == buzz::AUTH_MECHANISM_OAUTH2) 30 if (notifier_options.auth_mechanism == buzz::AUTH_MECHANISM_OAUTH2)
31 xmpp_client_settings.set_token_service("oauth2"); 31 xmpp_client_settings.set_token_service("oauth2");
32 else 32 else
33 xmpp_client_settings.set_token_service("chromiumsync"); 33 xmpp_client_settings.set_token_service("chromiumsync");
34 if (notifier_options.allow_insecure_connection) { 34 if (notifier_options.allow_insecure_connection) {
35 xmpp_client_settings.set_allow_plain(true); 35 xmpp_client_settings.set_allow_plain(true);
36 xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED); 36 xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED);
(...skipping 20 matching lines...) Expand all
57 servers.push_back( 57 servers.push_back(
58 ServerInformation( 58 ServerInformation(
59 net::HostPortPair("talkx.l.google.com", 59 net::HostPortPair("talkx.l.google.com",
60 notifier::kDefaultXmppPort), 60 notifier::kDefaultXmppPort),
61 SUPPORTS_SSLTCP)); 61 SUPPORTS_SSLTCP));
62 } 62 }
63 return servers; 63 return servers;
64 } 64 }
65 65
66 } // namespace notifier 66 } // namespace notifier
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