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

Side by Side Diff: Source/core/loader/MixedContentChecker.cpp

Issue 845303003: Tag SecurityContext objects as being hosted in reserved IP ranges. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Feedback. Created 5 years, 11 months 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 | « Source/core/dom/SecurityContext.cpp ('k') | public/platform/Platform.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 } 395 }
396 396
397 return true; 397 return true;
398 } 398 }
399 399
400 void MixedContentChecker::checkMixedPrivatePublic(LocalFrame* frame, const Atomi cString& resourceIPAddress) 400 void MixedContentChecker::checkMixedPrivatePublic(LocalFrame* frame, const Atomi cString& resourceIPAddress)
401 { 401 {
402 if (!frame || !frame->document() || !frame->document()->loader()) 402 if (!frame || !frame->document() || !frame->document()->loader())
403 return; 403 return;
404 404
405 KURL documentIP(ParsedURLString, "http://" + frame->document()->loader()->re sponse().remoteIPAddress());
406 KURL resourceIP(ParsedURLString, "http://" + resourceIPAddress);
407
408 // Just count these for the moment, don't block them. 405 // Just count these for the moment, don't block them.
409 // 406 if (Platform::current()->isReservedIPAddress(resourceIPAddress) && !frame->d ocument()->isHostedInReservedIPRange())
410 // FIXME: Once we know how we want to check this, adjust the platform APIs t o avoid the KURL construction.
411 if (Platform::current()->isReservedIPAddress(resourceIP) && !Platform::curre nt()->isReservedIPAddress(documentIP))
412 UseCounter::count(frame->document(), UseCounter::MixedContentPrivateHost nameInPublicHostname); 407 UseCounter::count(frame->document(), UseCounter::MixedContentPrivateHost nameInPublicHostname);
413 } 408 }
414 409
415 } // namespace blink 410 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/SecurityContext.cpp ('k') | public/platform/Platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698