StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Use alias s6_addr instead of direct field access.

Browse Source 
PiperOrigin-RevId: 409908616
Change-Id: I18f87b41eae3f96fd60b8cd14073bd8df66fae98
This commit is contained in:
Sandboxed API Team 2021-11-15 01:00:52 -08:00 committed by Copybara-Service
parent 2727714012
commit 9541b657ad
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sandboxed_api/sandbox2/network_proxy/filtering.cc
View File

@ -19,6 +19,7 @@
#include <glog/logging.h>
#include "absl/status/status.h"
#include "absl/status/statusor.h"
#include "absl/strings/match.h"
#include "absl/strings/numbers.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_split.h"
@ -98,7 +99,7 @@ static absl::Status ParseIpAndMask(const std::string& ip_and_mask,
}
std::string mask_or_cidr = ip_and_mask_split[1];
const bool has_dot = mask_or_cidr.find('.') == absl::string_view::npos;
const bool has_dot = !absl::StrContains(mask_or_cidr, '.');
if (has_dot) { // mask_or_cidr is cidr
bool res = absl::SimpleAtoi<uint32_t>(mask_or_cidr, cidr);
if (!res || !*cidr) {
@ -248,11 +249,9 @@ bool AllowedHosts::IsHostAllowed(const struct sockaddr* saddr) const {
bool AllowedHosts::IsIPv6Allowed(const struct sockaddr_in6* saddr) const {
auto result = std::find_if(
allowed_IPv6_.begin(), allowed_IPv6_.end(), [saddr](const IPv6& entry) {
for (int i = 0; i < 4; i++) {
if ((entry.ip.__in6_u.__u6_addr32[i] &
entry.mask.__in6_u.__u6_addr32[i]) !=
(saddr->sin6_addr.__in6_u.__u6_addr32[i] &
entry.mask.__in6_u.__u6_addr32[i])) {
for (int i = 0; i < 16; i++) {
if ((entry.ip.s6_addr[i] & entry.mask.s6_addr[i]) !=
(saddr->sin6_addr.s6_addr[i] & entry.mask.s6_addr[i])) {
return false;
}
}