| 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 | 4 | 
| 5 #include "chrome/common/extensions/permissions/socket_permission.h" | 5 #include "extensions/common/permissions/socket_permission.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 | 8 | 
| 9 #include "base/logging.h" | 9 #include "base/logging.h" | 
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" | 
| 11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" | 
| 12 #include "chrome/common/extensions/permissions/set_disjunction_permission.h" |  | 
| 13 #include "extensions/common/permissions/permissions_info.h" | 12 #include "extensions/common/permissions/permissions_info.h" | 
|  | 13 #include "extensions/common/permissions/set_disjunction_permission.h" | 
| 14 #include "grit/generated_resources.h" | 14 #include "grit/generated_resources.h" | 
| 15 #include "ui/base/l10n/l10n_util.h" | 15 #include "ui/base/l10n/l10n_util.h" | 
| 16 | 16 | 
| 17 namespace extensions { | 17 namespace extensions { | 
| 18 | 18 | 
| 19 SocketPermission::SocketPermission(const APIPermissionInfo* info) | 19 SocketPermission::SocketPermission(const APIPermissionInfo* info) | 
| 20   : SetDisjunctionPermission<SocketPermissionData, SocketPermission>(info) { | 20     : SetDisjunctionPermission<SocketPermissionData, SocketPermission>(info) {} | 
| 21 } |  | 
| 22 | 21 | 
| 23 SocketPermission::~SocketPermission() { | 22 SocketPermission::~SocketPermission() {} | 
| 24 } |  | 
| 25 | 23 | 
| 26 PermissionMessages SocketPermission::GetMessages() const { | 24 PermissionMessages SocketPermission::GetMessages() const { | 
| 27   DCHECK(HasMessages()); | 25   DCHECK(HasMessages()); | 
| 28   PermissionMessages result; | 26   PermissionMessages result; | 
| 29   if (!AddAnyHostMessage(result)) { | 27   if (!AddAnyHostMessage(result)) { | 
| 30     AddSpecificHostMessage(result); | 28     AddSpecificHostMessage(result); | 
| 31     AddSubdomainHostMessage(result); | 29     AddSubdomainHostMessage(result); | 
| 32   } | 30   } | 
| 33   AddNetworkListMessage(result); | 31   AddNetworkListMessage(result); | 
| 34   return result; | 32   return result; | 
| 35 } | 33 } | 
| 36 | 34 | 
| 37 bool SocketPermission::AddAnyHostMessage(PermissionMessages& messages) const { | 35 bool SocketPermission::AddAnyHostMessage(PermissionMessages& messages) const { | 
| 38   std::set<SocketPermissionData>::const_iterator i; | 36   std::set<SocketPermissionData>::const_iterator i; | 
| 39   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 37   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 
| 40     if (i->entry().IsAddressBoundType() && | 38     if (i->entry().IsAddressBoundType() && | 
| 41         i->entry().GetHostType() == SocketPermissionEntry::ANY_HOST) { | 39         i->entry().GetHostType() == SocketPermissionEntry::ANY_HOST) { | 
| 42       messages.push_back(PermissionMessage( | 40       messages.push_back( | 
| 43           PermissionMessage::kSocketAnyHost, | 41           PermissionMessage(PermissionMessage::kSocketAnyHost, | 
| 44           l10n_util::GetStringUTF16( | 42                             l10n_util::GetStringUTF16( | 
| 45               IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST))); | 43                                 IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST))); | 
| 46       return true; | 44       return true; | 
| 47     } | 45     } | 
| 48   } | 46   } | 
| 49   return false; | 47   return false; | 
| 50 } | 48 } | 
| 51 | 49 | 
| 52 void SocketPermission::AddSubdomainHostMessage( | 50 void SocketPermission::AddSubdomainHostMessage( | 
| 53     PermissionMessages& messages) const { | 51     PermissionMessages& messages) const { | 
| 54   std::set<base::string16> domains; | 52   std::set<base::string16> domains; | 
| 55   std::set<SocketPermissionData>::const_iterator i; | 53   std::set<SocketPermissionData>::const_iterator i; | 
| 56   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 54   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 
| 57     if (i->entry().GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS) | 55     if (i->entry().GetHostType() == SocketPermissionEntry::HOSTS_IN_DOMAINS) | 
| 58       domains.insert(base::UTF8ToUTF16(i->entry().pattern().host)); | 56       domains.insert(base::UTF8ToUTF16(i->entry().pattern().host)); | 
| 59   } | 57   } | 
| 60   if (!domains.empty()) { | 58   if (!domains.empty()) { | 
| 61     int id = (domains.size() == 1) ? | 59     int id = (domains.size() == 1) | 
| 62              IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN : | 60                  ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN | 
| 63              IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; | 61                  : IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; | 
| 64     messages.push_back(PermissionMessage( | 62     messages.push_back(PermissionMessage( | 
| 65         PermissionMessage::kSocketDomainHosts, | 63         PermissionMessage::kSocketDomainHosts, | 
| 66         l10n_util::GetStringFUTF16( | 64         l10n_util::GetStringFUTF16( | 
| 67             id, | 65             id, | 
| 68             JoinString( | 66             JoinString( | 
| 69                 std::vector<base::string16>( | 67                 std::vector<base::string16>(domains.begin(), domains.end()), | 
| 70                     domains.begin(), domains.end()), ' ')))); | 68                 ' ')))); | 
| 71   } | 69   } | 
| 72 } | 70 } | 
| 73 | 71 | 
| 74 void SocketPermission::AddSpecificHostMessage( | 72 void SocketPermission::AddSpecificHostMessage( | 
| 75     PermissionMessages& messages) const { | 73     PermissionMessages& messages) const { | 
| 76   std::set<base::string16> hostnames; | 74   std::set<base::string16> hostnames; | 
| 77   std::set<SocketPermissionData>::const_iterator i; | 75   std::set<SocketPermissionData>::const_iterator i; | 
| 78   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 76   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 
| 79     if (i->entry().GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS) | 77     if (i->entry().GetHostType() == SocketPermissionEntry::SPECIFIC_HOSTS) | 
| 80       hostnames.insert(base::UTF8ToUTF16(i->entry().pattern().host)); | 78       hostnames.insert(base::UTF8ToUTF16(i->entry().pattern().host)); | 
| 81   } | 79   } | 
| 82   if (!hostnames.empty()) { | 80   if (!hostnames.empty()) { | 
| 83     int id = (hostnames.size() == 1) ? | 81     int id = (hostnames.size() == 1) | 
| 84              IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST : | 82                  ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST | 
| 85              IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; | 83                  : IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; | 
| 86     messages.push_back(PermissionMessage( | 84     messages.push_back(PermissionMessage( | 
| 87         PermissionMessage::kSocketSpecificHosts, | 85         PermissionMessage::kSocketSpecificHosts, | 
| 88         l10n_util::GetStringFUTF16( | 86         l10n_util::GetStringFUTF16( | 
| 89             id, | 87             id, | 
| 90             JoinString( | 88             JoinString( | 
| 91                 std::vector<base::string16>( | 89                 std::vector<base::string16>(hostnames.begin(), hostnames.end()), | 
| 92                     hostnames.begin(), hostnames.end()), ' ')))); | 90                 ' ')))); | 
| 93   } | 91   } | 
| 94 } | 92 } | 
| 95 | 93 | 
| 96 void SocketPermission::AddNetworkListMessage( | 94 void SocketPermission::AddNetworkListMessage( | 
| 97     PermissionMessages& messages) const { | 95     PermissionMessages& messages) const { | 
| 98   std::set<SocketPermissionData>::const_iterator i; | 96   std::set<SocketPermissionData>::const_iterator i; | 
| 99   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 97   for (i = data_set_.begin(); i != data_set_.end(); ++i) { | 
| 100     if (i->entry().pattern().type == | 98     if (i->entry().pattern().type == | 
| 101         content::SocketPermissionRequest::NETWORK_STATE) { | 99         content::SocketPermissionRequest::NETWORK_STATE) { | 
| 102       messages.push_back(PermissionMessage( | 100       messages.push_back( | 
| 103           PermissionMessage::kNetworkState, | 101           PermissionMessage(PermissionMessage::kNetworkState, | 
| 104           l10n_util::GetStringUTF16( | 102                             l10n_util::GetStringUTF16( | 
| 105               IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); | 103                                 IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); | 
| 106     } | 104     } | 
| 107   } | 105   } | 
| 108 } | 106 } | 
| 109 | 107 | 
| 110 }  // namespace extensions | 108 }  // namespace extensions | 
| OLD | NEW | 
|---|