| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2011 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 { | 53 { |
| 54 m_securityOrigin = securityOrigin; | 54 m_securityOrigin = securityOrigin; |
| 55 m_haveInitializedSecurityOrigin = true; | 55 m_haveInitializedSecurityOrigin = true; |
| 56 } | 56 } |
| 57 | 57 |
| 58 void SecurityContext::setContentSecurityPolicy(PassRefPtrWillBeRawPtr<ContentSec
urityPolicy> contentSecurityPolicy) | 58 void SecurityContext::setContentSecurityPolicy(PassRefPtrWillBeRawPtr<ContentSec
urityPolicy> contentSecurityPolicy) |
| 59 { | 59 { |
| 60 m_contentSecurityPolicy = contentSecurityPolicy; | 60 m_contentSecurityPolicy = contentSecurityPolicy; |
| 61 } | 61 } |
| 62 | 62 |
| 63 ContentSecurityPolicy* SecurityContext::contentSecurityPolicy() const | |
| 64 { | |
| 65 return m_contentSecurityPolicy.get(); | |
| 66 } | |
| 67 | |
| 68 bool SecurityContext::isSecureTransitionTo(const KURL& url) const | 63 bool SecurityContext::isSecureTransitionTo(const KURL& url) const |
| 69 { | 64 { |
| 70 // If we haven't initialized our security origin by now, this is probably | 65 // If we haven't initialized our security origin by now, this is probably |
| 71 // a new window created via the API (i.e., that lacks an origin and lacks | 66 // a new window created via the API (i.e., that lacks an origin and lacks |
| 72 // a place to inherit the origin from). | 67 // a place to inherit the origin from). |
| 73 if (!haveInitializedSecurityOrigin()) | 68 if (!haveInitializedSecurityOrigin()) |
| 74 return true; | 69 return true; |
| 75 | 70 |
| 76 RefPtr<SecurityOrigin> other = SecurityOrigin::create(url); | 71 RefPtr<SecurityOrigin> other = SecurityOrigin::create(url); |
| 77 return securityOrigin()->canAccess(other.get()); | 72 return securityOrigin()->canAccess(other.get()); |
| 78 } | 73 } |
| 79 | 74 |
| 80 void SecurityContext::enforceSandboxFlags(SandboxFlags mask) | 75 void SecurityContext::enforceSandboxFlags(SandboxFlags mask) |
| 81 { | 76 { |
| 82 m_sandboxFlags |= mask; | 77 m_sandboxFlags |= mask; |
| 83 | 78 |
| 84 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { | 79 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { |
| 85 setSecurityOrigin(SecurityOrigin::createUnique()); | 80 setSecurityOrigin(SecurityOrigin::createUnique()); |
| 86 didUpdateSecurityOrigin(); | 81 didUpdateSecurityOrigin(); |
| 87 } | 82 } |
| 88 } | 83 } |
| 89 | 84 |
| 90 } | 85 } |
| OLD | NEW |