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 16 matching lines...) Expand all Loading... |
27 #include "config.h" | 27 #include "config.h" |
28 #include "core/dom/SecurityContext.h" | 28 #include "core/dom/SecurityContext.h" |
29 | 29 |
30 #include "core/frame/csp/ContentSecurityPolicy.h" | 30 #include "core/frame/csp/ContentSecurityPolicy.h" |
31 #include "platform/weborigin/SecurityOrigin.h" | 31 #include "platform/weborigin/SecurityOrigin.h" |
32 | 32 |
33 namespace blink { | 33 namespace blink { |
34 | 34 |
35 SecurityContext::SecurityContext() | 35 SecurityContext::SecurityContext() |
36 : m_haveInitializedSecurityOrigin(false) | 36 : m_haveInitializedSecurityOrigin(false) |
| 37 , m_sandboxFlags(SandboxNone) |
37 { | 38 { |
38 } | 39 } |
39 | 40 |
40 SecurityContext::~SecurityContext() | 41 SecurityContext::~SecurityContext() |
41 { | 42 { |
42 } | 43 } |
43 | 44 |
44 void SecurityContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securityOrigi
n) | 45 void SecurityContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securityOrigi
n) |
45 { | 46 { |
46 m_securityOrigin = securityOrigin; | 47 m_securityOrigin = securityOrigin; |
(...skipping 10 matching lines...) Expand all Loading... |
57 // If we haven't initialized our security origin by now, this is probably | 58 // If we haven't initialized our security origin by now, this is probably |
58 // a new window created via the API (i.e., that lacks an origin and lacks | 59 // a new window created via the API (i.e., that lacks an origin and lacks |
59 // a place to inherit the origin from). | 60 // a place to inherit the origin from). |
60 if (!haveInitializedSecurityOrigin()) | 61 if (!haveInitializedSecurityOrigin()) |
61 return true; | 62 return true; |
62 | 63 |
63 RefPtr<SecurityOrigin> other = SecurityOrigin::create(url); | 64 RefPtr<SecurityOrigin> other = SecurityOrigin::create(url); |
64 return securityOrigin()->canAccess(other.get()); | 65 return securityOrigin()->canAccess(other.get()); |
65 } | 66 } |
66 | 67 |
| 68 void SecurityContext::enforceSandboxFlags(SandboxFlags mask) |
| 69 { |
| 70 m_sandboxFlags |= mask; |
| 71 |
| 72 // The SandboxOrigin is stored redundantly in the security origin. |
| 73 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { |
| 74 setSecurityOrigin(SecurityOrigin::createUnique()); |
| 75 didUpdateSecurityOrigin(); |
| 76 } |
67 } | 77 } |
| 78 |
| 79 } |
OLD | NEW |