OLD | NEW |
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 #include "components/ssl_config/ssl_config_service_manager.h" | 4 #include "components/ssl_config/ssl_config_service_manager.h" |
5 | 5 |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include <algorithm> | 8 #include <algorithm> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 void OnDisabledCipherSuitesChange(PrefService* local_state); | 168 void OnDisabledCipherSuitesChange(PrefService* local_state); |
169 | 169 |
170 PrefChangeRegistrar local_state_change_registrar_; | 170 PrefChangeRegistrar local_state_change_registrar_; |
171 | 171 |
172 // The local_state prefs (should only be accessed from UI thread) | 172 // The local_state prefs (should only be accessed from UI thread) |
173 BooleanPrefMember rev_checking_enabled_; | 173 BooleanPrefMember rev_checking_enabled_; |
174 BooleanPrefMember rev_checking_required_local_anchors_; | 174 BooleanPrefMember rev_checking_required_local_anchors_; |
175 BooleanPrefMember sha1_local_anchors_enabled_; | 175 BooleanPrefMember sha1_local_anchors_enabled_; |
176 StringPrefMember ssl_version_min_; | 176 StringPrefMember ssl_version_min_; |
177 StringPrefMember ssl_version_max_; | 177 StringPrefMember ssl_version_max_; |
178 BooleanPrefMember dhe_enabled_; | |
179 | 178 |
180 // The cached list of disabled SSL cipher suites. | 179 // The cached list of disabled SSL cipher suites. |
181 std::vector<uint16_t> disabled_cipher_suites_; | 180 std::vector<uint16_t> disabled_cipher_suites_; |
182 | 181 |
183 scoped_refptr<SSLConfigServicePref> ssl_config_service_; | 182 scoped_refptr<SSLConfigServicePref> ssl_config_service_; |
184 | 183 |
185 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; | 184 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; |
186 | 185 |
187 DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceManagerPref); | 186 DISALLOW_COPY_AND_ASSIGN(SSLConfigServiceManagerPref); |
188 }; | 187 }; |
(...skipping 20 matching lines...) Expand all Loading... |
209 rev_checking_required_local_anchors_.Init( | 208 rev_checking_required_local_anchors_.Init( |
210 ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors, | 209 ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors, |
211 local_state, local_state_callback); | 210 local_state, local_state_callback); |
212 sha1_local_anchors_enabled_.Init( | 211 sha1_local_anchors_enabled_.Init( |
213 ssl_config::prefs::kCertEnableSha1LocalAnchors, local_state, | 212 ssl_config::prefs::kCertEnableSha1LocalAnchors, local_state, |
214 local_state_callback); | 213 local_state_callback); |
215 ssl_version_min_.Init(ssl_config::prefs::kSSLVersionMin, local_state, | 214 ssl_version_min_.Init(ssl_config::prefs::kSSLVersionMin, local_state, |
216 local_state_callback); | 215 local_state_callback); |
217 ssl_version_max_.Init(ssl_config::prefs::kSSLVersionMax, local_state, | 216 ssl_version_max_.Init(ssl_config::prefs::kSSLVersionMax, local_state, |
218 local_state_callback); | 217 local_state_callback); |
219 dhe_enabled_.Init(ssl_config::prefs::kDHEEnabled, local_state, | |
220 local_state_callback); | |
221 | 218 |
222 local_state_change_registrar_.Init(local_state); | 219 local_state_change_registrar_.Init(local_state); |
223 local_state_change_registrar_.Add(ssl_config::prefs::kCipherSuiteBlacklist, | 220 local_state_change_registrar_.Add(ssl_config::prefs::kCipherSuiteBlacklist, |
224 local_state_callback); | 221 local_state_callback); |
225 | 222 |
226 OnDisabledCipherSuitesChange(local_state); | 223 OnDisabledCipherSuitesChange(local_state); |
227 | 224 |
228 // Initialize from UI thread. This is okay as there shouldn't be anything on | 225 // Initialize from UI thread. This is okay as there shouldn't be anything on |
229 // the IO thread trying to access it yet. | 226 // the IO thread trying to access it yet. |
230 GetSSLConfigFromPrefs(&ssl_config_service_->cached_config_); | 227 GetSSLConfigFromPrefs(&ssl_config_service_->cached_config_); |
231 } | 228 } |
232 | 229 |
233 // static | 230 // static |
234 void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) { | 231 void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) { |
235 net::SSLConfig default_config; | 232 net::SSLConfig default_config; |
236 registry->RegisterBooleanPref( | 233 registry->RegisterBooleanPref( |
237 ssl_config::prefs::kCertRevocationCheckingEnabled, | 234 ssl_config::prefs::kCertRevocationCheckingEnabled, |
238 default_config.rev_checking_enabled); | 235 default_config.rev_checking_enabled); |
239 registry->RegisterBooleanPref( | 236 registry->RegisterBooleanPref( |
240 ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors, | 237 ssl_config::prefs::kCertRevocationCheckingRequiredLocalAnchors, |
241 default_config.rev_checking_required_local_anchors); | 238 default_config.rev_checking_required_local_anchors); |
242 registry->RegisterBooleanPref(ssl_config::prefs::kCertEnableSha1LocalAnchors, | 239 registry->RegisterBooleanPref(ssl_config::prefs::kCertEnableSha1LocalAnchors, |
243 false); | 240 false); |
244 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMin, | 241 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMin, |
245 std::string()); | 242 std::string()); |
246 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax, | 243 registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax, |
247 std::string()); | 244 std::string()); |
248 registry->RegisterListPref(ssl_config::prefs::kCipherSuiteBlacklist); | 245 registry->RegisterListPref(ssl_config::prefs::kCipherSuiteBlacklist); |
249 registry->RegisterBooleanPref(ssl_config::prefs::kDHEEnabled, | |
250 default_config.dhe_enabled); | |
251 } | 246 } |
252 | 247 |
253 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { | 248 net::SSLConfigService* SSLConfigServiceManagerPref::Get() { |
254 return ssl_config_service_.get(); | 249 return ssl_config_service_.get(); |
255 } | 250 } |
256 | 251 |
257 void SSLConfigServiceManagerPref::OnPreferenceChanged( | 252 void SSLConfigServiceManagerPref::OnPreferenceChanged( |
258 PrefService* prefs, | 253 PrefService* prefs, |
259 const std::string& pref_name_in) { | 254 const std::string& pref_name_in) { |
260 DCHECK(prefs); | 255 DCHECK(prefs); |
(...skipping 27 matching lines...) Expand all Loading... |
288 config->version_max = net::kDefaultSSLVersionMax; | 283 config->version_max = net::kDefaultSSLVersionMax; |
289 uint16_t version_min = SSLProtocolVersionFromString(version_min_str); | 284 uint16_t version_min = SSLProtocolVersionFromString(version_min_str); |
290 uint16_t version_max = SSLProtocolVersionFromString(version_max_str); | 285 uint16_t version_max = SSLProtocolVersionFromString(version_max_str); |
291 if (version_min) { | 286 if (version_min) { |
292 config->version_min = version_min; | 287 config->version_min = version_min; |
293 } | 288 } |
294 if (version_max) { | 289 if (version_max) { |
295 config->version_max = version_max; | 290 config->version_max = version_max; |
296 } | 291 } |
297 config->disabled_cipher_suites = disabled_cipher_suites_; | 292 config->disabled_cipher_suites = disabled_cipher_suites_; |
298 config->dhe_enabled = dhe_enabled_.GetValue(); | |
299 } | 293 } |
300 | 294 |
301 void SSLConfigServiceManagerPref::OnDisabledCipherSuitesChange( | 295 void SSLConfigServiceManagerPref::OnDisabledCipherSuitesChange( |
302 PrefService* local_state) { | 296 PrefService* local_state) { |
303 const base::ListValue* value = | 297 const base::ListValue* value = |
304 local_state->GetList(ssl_config::prefs::kCipherSuiteBlacklist); | 298 local_state->GetList(ssl_config::prefs::kCipherSuiteBlacklist); |
305 disabled_cipher_suites_ = ParseCipherSuites(ListValueToStringVector(value)); | 299 disabled_cipher_suites_ = ParseCipherSuites(ListValueToStringVector(value)); |
306 } | 300 } |
307 | 301 |
308 //////////////////////////////////////////////////////////////////////////////// | 302 //////////////////////////////////////////////////////////////////////////////// |
309 // SSLConfigServiceManager | 303 // SSLConfigServiceManager |
310 | 304 |
311 namespace ssl_config { | 305 namespace ssl_config { |
312 // static | 306 // static |
313 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( | 307 SSLConfigServiceManager* SSLConfigServiceManager::CreateDefaultManager( |
314 PrefService* local_state, | 308 PrefService* local_state, |
315 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) { | 309 const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) { |
316 return new SSLConfigServiceManagerPref(local_state, io_task_runner); | 310 return new SSLConfigServiceManagerPref(local_state, io_task_runner); |
317 } | 311 } |
318 | 312 |
319 // static | 313 // static |
320 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { | 314 void SSLConfigServiceManager::RegisterPrefs(PrefRegistrySimple* registry) { |
321 SSLConfigServiceManagerPref::RegisterPrefs(registry); | 315 SSLConfigServiceManagerPref::RegisterPrefs(registry); |
322 } | 316 } |
323 } // namespace ssl_config | 317 } // namespace ssl_config |
OLD | NEW |