| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 switch (m_addressSpace) { | 71 switch (m_addressSpace) { |
| 72 case WebAddressSpacePublic: | 72 case WebAddressSpacePublic: |
| 73 return "public"; | 73 return "public"; |
| 74 | 74 |
| 75 case WebAddressSpacePrivate: | 75 case WebAddressSpacePrivate: |
| 76 return "private"; | 76 return "private"; |
| 77 | 77 |
| 78 case WebAddressSpaceLocal: | 78 case WebAddressSpaceLocal: |
| 79 return "local"; | 79 return "local"; |
| 80 } | 80 } |
| 81 ASSERT_NOT_REACHED(); | 81 NOTREACHED(); |
| 82 return "public"; | 82 return "public"; |
| 83 } | 83 } |
| 84 | 84 |
| 85 // Enforces the given suborigin as part of the security origin for this | 85 // Enforces the given suborigin as part of the security origin for this |
| 86 // security context. |name| must not be empty, although it may be null. A null | 86 // security context. |name| must not be empty, although it may be null. A null |
| 87 // name represents a lack of a suborigin. | 87 // name represents a lack of a suborigin. |
| 88 // See: https://w3c.github.io/webappsec-suborigins/index.html | 88 // See: https://w3c.github.io/webappsec-suborigins/index.html |
| 89 void SecurityContext::enforceSuborigin(const Suborigin& suborigin) { | 89 void SecurityContext::enforceSuborigin(const Suborigin& suborigin) { |
| 90 if (!RuntimeEnabledFeatures::suboriginsEnabled()) | 90 if (!RuntimeEnabledFeatures::suboriginsEnabled()) |
| 91 return; | 91 return; |
| 92 | 92 |
| 93 DCHECK(!suborigin.name().isEmpty()); | 93 DCHECK(!suborigin.name().isEmpty()); |
| 94 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled()); | 94 DCHECK(RuntimeEnabledFeatures::suboriginsEnabled()); |
| 95 DCHECK(m_securityOrigin.get()); | 95 DCHECK(m_securityOrigin.get()); |
| 96 DCHECK(!m_securityOrigin->hasSuborigin() || | 96 DCHECK(!m_securityOrigin->hasSuborigin() || |
| 97 m_securityOrigin->suborigin()->name() == suborigin.name()); | 97 m_securityOrigin->suborigin()->name() == suborigin.name()); |
| 98 m_securityOrigin->addSuborigin(suborigin); | 98 m_securityOrigin->addSuborigin(suborigin); |
| 99 didUpdateSecurityOrigin(); | 99 didUpdateSecurityOrigin(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 } // namespace blink | 102 } // namespace blink |
| OLD | NEW |