- * This Felix specific activator installs a security provider with the Felix - * framework. The security settings can be changed via the - * {@link PermissionAdmin} and/or the {@link ConditionalPermissionAdmin} - * services that may be published by this class. - *
- *- * Permission informations as well as caching data will be stored in several - * files in a directory called security obtained by a call to - * {@link BundleContext#getDataFile(String))}. - *
- *- * The following properties are recognized: - *
- * {@link SecurityConstants#ENABLE_PERMISSIONADMIN_PROP} - Whether or not ( - * true|false) to publish a{@link ConditionalPermissionAdmin} - * service. The default is - * {@link SecurityConstants#ENABLE_PERMISSIONADMIN_VALUE}. - *
- *- * {@link SecurityConstants#ENABLE_CONDPERMADMIN_PROP} - Whether or not ( - * true|false) to publish a{@link ConditionalPermissionAdmin} - * service. The default is {@link SecurityConstants#ENABLE_CONDPERMADMIN_VALUE}. - *
- *- * {@link SecurityConstants#KEYSTORE_FILE_PROP} - The keystore URL(s) to use as - * trusted CA stores. The urls must be separated by a guard (i.e., |). - * The default is {@link SecurityConstants#KEYSTORE_FILE_VALUE}. - *
- *- * {@link SecurityConstants#KEYSTORE_PASS_PROP} - The keystore password(s) to - * use for the given keystores. The passwords must be separated by a guard - * (i.e., |).The default is - * {@link SecurityConstants#KEYSTORE_PASS_VALUE}. - *
- *- * {@link SecurityConstants#KEYSTORE_TYPE_PROP} - The keystore type(s) to use - * for the given keystores. The types must be separated by a guard (i.e., - * |).The default is {@link SecurityConstants#KEYSTORE_TYPE_VALUE}. - *
- *- * {@link SecurityConstants#CRL_FILE_PROP} - The CRL URL(s) to use for revoked - * certificates. The urls must be separated by a guard (i.e., |). The - * default is {@link SecurityConstants#CRL_FILE_VALUE}. - *
- * - */ -/* - * TODO: using a string for passwords is bad. We need to investigate - * alternatives. - * - * TODO: we might want to allow for the recognized properties to change without - * a restart. This is trick because we can not publish a managed service due to - * not being able to import as we are an extension bundle. - */ -public final class SecurityActivator implements BundleActivator -{ - public synchronized void start(BundleContext context) throws Exception - { - PermissionAdminImpl pai = null; - - SecureAction action = new SecureAction(); - - Permissions permissions = new Permissions(context, action); - - File tmp = context.getDataFile("security" + File.separator + "tmp"); - if ((tmp == null) || (!tmp.isDirectory() && !tmp.mkdirs())) - { - throw new IOException("Can't create tmp dir."); - } - // TODO: log something if we can not clean-up the tmp dir - File[] old = tmp.listFiles(); - if (old != null) - { - for (int i = 0; i < old.length; i++) - { - old[i].delete(); - } - } - - if ("TRUE".equalsIgnoreCase(getProperty(context, - SecurityConstants.ENABLE_PERMISSIONADMIN_PROP, - SecurityConstants.ENABLE_PERMISSIONADMIN_VALUE))) - { - File cache = context.getDataFile("security" + File.separator - + "pa.txt"); - if ((cache == null) || (!cache.isFile() && !cache.createNewFile())) - { - throw new IOException("Can't create cache file"); - } - pai = new PermissionAdminImpl(permissions, new PropertiesCache( - cache, tmp, action)); - } - - ConditionalPermissionAdminImpl cpai = null; - - if ("TRUE".equalsIgnoreCase(getProperty(context, - SecurityConstants.ENABLE_CONDPERMADMIN_PROP, - SecurityConstants.ENABLE_CONDPERMADMIN_VALUE))) - { - File cpaCache = context.getDataFile("security" + File.separator - + "cpa.txt"); - if ((cpaCache == null) - || (!cpaCache.isFile() && !cpaCache.createNewFile())) - { - throw new IOException("Can't create cache file"); - } - - LocalPermissions localPermissions = new LocalPermissions( - permissions); - - final Conditions conditions = new Conditions(action); - cpai = new ConditionalPermissionAdminImpl(permissions, - conditions, localPermissions, new PropertiesCache( - cpaCache, tmp, action), pai); - - context.addBundleListener(new UninstallListener(conditions)); - } - - if ((pai != null) || (cpai != null)) - { - String crlList = getProperty(context, - SecurityConstants.CRL_FILE_PROP, - SecurityConstants.CRL_FILE_VALUE); - String storeList = getProperty(context, - SecurityConstants.KEYSTORE_FILE_PROP, - SecurityConstants.KEYSTORE_FILE_VALUE); - String passwdList = getProperty(context, - SecurityConstants.KEYSTORE_PASS_PROP, - SecurityConstants.KEYSTORE_PASS_VALUE); - String typeList = getProperty(context, - SecurityConstants.KEYSTORE_TYPE_PROP, - SecurityConstants.KEYSTORE_TYPE_VALUE); - String osgi_keystores = getProperty(context, - Constants.FRAMEWORK_TRUST_REPOSITORIES, null); - if (osgi_keystores != null) - { - StringTokenizer tok = new StringTokenizer(osgi_keystores, - File.pathSeparator); - - if (storeList.length() == 0) - { - storeList += "file:" + tok.nextToken(); - passwdList += " "; - typeList += "JKS"; - } - while (tok.hasMoreTokens()) - { - storeList += "|file:" + tok.nextToken(); - passwdList += "| "; - typeList += "|JKS"; - } - } - - StringTokenizer storeTok = new StringTokenizer(storeList, "|"); - StringTokenizer passwdTok = new StringTokenizer(passwdList, "|"); - StringTokenizer typeTok = new StringTokenizer(typeList, "|"); - - if ((storeTok.countTokens() != typeTok.countTokens()) - || (passwdTok.countTokens() != storeTok.countTokens())) - { - throw new BundleException( - "Each CACerts keystore must have one type and one passwd entry and vice versa."); - } - - SecurityProvider provider = new SecurityProviderImpl(crlList, - typeList, passwdList, storeList, pai, cpai, action, ((Felix) context.getBundle(0)).getLogger()); - - ((Felix) context.getBundle(0)).setSecurityProvider(provider); - } - - if (pai != null) - { - context.registerService(PermissionAdmin.class.getName(), pai, null); - } - - if (cpai != null) - { - context.registerService(ConditionalPermissionAdmin.class.getName(), - cpai, null); - } - } - - public synchronized void stop(BundleContext context) throws Exception - { - ((Felix) context.getBundle(0)).setSecurityProvider(null); - } - - private String getProperty(BundleContext context, String key, - String defaultValue) - { - String result = context.getProperty(key); - - return (result != null) ? result : defaultValue; - } - - private static final class UninstallListener implements BundleListener - { - private final Conditions conditions; - - UninstallListener(Conditions conditions) - { - this.conditions = conditions; - } - - public void bundleChanged(BundleEvent event) - { - if (event.getType() == BundleEvent.UNINSTALLED) - { - List revisions = ((BundleRevisions)event.getBundle().adapt(BundleRevisions.class)).getRevisions(); - if (revisions != null) - { - Iterator iter = revisions.iterator(); - while (iter.hasNext()) - { - conditions.remove((BundleRevisionImpl) iter.next()); - } - } - } - } - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/SecurityProviderImpl.java b/framework.security/src/main/java/org/apache/felix/framework/SecurityProviderImpl.java deleted file mode 100644 index 405f9092f8..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/SecurityProviderImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework; - -import java.security.Permission; -import java.security.ProtectionDomain; - -import org.apache.felix.framework.Logger; -import org.apache.felix.framework.ext.SecurityProvider; -import org.apache.felix.framework.security.condpermadmin.ConditionalPermissionAdminImpl; -import org.apache.felix.framework.security.permissionadmin.PermissionAdminImpl; -import org.apache.felix.framework.security.util.TrustManager; -import org.apache.felix.framework.security.verifier.BundleDNParser; -import org.apache.felix.framework.util.SecureAction; -import org.osgi.framework.Bundle; -import org.osgi.framework.wiring.BundleRevision; - -/** - * This class is the entry point to the security. It is used to determine - * whether a given bundle is signed correctely and has permissions based on - * PermissionAdmin or ConditionalPermissionAdmin. - */ -public final class SecurityProviderImpl implements SecurityProvider -{ - private final BundleDNParser m_parser; - private final PermissionAdminImpl m_pai; - private final ConditionalPermissionAdminImpl m_cpai; - private final SecureAction m_action; - - SecurityProviderImpl(String crlList, String typeList, String passwdList, - String storeList, PermissionAdminImpl pai, - ConditionalPermissionAdminImpl cpai, SecureAction action, Logger logger) - { - m_pai = pai; - m_cpai = cpai; - m_action = action; - m_parser = new BundleDNParser(new TrustManager(crlList, typeList, - passwdList, storeList, m_action), logger); - } - - /** - * If the given bundle is signed but can not be verified (e.g., missing - * files) then throw an exception. - */ - public void checkBundle(Bundle bundle) throws Exception - { - BundleRevisionImpl module = (BundleRevisionImpl) bundle.adapt(BundleRevisionImpl.class); - m_parser.checkDNChains(module, module.getContent(), - Bundle.SIGNERS_TRUSTED); - } - - /** - * Get a signer matcher that can be used to match digital signed bundles. - */ - public Object getSignerMatcher(final Bundle bundle, int signersType) - { - BundleRevisionImpl module = (BundleRevisionImpl) bundle.adapt(BundleRevisionImpl.class); - return m_parser.getDNChains(module, module.getContent(), signersType); - } - - /** - * If we have a permissionadmin then ask that one first and have it decide - * in case there is a location bound. If not then either use its default - * permission in case there is no conditional permission admin or else ask - * that one. - */ - public boolean hasBundlePermission(ProtectionDomain bundleProtectionDomain, - Permission permission, boolean direct) - { - BundleProtectionDomain pd = (BundleProtectionDomain) bundleProtectionDomain; - BundleImpl bundle = pd.getBundle(); - BundleRevisionImpl module = (BundleRevisionImpl) pd.getRevision(); - - if (bundle.getBundleId() == 0) - { - return true; - } - - // System.out.println(info.getBundleId() + " - " + permission); - // TODO: using true, false, or null seems a bit awkward. Improve this. - Boolean result = null; - if (m_pai != null) - { - result = m_pai.hasPermission(bundle._getLocation(), pd.getBundle(), - permission, m_cpai, pd, module.getContent()); - } - - if (result != null) - { - if ((m_cpai != null) && !direct) - { - boolean allow = result.booleanValue(); - if (!allow) - { - m_cpai.clearPD(); - return false; - } - return m_cpai.handlePAHandle(pd); - } - return result.booleanValue(); - } - - if (m_cpai != null) - { - try - { - return m_cpai.hasPermission(module, module.getContent(), pd, - permission, direct, m_pai); - } - catch (Exception e) - { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - return false; - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/SecurityConstants.java b/framework.security/src/main/java/org/apache/felix/framework/security/SecurityConstants.java deleted file mode 100644 index 790e1852d4..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/SecurityConstants.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security; - -public interface SecurityConstants -{ - public static final String KEYSTORE_FILE_PROP = "felix.keystore"; - - public static final String KEYSTORE_FILE_VALUE = ""; - - public static final String KEYSTORE_TYPE_PROP = "felix.keystore.type"; - - public static final String KEYSTORE_TYPE_VALUE = ""; - - public static final String KEYSTORE_PASS_PROP = "felix.keystore.pass"; - - public static final String KEYSTORE_PASS_VALUE = ""; - - public static final String CRL_FILE_PROP = "felix.crl"; - - public static final String CRL_FILE_VALUE = ""; - - public static final String ENABLE_CONDPERMADMIN_PROP = "felix.security.conpermadmin"; - - public static final String ENABLE_CONDPERMADMIN_VALUE = "true"; - - public static final String ENABLE_PERMISSIONADMIN_PROP = "felix.security.permissionadmin"; - - public static final String ENABLE_PERMISSIONADMIN_VALUE = "true"; -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java b/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java deleted file mode 100644 index ba6c50fb12..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionAdminImpl.java +++ /dev/null @@ -1,946 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.condpermadmin; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.net.URL; -import java.security.AccessControlContext; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.Permission; -import java.security.Principal; -import java.security.ProtectionDomain; -import java.security.PublicKey; -import java.security.SignatureException; -import java.security.cert.X509Certificate; -import java.util.AbstractSet; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.Map.Entry; - -import org.apache.felix.framework.BundleProtectionDomain; -import org.apache.felix.framework.BundleRevisionImpl; -import org.apache.felix.framework.FakeBundle; -import org.apache.felix.framework.security.permissionadmin.PermissionAdminImpl; -import org.apache.felix.framework.security.util.Conditions; -import org.apache.felix.framework.security.util.LocalPermissions; -import org.apache.felix.framework.security.util.Permissions; -import org.apache.felix.framework.security.util.PropertiesCache; -import org.apache.felix.framework.util.manifestparser.NativeLibrary; - -/* -import org.apache.felix.moduleloader.ICapability; -import org.apache.felix.moduleloader.IContent; -import org.apache.felix.moduleloader.IModule; -import org.apache.felix.moduleloader.IRequirement; -import org.apache.felix.moduleloader.IWire; -*/ -import org.apache.felix.framework.cache.Content; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.Version; -import org.osgi.service.condpermadmin.ConditionInfo; -import org.osgi.service.condpermadmin.ConditionalPermissionAdmin; -import org.osgi.service.condpermadmin.ConditionalPermissionInfo; -import org.osgi.service.condpermadmin.ConditionalPermissionUpdate; -import org.osgi.service.permissionadmin.PermissionInfo; - -/** - * An implementation of the ConditionalPermissionAdmin service that doesn't need - * to have a framework specific security manager set. It use the DomainGripper - * to know what bundleprotectiondomains are expected. - */ -public final class ConditionalPermissionAdminImpl implements - ConditionalPermissionAdmin -{ - private static class OrderedHashMap extends HashMap - { - private final List m_order = new ArrayList(); - - public Object put(Object key, Object value) - { - Object result = super.put(key, value); - if (result != value) - { - m_order.remove(key); - m_order.add(key); - } - return result; - }; - - public void putAll(Map map) - { - for (Iterator iter = map.entrySet().iterator(); iter.hasNext();) - { - Entry entry = (Entry) iter.next(); - put(entry.getKey(), entry.getValue()); - } - }; - - public Set keySet() - { - return new AbstractSet() - { - public Iterator iterator() - { - return m_order.iterator(); - } - - public int size() - { - return m_order.size(); - } - - }; - }; - - public Set entrySet() - { - return new AbstractSet() - { - - public Iterator iterator() - { - return new Iterator() - { - Iterator m_iter = m_order.iterator(); - - public boolean hasNext() - { - return m_iter.hasNext(); - } - - public Object next() - { - final Object key = m_iter.next(); - return new Entry() - { - - public Object getKey() - { - return key; - } - - public Object getValue() - { - return get(key); - } - - public Object setValue(Object arg0) - { - throw new IllegalStateException( - "Not Implemented"); - } - }; - } - - public void remove() - { - throw new IllegalStateException("Not Implemented"); - } - - }; - } - - public int size() - { - return m_order.size(); - } - - }; - }; - - public Collection values() - { - List result = new ArrayList(); - for (Iterator iter = m_order.iterator(); iter.hasNext();) - { - result.add(super.get(iter.next())); - } - return result; - }; - - public Object remove(Object key) - { - Object result = super.remove(key); - if (result != null) - { - m_order.remove(key); - } - return result; - }; - - public void clear() - { - super.clear(); - m_order.clear(); - }; - }; - - private static final ConditionInfo[] EMPTY_CONDITION_INFO = new ConditionInfo[0]; - private static final PermissionInfo[] EMPTY_PERMISSION_INFO = new PermissionInfo[0]; - private final Map m_condPermInfos = new OrderedHashMap(); - private final PropertiesCache m_propertiesCache; - private final Permissions m_permissions; - private final Conditions m_conditions; - private final LocalPermissions m_localPermissions; - private final PermissionAdminImpl m_pai; - - public ConditionalPermissionAdminImpl(Permissions permissions, - Conditions condtions, LocalPermissions localPermissions, - PropertiesCache cache, PermissionAdminImpl pai) throws IOException - { - m_propertiesCache = cache; - m_permissions = permissions; - m_conditions = condtions; - m_localPermissions = localPermissions; - Map old = new OrderedHashMap(); - // Now try to restore the cache. - m_propertiesCache.read(ConditionalPermissionInfoImpl.class, old); - for (Iterator iter = old.entrySet().iterator(); iter.hasNext();) - { - Entry entry = (Entry) iter.next(); - String name = (String) entry.getKey(); - ConditionalPermissionInfoImpl cpi = ((ConditionalPermissionInfoImpl) entry - .getValue()); - m_condPermInfos.put(name, new ConditionalPermissionInfoImpl(name, - cpi._getConditionInfos(), cpi._getPermissionInfos(), this, cpi - .isAllow())); - } - m_pai = pai; - } - - public ConditionalPermissionInfo addConditionalPermissionInfo( - ConditionInfo[] conditions, PermissionInfo[] permissions) - { - Object sm = System.getSecurityManager(); - if (sm != null) - { - ((SecurityManager) sm).checkPermission(Permissions.ALL_PERMISSION); - } - ConditionalPermissionInfoImpl result = new ConditionalPermissionInfoImpl( - notNull(conditions), notNull(permissions), this, true); - - return write(result.getName(), result); - } - - ConditionalPermissionInfoImpl write(String name, - ConditionalPermissionInfoImpl cpi) - { - synchronized (m_propertiesCache) - { - Map tmp = null; - - synchronized (m_condPermInfos) - { - tmp = new OrderedHashMap(); - tmp.putAll(m_condPermInfos); - - if ((name != null) && (cpi != null)) - { - m_condPermInfos.put(name, cpi); - } - else if (name != null) - { - m_condPermInfos.remove(name); - } - else - { - tmp = null; - } - } - - try - { - m_propertiesCache.write(m_condPermInfos); - } - catch (IOException ex) - { - synchronized (m_condPermInfos) - { - if (tmp != null) - { - m_condPermInfos.clear(); - m_condPermInfos.putAll(tmp); - } - } - ex.printStackTrace(); - throw new IllegalStateException(ex.getMessage()); - } - } - synchronized (m_condPermInfos) - { - return (ConditionalPermissionInfoImpl) m_condPermInfos.get(name); - } - } - - private static class FakeCert extends X509Certificate - { - private final Principal m_principal; - - public FakeCert(final String principal) - { - m_principal = new Principal() - { - public String getName() - { - return principal; - } - }; - } - - public void checkValidity() - throws java.security.cert.CertificateExpiredException, - java.security.cert.CertificateNotYetValidException - { - - } - - public void checkValidity(Date date) - throws java.security.cert.CertificateExpiredException, - java.security.cert.CertificateNotYetValidException - { - } - - public int getBasicConstraints() - { - return 0; - } - - public Principal getIssuerDN() - { - return null; - } - - public boolean[] getIssuerUniqueID() - { - return null; - } - - public boolean[] getKeyUsage() - { - return null; - } - - public Date getNotAfter() - { - return null; - } - - public Date getNotBefore() - { - return null; - } - - public BigInteger getSerialNumber() - { - return null; - } - - public String getSigAlgName() - { - return null; - } - - public String getSigAlgOID() - { - return null; - } - - public byte[] getSigAlgParams() - { - return null; - } - - public byte[] getSignature() - { - return null; - } - - public Principal getSubjectDN() - { - return m_principal; - } - - public boolean[] getSubjectUniqueID() - { - return null; - } - - public byte[] getTBSCertificate() - throws java.security.cert.CertificateEncodingException - { - return null; - } - - public int getVersion() - { - return 0; - } - - public byte[] getEncoded() - throws java.security.cert.CertificateEncodingException - { - return null; - } - - public PublicKey getPublicKey() - { - return null; - } - - public String toString() - { - return m_principal.getName(); - } - - public void verify(PublicKey key) - throws java.security.cert.CertificateException, - NoSuchAlgorithmException, InvalidKeyException, - NoSuchProviderException, SignatureException - { - - } - - public void verify(PublicKey key, String sigProvider) - throws java.security.cert.CertificateException, - NoSuchAlgorithmException, InvalidKeyException, - NoSuchProviderException, SignatureException - { - - } - - public Set getCriticalExtensionOIDs() - { - return null; - } - - public byte[] getExtensionValue(String arg0) - { - return null; - } - - public Set getNonCriticalExtensionOIDs() - { - return null; - } - - public boolean hasUnsupportedCriticalExtension() - { - return false; - } - - public boolean equals(Object o) - { - return this == o; - } - - public int hashCode() - { - return System.identityHashCode(this); - } - - } - - public AccessControlContext getAccessControlContext(final String[] signers) - { - Map certificates = new HashMap(); - for (int i = 0; i < signers.length; i++) - { - StringTokenizer tok = new StringTokenizer(signers[i], ";"); - List certsList = new ArrayList(); - while (tok.hasMoreTokens()) - { - certsList.add(tok.nextToken()); - } - String[] certs = (String[]) certsList.toArray(new String[certsList - .size()]); - - X509Certificate key = new FakeCert(certs[0]); - List certList = new ArrayList(); - certificates.put(key, certList); - certList.add(key); - for (int j = 1; j < certs.length; j++) - { - certList.add(new FakeCert(certs[j])); - } - } - final FakeBundle fake = new FakeBundle(certificates); - ProtectionDomain domain = new ProtectionDomain(null, null) - { - public boolean implies(Permission permission) - { - List posts = new ArrayList(); - Boolean result = m_pai.hasPermission("", fake, permission, - ConditionalPermissionAdminImpl.this, this, null); - if (result != null) - { - return result.booleanValue(); - } - if (eval(posts, new BundleRevisionImpl(fake, Long.toString(fake.getBundleId())), permission, m_pai)) - { - if (!posts.isEmpty()) - { - return m_conditions.evalRecursive(posts); - } - return true; - } - return false; - } - }; - return new AccessControlContext(new ProtectionDomain[] { domain }); - } - - public ConditionalPermissionInfo getConditionalPermissionInfo(String name) - { - if (name == null) - { - throw new IllegalArgumentException("Name may not be null"); - } - ConditionalPermissionInfoImpl result = null; - - synchronized (m_condPermInfos) - { - result = (ConditionalPermissionInfoImpl) m_condPermInfos.get(name); - } - - if (result == null) - { - result = new ConditionalPermissionInfoImpl(this, name, true); - - result = write(result.getName(), result); - } - - return result; - } - - public Enumeration getConditionalPermissionInfos() - { - synchronized (m_condPermInfos) - { - return Collections.enumeration(new ArrayList(m_condPermInfos - .values())); - } - } - - public ConditionalPermissionInfo setConditionalPermissionInfo(String name, - ConditionInfo[] conditions, PermissionInfo[] permissions) - { - Object sm = System.getSecurityManager(); - if (sm != null) - { - ((SecurityManager) sm).checkPermission(Permissions.ALL_PERMISSION); - } - - ConditionalPermissionInfoImpl result = null; - conditions = notNull(conditions); - permissions = notNull(permissions); - - if (name != null) - { - synchronized (m_condPermInfos) - { - result = (ConditionalPermissionInfoImpl) m_condPermInfos - .get(name); - - if (result == null) - { - result = new ConditionalPermissionInfoImpl(name, - conditions, permissions, this, true); - } - else - { - result.setConditionsAndPermissions(conditions, permissions); - } - } - } - else - { - result = new ConditionalPermissionInfoImpl(conditions, permissions, - this, true); - } - - return write(result.getName(), result); - } - - private PermissionInfo[] notNull(PermissionInfo[] permissions) - { - if (permissions == null) - { - return ConditionalPermissionInfoImpl.PERMISSION_INFO; - } - return (PermissionInfo[]) notNull((Object[]) permissions).toArray( - EMPTY_PERMISSION_INFO); - } - - private ConditionInfo[] notNull(ConditionInfo[] conditions) - { - if (conditions == null) - { - return ConditionalPermissionInfoImpl.CONDITION_INFO; - } - return (ConditionInfo[]) notNull((Object[]) conditions).toArray( - EMPTY_CONDITION_INFO); - } - - private List notNull(Object[] elements) - { - List result = new ArrayList(); - - for (int i = 0; i < elements.length; i++) - { - if (elements[i] != null) - { - result.add(elements[i]); - } - } - - return result; - } - - // The thread local stack used to keep track of bundle protection domains we - // still expect to see. - private final ThreadLocal m_stack = new ThreadLocal(); - - /** - * This method does the actual permission check. If it is not a direct check - * it will try to determine the other bundle domains that will follow - * automatically in case this is the first check in one permission check. If - * not then it will keep track of which domains we have already see. While - * it keeps track it builds up a list of postponed tuples which it will - * evaluate at the last domain. See the core spec 9.5.1 and following for a - * general description. - * - * @param felixBundle - * the bundle in question. - * @param loader - * the content loader of the bundle to get access to the jar to - * check for local permissions. - * @param root - * the bundle id. - * @param signers - * the signers (this is to support the ACC based on signers) - * @param pd - * the bundle protection domain - * @param permission - * the permission currently checked - * @param direct - * whether this is a direct check or not. direct check will not - * expect any further bundle domains on the stack - * @return true in case the permission is granted or there are postponed - * tuples false if not. Again, see the spec for more explanations. - */ - public boolean hasPermission(BundleRevisionImpl module, Content content, - ProtectionDomain pd, Permission permission, boolean direct, Object admin) - { - // System.out.println(felixBundle + "-" + permission); - List domains = null; - List tuples = null; - Object[] entry = null; - // first see whether this is the normal case (the special case is for - // the ACC based on signers). - // In case of a direct call we don't need to look for other pds - if (direct) - { - domains = new ArrayList(); - tuples = new ArrayList(); - domains.add(pd); - } - else - { - // Get the other pds from the stck - entry = (Object[]) m_stack.get(); - - // if there are none then get them from the gripper - if (entry == null) - { - entry = new Object[] { new ArrayList(DomainGripper.grab()), - new ArrayList() }; - } - else - { - m_stack.set(null); - } - - domains = (List) entry[0]; - tuples = (List) entry[1]; - if (!domains.contains(pd)) - { - // We have been called directly without the direct flag - domains.clear(); - domains.add(pd); - } - } - - // check the local permissions. they need to all the permission if there - // are any - if (!impliesLocal(module.getBundle(), content, permission)) - { - return false; - } - - List posts = new ArrayList(); - - boolean result = eval(posts, module, permission, admin); - - domains.remove(pd); - - // We postponed tuples - if (!posts.isEmpty()) - { - tuples.add(posts); - } - - // Are we at the end or this was a direct call? - if (domains.isEmpty()) - { - m_stack.set(null); - // Now eval the postponed tupels. if the previous eval did return - // false - // tuples will be empty so we don't return from here. - if (!tuples.isEmpty()) - { - return m_conditions.evalRecursive(tuples); - } - } - else - { - // this is to support recursive permission checks. In case we - // trigger - // a permission check while eval the stack is null until this point - m_stack.set(entry); - } - - return result; - } - - public boolean impliesLocal(Bundle felixBundle, Content content, - Permission permission) - { - return m_localPermissions.implies(content, felixBundle, permission); - } - - public boolean isEmpty() - { - synchronized (m_condPermInfos) - { - return m_condPermInfos.isEmpty(); - } - } - - // we need to find all conditions that apply and then check whether they - // de note the permission in question unless the conditions are postponed - // then we make sure their permissions imply the permission and add them - // to the list of posts. Return true in case we pass or have posts - // else falls and clear the posts first. - private boolean eval(List posts, BundleRevisionImpl module, Permission permission, - Object admin) - { - List condPermInfos = null; - - synchronized (m_condPermInfos) - { - if (isEmpty() && (admin == null)) - { - return true; - } - condPermInfos = new ArrayList(m_condPermInfos.values()); - } - - // Check for implicit permissions like access to file area - if (m_permissions.getPermissions( - m_permissions.getImplicit(module.getBundle())).implies(permission, - module.getBundle())) - { - return true; - } - List pls = new ArrayList(); - // now do the real thing - for (Iterator iter = condPermInfos.iterator(); iter.hasNext();) - { - ConditionalPermissionInfoImpl cpi = (ConditionalPermissionInfoImpl) iter - .next(); - - ConditionInfo[] conditions = cpi._getConditionInfos(); - - List currentPosts = new ArrayList(); - - Conditions conds = m_conditions.getConditions(module, conditions); - if (!conds.isSatisfied(currentPosts, m_permissions - .getPermissions(cpi._getPermissionInfos()), permission)) - { - continue; - } - - if (!m_permissions.getPermissions(cpi._getPermissionInfos()) - .implies(permission, null)) - { - continue; - } - - if (currentPosts.isEmpty()) - { - pls.add(new Object[] { cpi, null }); - break; - } - pls.add(new Object[] { cpi, currentPosts, conds }); - } - while (pls.size() > 1) - { - if (!((ConditionalPermissionInfoImpl) ((Object[]) pls.get(pls - .size() - 1))[0]).isAllow()) - { - pls.remove(pls.size() - 1); - } - else - { - break; - } - } - if (pls.size() == 1) - { - if (((Object[]) pls.get(0))[1] != null) - { - posts.add(pls.get(0)); - } - return ((ConditionalPermissionInfoImpl) ((Object[]) pls.get(0))[0]) - .isAllow(); - } - for (Iterator iter = pls.iterator(); iter.hasNext();) - { - posts.add(iter.next()); - } - return !posts.isEmpty(); - } - - public ConditionalPermissionInfo newConditionalPermissionInfo( - String encodedConditionalPermissionInfo) - { - return new ConditionalPermissionInfoImpl( - encodedConditionalPermissionInfo); - } - - public ConditionalPermissionInfo newConditionalPermissionInfo(String name, - ConditionInfo[] conditions, PermissionInfo[] permissions, String access) - { - return new ConditionalPermissionInfoImpl(name, conditions, permissions, - ConditionalPermissionAdminImpl.this, access - .equals(ConditionalPermissionInfo.ALLOW)); - } - - public ConditionalPermissionUpdate newConditionalPermissionUpdate() - { - return new ConditionalPermissionUpdate() - { - List current = null; - List out = null; - { - synchronized (m_condPermInfos) - { - current = new ArrayList(m_condPermInfos.values()); - out = new ArrayList(m_condPermInfos.values()); - } - } - - public boolean commit() - { - Object sm = System.getSecurityManager(); - if (sm != null) - { - ((SecurityManager) sm).checkPermission(Permissions.ALL_PERMISSION); - } - - synchronized (m_condPermInfos) - { - if (current.equals(new ArrayList(m_condPermInfos.values()))) - { - m_condPermInfos.clear(); - write(null, null); - for (Iterator iter = out.iterator(); iter.hasNext();) - { - ConditionalPermissionInfoImpl cpii = (ConditionalPermissionInfoImpl) iter - .next(); - write(cpii.getName(), cpii); - } - } - else - { - return false; - } - } - return true; - } - - public List getConditionalPermissionInfos() - { - return out; - } - }; - } - - public boolean handlePAHandle(BundleProtectionDomain pd) - { - Object[] entry = (Object[]) m_stack.get(); - - if (entry == null) - { - entry = new Object[] { new ArrayList(DomainGripper.grab()), - new ArrayList() }; - } - - ((List) entry[0]).remove(pd); - if (((List) entry[0]).isEmpty()) - { - m_stack.set(null); - if (!((List) entry[1]).isEmpty()) - { - return m_conditions.evalRecursive(((List) entry[1])); - } - } - else - { - m_stack.set(entry); - } - - return true; - } - - public void clearPD() - { - m_stack.set(null); - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionInfoImpl.java b/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionInfoImpl.java deleted file mode 100644 index 102ace18a1..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/ConditionalPermissionInfoImpl.java +++ /dev/null @@ -1,486 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.condpermadmin; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.StringTokenizer; - -import org.apache.felix.framework.security.util.Permissions; -import org.osgi.service.condpermadmin.ConditionInfo; -import org.osgi.service.condpermadmin.ConditionalPermissionInfo; -import org.osgi.service.permissionadmin.PermissionInfo; - -/** - * Simple storage class for condperminfos. Additionally, this class can be used - * to encode and decode infos. - */ -public final class ConditionalPermissionInfoImpl implements - ConditionalPermissionInfo -{ - private static final Random RANDOM = new Random(); - static final ConditionInfo[] CONDITION_INFO = new ConditionInfo[0]; - static final PermissionInfo[] PERMISSION_INFO = new PermissionInfo[0]; - private final Object m_lock = new Object(); - private final String m_name; - private final boolean m_allow; - private volatile ConditionalPermissionAdminImpl m_cpai; - private ConditionInfo[] m_conditions; - private PermissionInfo[] m_permissions; - - private int parseConditionInfo(char[] encoded, int idx, List conditions) { - String type; - String[] args; - try { - int pos = idx; - - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - - /* the first character must be '[' */ - if (encoded[pos] != '[') { - throw new IllegalArgumentException("expecting open bracket"); - } - pos++; - - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - - /* type is not quoted or encoded */ - int begin = pos; - while (!Character.isWhitespace(encoded[pos]) - && (encoded[pos] != ']')) { - pos++; - } - if (pos == begin || encoded[begin] == '"') { - throw new IllegalArgumentException("expecting type"); - } - type = new String(encoded, begin, pos - begin); - - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - - /* type may be followed by args which are quoted and encoded */ - ArrayList argsList = new ArrayList(); - while (encoded[pos] == '"') { - pos++; - begin = pos; - while (encoded[pos] != '"') { - if (encoded[pos] == '\\') { - pos++; - } - pos++; - } - argsList.add(unescapeString(encoded, begin, pos)); - pos++; - - if (Character.isWhitespace(encoded[pos])) { - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - } - } - args = (String[]) argsList - .toArray(new String[argsList.size()]); - - /* the final character must be ']' */ - char c = encoded[pos++]; - if (c != ']') { - throw new IllegalArgumentException("expecting close bracket"); - } - conditions.add(new ConditionInfo(type, args)); - return pos; - } - catch (ArrayIndexOutOfBoundsException e) { - throw new IllegalArgumentException("parsing terminated abruptly"); - } - } - - private int parsePermissionInfo(char[] encoded, int idx, List permissions) - { - String parsedType = null; - String parsedName = null; - String parsedActions = null; - try { - int pos = idx; - - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - - /* the first character must be '(' */ - if (encoded[pos] != '(') { - throw new IllegalArgumentException("expecting open parenthesis"); - } - pos++; - - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - - /* type is not quoted or encoded */ - int begin = pos; - while (!Character.isWhitespace(encoded[pos]) - && (encoded[pos] != ')')) { - pos++; - } - if (pos == begin || encoded[begin] == '"') { - throw new IllegalArgumentException("expecting type"); - } - parsedType = new String(encoded, begin, pos - begin); - - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - - /* type may be followed by name which is quoted and encoded */ - if (encoded[pos] == '"') { - pos++; - begin = pos; - while (encoded[pos] != '"') { - if (encoded[pos] == '\\') { - pos++; - } - pos++; - } - parsedName = unescapeString(encoded, begin, pos); - pos++; - - if (Character.isWhitespace(encoded[pos])) { - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - - /* - * name may be followed by actions which is quoted and - * encoded - */ - if (encoded[pos] == '"') { - pos++; - begin = pos; - while (encoded[pos] != '"') { - if (encoded[pos] == '\\') { - pos++; - } - pos++; - } - parsedActions = unescapeString(encoded, begin, pos); - pos++; - - /* skip whitespace */ - while (Character.isWhitespace(encoded[pos])) { - pos++; - } - } - } - } - - /* the final character must be ')' */ - char c = encoded[pos++]; - if (c != ')') { - throw new IllegalArgumentException( - "expecting close parenthesis"); - } - permissions.add(new PermissionInfo(parsedType,parsedName, parsedActions)); - return pos; - } - catch (ArrayIndexOutOfBoundsException e) { - throw new IllegalArgumentException("parsing terminated abruptly"); - } - } - /** - * Takes an encoded character array and decodes it into a new String. - */ - private static String unescapeString(char[] str, int begin, int end) { - StringBuffer output = new StringBuffer(end - begin); - for (int i = begin; i < end; i++) { - char c = str[i]; - if (c == '\\') { - i++; - if (i < end) { - c = str[i]; - switch (c) { - case '"' : - case '\\' : - break; - case 'r' : - c = '\r'; - break; - case 'n' : - c = '\n'; - break; - default : - c = '\\'; - i--; - break; - } - } - } - output.append(c); - } - - return output.toString(); - } - - public ConditionalPermissionInfoImpl(String encoded) - { - encoded = encoded.trim(); - String toUpper = encoded.toUpperCase(); - if (!(toUpper.startsWith("ALLOW {") || toUpper.startsWith("DENY {"))) - { - throw new IllegalArgumentException(); - } - m_allow = toUpper.startsWith("ALLOW {"); - m_cpai = null; - List conditions = new ArrayList(); - List permissions = new ArrayList(); - try { - char[] chars = encoded.substring((m_allow ? "ALLOW {".length() : "DENY {".length())).toCharArray(); - int idx = 0; - while (idx < chars.length) - { - if (Character.isWhitespace(chars[idx])) { - idx++; - } - else if (chars[idx] == '[') - { - idx = parseConditionInfo(chars, idx, conditions); - } - else if (chars[idx] == '(') - { - idx = parsePermissionInfo(chars, idx, permissions); - } - else - { - if (chars[idx] != '}') - { - throw new IllegalArgumentException("Expected } but was: " + chars[idx]); - } - idx++; - break; - } - } - while (Character.isWhitespace(chars[idx])) { - idx++; - } - if (chars[idx] == '"') { - idx++; - int begin = idx; - while (chars[idx] != '"') { - if (chars[idx] == '\\') { - idx++; - } - idx++; - } - m_name = unescapeString(chars, begin, idx); - } - else { - m_name = Long.toString(RANDOM.nextLong() ^ System.currentTimeMillis()); - } - } catch (ArrayIndexOutOfBoundsException ex) { - ex.printStackTrace(); - throw new IllegalArgumentException("Unable to parse conditional permission info: " + ex.getMessage()); - } - m_conditions = conditions.isEmpty() ? CONDITION_INFO - : (ConditionInfo[]) conditions.toArray(new ConditionInfo[conditions - .size()]); - m_permissions = permissions.isEmpty() ? PERMISSION_INFO - : (PermissionInfo[]) permissions - .toArray(new PermissionInfo[permissions.size()]); - } - - public ConditionalPermissionInfoImpl(ConditionalPermissionAdminImpl cpai, - String name, boolean access) - { - m_allow = access; - m_name = name; - m_cpai = cpai; - m_conditions = CONDITION_INFO; - m_permissions = PERMISSION_INFO; - } - - public ConditionalPermissionInfoImpl(ConditionInfo[] conditions, - PermissionInfo[] permisions, ConditionalPermissionAdminImpl cpai, - boolean access) - { - m_allow = access; - m_name = Long.toString(RANDOM.nextLong() ^ System.currentTimeMillis()); - m_cpai = cpai; - m_conditions = conditions == null ? CONDITION_INFO : conditions; - m_permissions = permisions == null ? PERMISSION_INFO : permisions; - } - - public ConditionalPermissionInfoImpl(String name, - ConditionInfo[] conditions, PermissionInfo[] permisions, - ConditionalPermissionAdminImpl cpai, boolean access) - { - m_allow = access; - m_name = (name != null) ? name : Long.toString(RANDOM.nextLong() - ^ System.currentTimeMillis()); - m_conditions = conditions == null ? CONDITION_INFO : conditions; - m_permissions = permisions == null ? PERMISSION_INFO : permisions; - m_cpai = cpai; - } - - public void delete() - { - Object sm = System.getSecurityManager(); - if (sm != null) - { - ((SecurityManager) sm).checkPermission(Permissions.ALL_PERMISSION); - } - - synchronized (m_lock) - { - m_cpai.write(m_name, null); - m_conditions = CONDITION_INFO; - m_permissions = PERMISSION_INFO; - } - } - - public ConditionInfo[] getConditionInfos() - { - synchronized (m_lock) - { - return (ConditionInfo[]) m_conditions.clone(); - } - } - - ConditionInfo[] _getConditionInfos() - { - synchronized (m_lock) - { - return m_conditions; - } - } - - void setConditionsAndPermissions(ConditionInfo[] conditions, - PermissionInfo[] permissions) - { - synchronized (m_lock) - { - m_conditions = conditions; - m_permissions = permissions; - } - } - - public String getName() - { - return m_name; - } - - public PermissionInfo[] getPermissionInfos() - { - synchronized (m_lock) - { - return (PermissionInfo[]) m_permissions.clone(); - } - } - - PermissionInfo[] _getPermissionInfos() - { - synchronized (m_lock) - { - return m_permissions; - } - } - - public String getEncoded() - { - StringBuffer buffer = new StringBuffer(); - buffer.append(m_allow ? "ALLOW " : "DENY "); - buffer.append('{'); - buffer.append(' '); - synchronized (m_lock) - { - writeTo(m_conditions, buffer); - writeTo(m_permissions, buffer); - } - buffer.append('}'); - buffer.append(' '); - buffer.append('"'); - escapeString(m_name, buffer); - buffer.append('"'); - return buffer.toString(); - } - - /** - * This escapes the quotes, backslashes, \n, and \r in the string using a - * backslash and appends the newly escaped string to a StringBuffer. - */ - private static void escapeString(String str, StringBuffer output) { - int len = str.length(); - for (int i = 0; i < len; i++) { - char c = str.charAt(i); - switch (c) { - case '"' : - case '\\' : - output.append('\\'); - output.append(c); - break; - case '\r' : - output.append("\\r"); - break; - case '\n' : - output.append("\\n"); - break; - default : - output.append(c); - break; - } - } - } - - private void writeTo(Object[] elements, StringBuffer buffer) - { - for (int i = 0; i < elements.length; i++) - { - buffer.append(elements[i]); - buffer.append(' '); - } - } - - public String toString() - { - return getEncoded(); - } - - public String getAccessDecision() - { - return m_allow ? ConditionalPermissionInfo.ALLOW - : ConditionalPermissionInfo.DENY; - } - - public boolean isAllow() - { - return m_allow; - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/DomainGripper.java b/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/DomainGripper.java deleted file mode 100644 index c9c299f789..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/condpermadmin/DomainGripper.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.condpermadmin; - -import java.security.AccessControlContext; -import java.security.AccessController; -import java.security.AllPermission; -import java.security.DomainCombiner; -import java.security.Permission; -import java.security.PrivilegedAction; -import java.security.ProtectionDomain; -import java.util.ArrayList; -import java.util.List; - -import org.apache.felix.framework.BundleProtectionDomain; - -/** - * This class is a hack to get all BundleProtectionDomains currently on the - * security stack. This way we don't need to have our own security manager set. - */ -final class DomainGripper implements DomainCombiner, PrivilegedAction -{ - private static final ProtectionDomain[] ALL_PERMISSION_PD = new ProtectionDomain[] { new ProtectionDomain( - null, null) - { - public boolean implies(Permission perm) - { - return true; - } - } }; - - // A per thread cache of DomainGripper objects. We might want to wrap them - // in a softreference eventually - private static final ThreadLocal m_cache = new ThreadLocal(); - - private static final Permission ALL_PERMISSION = new AllPermission(); - - private final List m_domains = new ArrayList(); - - private AccessControlContext m_system = null; - - /** - * Get all bundle protection domains and add them to the m_domains. Then - * return the ALL_PERMISSION_PD. - */ - public ProtectionDomain[] combine(ProtectionDomain[] current, - ProtectionDomain[] assigned) - { - filter(current, m_domains); - filter(assigned, m_domains); - - return ALL_PERMISSION_PD; - } - - private void filter(ProtectionDomain[] assigned, List domains) - { - if (assigned != null) - { - for (int i = 0; i < assigned.length; i++) - { - if ((assigned[i].getClass() == BundleProtectionDomain.class) - && !domains.contains(assigned[i])) - { - domains.add(assigned[i]); - } - } - } - } - - /** - * Get the current bundle protection domains on the stack up to the last - * privileged call. - */ - public static List grab() - { - // First try to get a cached version. We cache by thread. - DomainGripper gripper = (DomainGripper) m_cache.get(); - if (gripper == null) - { - // there is none so create one and cache it - gripper = new DomainGripper(); - m_cache.set(gripper); - } - else - { - // This thread has a cached version so prepare it - gripper.m_domains.clear(); - } - - // Get the current context. - gripper.m_system = AccessController.getContext(); - - // and merge it with the current combiner (i.e., gripper) - AccessControlContext context = (AccessControlContext) AccessController - .doPrivileged(gripper); - - gripper.m_system = null; - - // now get the protection domains - AccessController.doPrivileged(gripper, context); - - // and return them - return gripper.m_domains; - } - - public Object run() - { - // this is a call to merge with the current context. - if (m_system != null) - { - return new AccessControlContext(m_system, this); - } - - // this is a call to get the protection domains. - AccessController.checkPermission(ALL_PERMISSION); - return null; - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/permissionadmin/PermissionAdminImpl.java b/framework.security/src/main/java/org/apache/felix/framework/security/permissionadmin/PermissionAdminImpl.java deleted file mode 100644 index 92617d812f..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/permissionadmin/PermissionAdminImpl.java +++ /dev/null @@ -1,296 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.permissionadmin; - -import java.io.IOException; -import java.security.AllPermission; -import java.security.Permission; -import java.security.ProtectionDomain; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.felix.framework.security.condpermadmin.ConditionalPermissionAdminImpl; -import org.apache.felix.framework.security.util.Permissions; -import org.apache.felix.framework.security.util.PropertiesCache; - -//import org.apache.felix.moduleloader.IContent; -import org.apache.felix.framework.cache.Content; - -import org.osgi.framework.Bundle; -import org.osgi.service.permissionadmin.PermissionAdmin; -import org.osgi.service.permissionadmin.PermissionInfo; - -/** - * This class is a relatively straight forward implementation of the - * PermissionAdmin service. The only somewhat involved thing is that it respects - * the presents of a conditionalpermissionadmin service as per spec. - */ -// TODO: Do we need this class at all or can we just emulate it using the -// condpermadmin? -public final class PermissionAdminImpl implements PermissionAdmin -{ - private static final PermissionInfo[] ALL_PERMISSION = new PermissionInfo[] { new PermissionInfo( - AllPermission.class.getName(), "", "") }; - - private final Map m_store = new HashMap(); - - private final PropertiesCache m_cache; - - private final Permissions m_permissions; - - private PermissionInfo[] m_default = null; - - public PermissionAdminImpl(Permissions permissions, PropertiesCache cache) - throws IOException - { - m_permissions = permissions; - m_cache = cache; - m_cache.read(PermissionInfo[].class, m_store); - } - - public PermissionInfo[] getDefaultPermissions() - { - synchronized (m_store) - { - if (m_default == null) - { - return null; - } - return (PermissionInfo[]) m_default.clone(); - } - } - - public synchronized String[] getLocations() - { - synchronized (m_store) - { - if (m_store.isEmpty()) - { - return null; - } - - return (String[]) m_store.keySet().toArray( - new String[m_store.size()]); - } - } - - public PermissionInfo[] getPermissions(String location) - { - synchronized (m_store) - { - if (m_store.containsKey(location)) - { - return (PermissionInfo[]) ((PermissionInfo[]) m_store - .get(location)).clone(); - } - return null; - } - } - - /** - * This will do the actual permission check as described in the core spec - * 10.2 It will respect a present condpermadmin service as described in - * 9.10. - * - * @param location - * the location of the bundle. - * @param bundle - * the bundle in question. - * @param permission - * the permission to check. - * @param cpai - * A condpermadmin if one is present else null. - * @param pd - * the protectiondomain - * @return Boolean.TRUE if the location is bound and the permission is - * granted or if there is no cpa and the default permissions imply - * the permission Boolean.FALSE otherwise unless the location is not - * bound and their is a cpa in which case null is returned. - */ - public Boolean hasPermission(String location, Bundle bundle, - Permission permission, ConditionalPermissionAdminImpl cpai, - ProtectionDomain pd, Content content) - { - PermissionInfo[] permissions = null; - PermissionInfo[] defaults = null; - boolean contains = false; - synchronized (m_store) - { - contains = m_store.containsKey(location); - permissions = (PermissionInfo[]) m_store.get(location); - defaults = m_default; - } - if (contains) - { - if (check(permissions, permission, bundle)) - { - return Boolean.TRUE; - } - return check(m_permissions.getImplicit(bundle), permission, bundle) ? Boolean.TRUE - : Boolean.FALSE; - } - else if (cpai == null - || (cpai.isEmpty() && cpai - .impliesLocal(bundle, content, permission))) - { - if (defaults != null) - { - if (check(defaults, permission, null)) - { - return Boolean.TRUE; - } - return check(m_permissions.getImplicit(bundle), permission, - bundle) ? Boolean.TRUE : Boolean.FALSE; - } - else - { - return Boolean.TRUE; - } - } - else - { - return null; - } - } - - private boolean check(PermissionInfo[] permissions, Permission permission, - Bundle bundle) - { - Permissions permissionsObject = m_permissions - .getPermissions(permissions); - - return permissionsObject.implies(permission, bundle); - } - - public void setDefaultPermissions(PermissionInfo[] permissions) - { - Object sm = System.getSecurityManager(); - if (sm != null) - { - ((SecurityManager) sm).checkPermission(Permissions.ALL_PERMISSION); - } - - synchronized (m_cache) - { - PermissionInfo[] def = null; - Map store = null; - synchronized (m_store) - { - def = m_default; - store = new HashMap(m_store); - - m_default = (permissions != null) ? notNull(permissions) : null; - } - - try - { - m_cache.write(setDefaults(store, def)); - } - catch (IOException ex) - { - synchronized (m_store) - { - m_default = def; - } - - ex.printStackTrace(); - // TODO: log this - throw new IllegalStateException(ex.getMessage()); - } - } - } - - public void setPermissions(String location, PermissionInfo[] permissions) - { - Object sm = System.getSecurityManager(); - if (sm != null) - { - ((SecurityManager) sm).checkPermission(Permissions.ALL_PERMISSION); - } - - synchronized (m_cache) - { - if (location != null) - { - Map store = null; - Map storeCopy = null; - PermissionInfo[] def = null; - synchronized (m_store) - { - storeCopy = new HashMap(m_store); - if (permissions != null) - { - m_store.put(location, notNull(permissions)); - } - else - { - m_store.remove(location); - } - store = new HashMap(m_store); - } - try - { - m_cache.write(setDefaults(store, def)); - } - catch (IOException ex) - { - synchronized (m_store) - { - m_store.clear(); - m_store.putAll(storeCopy); - } - - ex.printStackTrace(); - // TODO: log this - throw new IllegalStateException(ex.getMessage()); - } - } - } - } - - private Map setDefaults(Map store, PermissionInfo[] def) - { - if (def != null) - { - store.put("DEFAULT", def); - } - else - { - store.remove("DEFAULT"); - } - return store; - } - - private PermissionInfo[] notNull(PermissionInfo[] permissions) - { - List result = new ArrayList(); - - for (int i = 0; i < permissions.length; i++) - { - if (permissions[i] != null) - { - result.add(permissions[i]); - } - } - return (PermissionInfo[]) result.toArray(new PermissionInfo[result - .size()]); - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java b/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java deleted file mode 100644 index bb78d662c9..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/util/BundleInputStream.java +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.util; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.jar.JarEntry; -import java.util.jar.JarOutputStream; - -//import org.apache.felix.moduleloader.IContent; -import org.apache.felix.framework.cache.Content; - -/** - * This class makes a given content available as a inputstream with a jar - * content. In other words the stream can be used as input to a JarInputStream. - */ -public final class BundleInputStream extends InputStream -{ - private final Content m_root; - private final Enumeration m_content; - private final OutputStreamBuffer m_outputBuffer = new OutputStreamBuffer(); - - private ByteArrayInputStream m_buffer = null; - private JarOutputStream m_output = null; - - private static final String DUMMY_ENTRY = "__DUMMY-ENTRY__/"; - - public BundleInputStream(Content root) throws IOException - { - m_root = root; - - List entries = new ArrayList(); - - int count = 0; - boolean inMetaInf = true; - String manifest = null; - for (Enumeration e = m_root.getEntries(); e.hasMoreElements();) - { - String entry = (String) e.nextElement(); - if (entry.endsWith("/")) - { - // ignore - } - else if (entry.equalsIgnoreCase("META-INF/MANIFEST.MF")) - { - if (manifest == null) - { - manifest = entry; - } - } - else if (entry.toUpperCase().startsWith("META-INF/") - && entry.indexOf('/', "META-INF/".length()) < 0) - { - entries.add(count++, entry); - } - else - { - entries.add(entry); - } - } - entries.add(count++, DUMMY_ENTRY); - if (manifest == null) - { - manifest = "META-INF/MANIFEST.MF"; - } - m_content = Collections.enumeration(entries); - - try - { - m_output = new JarOutputStream(m_outputBuffer); - readNext(manifest); - m_buffer = new ByteArrayInputStream(m_outputBuffer.m_outBuffer - .toByteArray()); - - m_outputBuffer.m_outBuffer = null; - } - catch (IOException ex) - { - // TODO: figure out what is wrong - ex.printStackTrace(); - throw ex; - } - } - - public int read() throws IOException - { - if ((m_output == null) && (m_buffer == null)) - { - return -1; - } - - if (m_buffer != null) - { - int result = m_buffer.read(); - - if (result == -1) - { - m_buffer = null; - return read(); - } - - return result; - } - - if (m_content.hasMoreElements()) - { - String current = (String) m_content.nextElement(); - - readNext(current); - - if (!m_content.hasMoreElements()) - { - m_output.close(); - m_output = null; - } - - m_buffer = new ByteArrayInputStream(m_outputBuffer.m_outBuffer - .toByteArray()); - - m_outputBuffer.m_outBuffer = null; - } - else - { - m_output.close(); - m_output = null; - } - - return read(); - } - - private void readNext(String path) throws IOException - { - m_outputBuffer.m_outBuffer = new ByteArrayOutputStream(); - - if (path == DUMMY_ENTRY) - { - JarEntry entry = new JarEntry(path); - - m_output.putNextEntry(entry); - } - else - { - InputStream in = null; - try - { - in = m_root.getEntryAsStream(path); - - if (in == null) - { - throw new IOException("Missing entry"); - } - - JarEntry entry = new JarEntry(path); - - m_output.putNextEntry(entry); - - byte[] buffer = new byte[4 * 1024]; - - for (int c = in.read(buffer); c != -1; c = in.read(buffer)) - { - m_output.write(buffer, 0, c); - } - } - finally - { - if (in != null) - { - try - { - in.close(); - } - catch (Exception ex) - { - // Not much we can do - } - } - } - } - - m_output.closeEntry(); - - m_output.flush(); - } - - private static final class OutputStreamBuffer extends OutputStream - { - ByteArrayOutputStream m_outBuffer = null; - - public void write(int b) - { - m_outBuffer.write(b); - } - - public void write(byte[] buffer) throws IOException - { - m_outBuffer.write(buffer); - } - - public void write(byte[] buffer, int offset, int length) - { - m_outBuffer.write(buffer, offset, length); - } - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/util/Conditions.java b/framework.security/src/main/java/org/apache/felix/framework/security/util/Conditions.java deleted file mode 100644 index 739576cb24..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/util/Conditions.java +++ /dev/null @@ -1,404 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.util; - -import java.security.Permission; -import java.util.Dictionary; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; - -import org.apache.felix.framework.BundleRevisionImpl; -import org.apache.felix.framework.security.condpermadmin.ConditionalPermissionInfoImpl; -import org.apache.felix.framework.util.SecureAction; -import org.osgi.framework.Bundle; -import org.osgi.service.condpermadmin.Condition; -import org.osgi.service.condpermadmin.ConditionInfo; - -/** - * This class caches conditions instances by their infos. Furthermore, it allows - * to eval postponed condition permission tuples as per spec (see 9.45). - */ -public final class Conditions -{ - private static final ThreadLocal m_conditionStack = new ThreadLocal(); - private static final Map m_conditionCache = new HashMap(); - - private final Map m_cache = new WeakHashMap(); - - private final BundleRevisionImpl m_module; - - private final ConditionInfo[] m_conditionInfos; - private final Condition[] m_conditions; - private final SecureAction m_action; - - public Conditions(SecureAction action) - { - this(null, null, action); - } - - private Conditions(BundleRevisionImpl module, ConditionInfo[] conditionInfos, - SecureAction action) - { - m_module = module; - m_conditionInfos = conditionInfos; - if ((module != null) && (conditionInfos != null)) - { - synchronized (m_conditionCache) - { - Map conditionMap = (Map) m_conditionCache.get(module); - if (conditionMap == null) - { - conditionMap = new HashMap(); - conditionMap.put(m_conditionInfos, - new Condition[m_conditionInfos.length]); - m_conditionCache.put(module, conditionMap); - } - Condition[] conditions = (Condition[]) conditionMap - .get(m_conditionInfos); - if (conditions == null) - { - conditions = new Condition[m_conditionInfos.length]; - conditionMap.put(m_conditionInfos, conditions); - } - m_conditions = conditions; - } - } - else - { - m_conditions = null; - } - m_action = action; - } - - public Conditions getConditions(BundleRevisionImpl key, ConditionInfo[] conditions) - { - Conditions result = null; - Map index = null; - synchronized (m_cache) - { - index = (Map) m_cache.get(conditions); - if (index == null) - { - index = new HashMap(); - m_cache.put(conditions, index); - } - } - synchronized (index) - { - if (key != null) - { - result = (Conditions) index.get(key); - } - if (result == null) - { - result = new Conditions(key, conditions, m_action); - index.put(key, result); - } - } - - return result; - } - - public void remove(BundleRevisionImpl key) { - final Map conditionMap; - synchronized (m_conditionCache) - { - conditionMap = (Map) m_conditionCache.remove(key); - } - - if (conditionMap != null) - { - final Iterator iter = conditionMap.keySet().iterator(); - if (iter.hasNext()) - { - synchronized (m_cache) - { - do - { - final Map index = (Map) m_cache.get(iter.next()); - if (index != null) - { - index.remove(key); - } - } - while (iter.hasNext()); - } - } - } - } - - // See whether the given list is satisfied or not - public boolean isSatisfied(List posts, Permissions permissions, - Permission permission) - { - if (m_conditionInfos == null) - { - return true; - } - boolean check = true; - for (int i = 0; i < m_conditionInfos.length; i++) - { - if (m_module == null) - { - // TODO: check whether this is correct! - break; - } - try - { - Condition condition = null; - boolean add = false; - Class clazz = Class.forName(m_conditionInfos[i].getType()); - - synchronized (m_conditions) - { - if (m_conditions[i] == null) - { - m_conditions[i] = createCondition(m_module.getBundle(), - clazz, m_conditionInfos[i]); - } - condition = m_conditions[i]; - } - - Object current = m_conditionStack.get(); - if (current != null) - { - if (current instanceof HashSet) - { - if (((HashSet) current).contains(clazz)) - { - return false; - } - } - else - { - if (current == clazz) - { - return false; - } - } - } - - if (condition.isPostponed()) - { - if (check && !permissions.implies(permission, null)) - { - return false; - } - else - { - check = false; - } - posts.add(new Object[] { condition, new Integer(i) }); - } - else - { - - if (current == null) - { - m_conditionStack.set(clazz); - } - else - { - if (current instanceof HashSet) - { - if (((HashSet) current).contains(clazz)) - { - return false; - } - ((HashSet) current).add(clazz); - } - else - { - if (current == clazz) - { - return false; - } - HashSet frame = new HashSet(); - frame.add(current); - frame.add(clazz); - m_conditionStack.set(frame); - current = frame; - } - } - try - { - boolean mutable = condition.isMutable(); - boolean result = condition.isSatisfied(); - - if (!mutable - && ((condition != Condition.TRUE) && (condition != Condition.FALSE))) - { - synchronized (m_conditions) - { - m_conditions[i] = result ? Condition.TRUE - : Condition.FALSE; - } - } - if (!result) - { - return false; - } - } - finally - { - if (current == null) - { - m_conditionStack.set(null); - } - else - { - ((HashSet) current).remove(clazz); - if (((HashSet) current).isEmpty()) - { - m_conditionStack.set(null); - } - } - } - } - } - catch (Exception e) - { - // TODO: log this as per spec - e.printStackTrace(); - return false; - } - } - return true; - } - - public boolean evalRecursive(List entries) - { - Map contexts = new HashMap(); - outer: for (Iterator iter = entries.iterator(); iter.hasNext();) - { - List tuples = (List) iter.next(); - inner: for (Iterator inner = tuples.iterator(); inner.hasNext();) - { - Object[] entry = (Object[]) inner.next(); - List conditions = (List) entry[1]; - if (conditions == null) - { - if (!((ConditionalPermissionInfoImpl) entry[0]).isAllow()) - { - return false; - } - continue outer; - } - for (Iterator iter2 = conditions.iterator(); iter2.hasNext();) - { - Object[] condEntry = (Object[]) iter2.next(); - Condition cond = (Condition) condEntry[0]; - Dictionary context = (Dictionary) contexts.get(cond - .getClass()); - if (context == null) - { - context = new Hashtable(); - contexts.put(cond.getClass(), context); - } - Object current = m_conditionStack.get(); - if (current == null) - { - m_conditionStack.set(cond.getClass()); - } - else - { - if (current instanceof HashSet) - { - ((HashSet) current).add(cond.getClass()); - } - else - { - HashSet frame = new HashSet(); - frame.add(current); - frame.add(cond.getClass()); - m_conditionStack.set(frame); - current = frame; - } - } - boolean result; - boolean mutable = cond.isMutable(); - try - { - result = cond.isSatisfied(new Condition[] { cond }, - context); - } - finally - { - if (current == null) - { - m_conditionStack.set(null); - } - else - { - ((HashSet) current).remove(cond.getClass()); - if (((HashSet) current).isEmpty()) - { - m_conditionStack.set(null); - } - } - } - if (!mutable && (cond != Condition.TRUE) - && (cond != Condition.FALSE)) - { - synchronized (((Conditions) entry[2]).m_conditions) - { - ((Conditions) entry[2]).m_conditions[((Integer) condEntry[1]) - .intValue()] = result ? Condition.TRUE - : Condition.FALSE; - } - } - if (!result) - { - continue inner; - } - } - if (!((ConditionalPermissionInfoImpl) entry[0]).isAllow()) - { - return false; - } - continue outer; - } - return false; - } - return true; - } - - private Condition createCondition(final Bundle bundle, final Class clazz, - final ConditionInfo info) throws Exception - { - try - { - return (Condition) m_action.getMethod(clazz, "getCondition", - new Class[] { Bundle.class, ConditionInfo.class }).invoke(null, - new Object[] { bundle, info }); - } - catch (Exception ex) - { - ex.printStackTrace(); - return (Condition) m_action.getConstructor(clazz, - new Class[] { Bundle.class, ConditionInfo.class }).newInstance( - new Object[] { bundle, info }); - } - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/util/LocalPermissions.java b/framework.security/src/main/java/org/apache/felix/framework/security/util/LocalPermissions.java deleted file mode 100644 index 4f921c30d3..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/util/LocalPermissions.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.util; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.security.AllPermission; -import java.security.Permission; -import java.util.ArrayList; -import java.util.Map; -import java.util.WeakHashMap; - -//import org.apache.felix.moduleloader.IContent; -import org.apache.felix.framework.cache.Content; -import org.osgi.framework.Bundle; -import org.osgi.service.permissionadmin.PermissionInfo; - -/** - * A cache for local permissions. Local permissions are read from a given bundle - * and cached for later lookup. See core spec 9.2.1. - */ -// TODO: maybe use bundle events to clean thing up or weak/soft references -public final class LocalPermissions -{ - private static final PermissionInfo[] ALL_PERMISSION = new PermissionInfo[] { new PermissionInfo( - AllPermission.class.getName(), "", "") }; - - private final Map m_cache = new WeakHashMap(); - private final Permissions m_permissions; - - public LocalPermissions(Permissions permissions) throws IOException - { - m_permissions = permissions; - } - - /** - * Return true in case that the given permission is implied by the local - * permissions of the given bundle or if there are none otherwise, false. - * See core spec 9.2.1. - * - * @param root - * the root to use for cacheing as a key - * @param loader - * the loader to get the content of the bundle from - * @param bundle - * the bundle in quesiton - * @param permission - * the permission to check - * @return true if implied by local permissions. - */ - public boolean implies(Content content, Bundle bundle, - Permission permission) - { - PermissionInfo[] permissions = null; - - synchronized (m_cache) - { - if (!m_cache.containsKey(content)) - { - InputStream in = null; - try - { - in = content.getEntryAsStream("OSGI-INF/permissions.perm"); - if (in != null) - { - ArrayList perms = new ArrayList(); - - BufferedReader reader = new BufferedReader( - new InputStreamReader(in, "UTF-8")); - for (String line = reader.readLine(); line != null; line = reader - .readLine()) - { - String trim = line.trim(); - if (trim.startsWith("#") || trim.startsWith("//") - || (trim.length() == 0)) - { - continue; - } - perms.add(new PermissionInfo(line)); - } - - permissions = (PermissionInfo[]) perms - .toArray(new PermissionInfo[perms.size()]); - } - } - catch (Exception ex) - { - } - finally - { - if (in != null) - { - try - { - in.close(); - } - catch (IOException ex) - { - // TODO Auto-generated catch block - ex.printStackTrace(); - } - } - } - - if (permissions == null) - { - permissions = ALL_PERMISSION; - } - - m_cache.put(content, permissions); - } - else - { - permissions = (PermissionInfo[]) m_cache.get(content); - } - } - - return m_permissions.getPermissions(permissions).implies(permission, - bundle); - } -} diff --git a/framework.security/src/main/java/org/apache/felix/framework/security/util/Permissions.java b/framework.security/src/main/java/org/apache/felix/framework/security/util/Permissions.java deleted file mode 100644 index df971594bd..0000000000 --- a/framework.security/src/main/java/org/apache/felix/framework/security/util/Permissions.java +++ /dev/null @@ -1,634 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.felix.framework.security.util; - -import java.io.File; -import java.io.FilePermission; -import java.lang.ref.ReferenceQueue; -import java.lang.ref.SoftReference; -import java.lang.ref.WeakReference; -import java.security.AccessController; -import java.security.AllPermission; -import java.security.Permission; -import java.security.PermissionCollection; -import java.security.PrivilegedAction; -import java.util.Arrays; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.PropertyPermission; - -import org.apache.felix.framework.util.SecureAction; -import org.osgi.framework.AdminPermission; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.CapabilityPermission; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.PackagePermission; -import org.osgi.framework.ServicePermission; -import org.osgi.framework.ServiceReference; -import org.osgi.service.packageadmin.ExportedPackage; -import org.osgi.service.packageadmin.PackageAdmin; -import org.osgi.service.permissionadmin.PermissionInfo; - -/** - * A permission cache that uses permission infos as keys. Permission are - * created from the parent classloader or any exported package. - */ -// TODO: maybe use bundle events instead of soft/weak references -public final class Permissions -{ - private static final ClassLoader m_classLoader = Permissions.class - .getClassLoader(); - - private static final Map m_permissionCache = new HashMap(); - private static final Map m_permissions = new HashMap(); - private static final ReferenceQueue m_permissionsQueue = new ReferenceQueue(); - - private static final ThreadLocal m_stack = new ThreadLocal(); - - private final Map m_cache; - private final ReferenceQueue m_queue; - private final BundleContext m_context; - private final PermissionInfo[] m_permissionInfos; - private final boolean m_allPermission; - private final SecureAction m_action; - - public static final AllPermission ALL_PERMISSION = new AllPermission(); - - private static final PermissionInfo[] IMPLICIT = new PermissionInfo[] { new PermissionInfo( - FilePermission.class.getName(), "-", "read,write,delete") }; - - Permissions(PermissionInfo[] permissionInfos, BundleContext context, - SecureAction action) - { - m_context = context; - m_permissionInfos = permissionInfos; - m_cache = new HashMap(); - m_queue = new ReferenceQueue(); - m_action = action; - for (int i = 0; i < m_permissionInfos.length; i++) - { - if (m_permissionInfos[i].getType().equals( - AllPermission.class.getName())) - { - m_allPermission = true; - return; - } - } - m_allPermission = false; - } - - public Permissions(BundleContext context, SecureAction action) - { - m_context = context; - m_permissionInfos = null; - m_cache = null; - m_queue = null; - m_allPermission = true; - m_action = action; - } - - public PermissionInfo[] getImplicit(Bundle bundle) - { - return new PermissionInfo[] { - IMPLICIT[0], - new PermissionInfo(PropertyPermission.class.getName(), "org.osgi.framework.*", "read"), - new PermissionInfo( - AdminPermission.class.getName(), - "(id=" + bundle.getBundleId() + ")", - AdminPermission.CLASS + "," + AdminPermission.METADATA + "," + AdminPermission.RESOURCE + "," + AdminPermission.CONTEXT), - new PermissionInfo(CapabilityPermission.class.getName(), "(|(capability.namespace=osgi.ee)(capability.namespace=osgi.native))", CapabilityPermission.REQUIRE), - new PermissionInfo(PackagePermission.class.getName(),"(package.name=java.*)",PackagePermission.IMPORT), - new PermissionInfo(ServicePermission.class.getName(),"org.osgi.service.condition.Condition", ServicePermission.GET) - }; - } - - public Permissions getPermissions(PermissionInfo[] permissionInfos) - { - cleanUp(m_permissionsQueue, m_permissions); - - Permissions result; - synchronized (m_permissions) - { - result = (Permissions) m_permissions.get(new Entry(permissionInfos)); - if (result == null) - { - //permissionInfos may not be referenced by the new Permissions, as - //otherwise the reference in m_permissions prevents the key from - //being garbage collectable. - PermissionInfo[] permissionInfosClone = new PermissionInfo[permissionInfos.length]; - System.arraycopy(permissionInfos, 0, permissionInfosClone, 0, permissionInfos.length); - result = new Permissions(permissionInfosClone, m_context, m_action); - m_permissions.put( - new Entry(permissionInfos, m_permissionsQueue), result); - } - } - return result; - } - - private static final class Entry extends WeakReference - { - private final int m_hashCode; - - // Replace with Arrays.hashCode(Object[]) by supporting Java 5+. - private static int hashCode(Object[] array) - { - int hash = 0; - for (int i = 0; i < array.length; ++i) - { - Object element = array[i]; - hash = hash * 31 + ((element == null) ? 0 : element.hashCode()); - } - return hash; - } - - Entry(Object entry, ReferenceQueue queue) - { - super(entry, queue); - m_hashCode = entry instanceof Object[] ? hashCode((Object[]) entry): entry.hashCode(); - } - - Entry(Object entry) - { - this(entry, null); - } - - public int hashCode() - { - return m_hashCode; - } - - public boolean equals(Object o) - { - if (o == null) - { - return false; - } - - if (o == this) - { - return true; - } - - final Object entry = get(); - - if (o instanceof Entry) - { - - final Object otherEntry = ((Entry) o).get(); - if (entry == null) - { - return otherEntry == null; - } - if (otherEntry == null) - { - return false; - } - if (!entry.getClass().equals(otherEntry.getClass())) - { - return false; - } - if (entry instanceof Object[]) - { - return Arrays.equals((Object[])entry, (Object[])otherEntry); - } - return entry.equals(otherEntry); - } - else - { - return false; - } - } - } - - private static final class DefaultPermissionCollection extends - PermissionCollection - { - private final Map m_perms = new HashMap(); - - public void add(Permission perm) - { - synchronized (m_perms) - { - m_perms.put(perm, perm); - } - } - - public Enumeration elements() - { - throw new IllegalStateException("Not implemented"); - } - - public boolean implies(Permission perm) - { - Map perms = null; - - synchronized (m_perms) - { - perms = m_perms; - } - - Permission permission = (Permission) perms.get(perm); - - if ((permission != null) && permission.implies(perm)) - { - return true; - } - - for (Iterator iter = perms.values().iterator(); iter.hasNext();) - { - Permission current = (Permission) iter.next(); - if ((current != null) && (current != permission) - && current.implies(perm)) - { - return true; - } - } - return false; - } - } - - private void cleanUp(ReferenceQueue queue, Map cache) - { - for (Entry entry = (Entry) queue.poll(); entry != null; entry = (Entry) queue - .poll()) - { - synchronized (cache) - { - cache.remove(entry); - } - } - } - - /** - * @param target - * the permission to be implied - * @param bundle - * if not null then allow implicit permissions like file access - * to local data area - * @return true if the permission is implied by this permissions object. - */ - public boolean implies(Permission target, final Bundle bundle) - { - if (m_allPermission) - { - return true; - } - - Class targetClass = target.getClass(); - - cleanUp(m_queue, m_cache); - - if ((bundle != null) && targetClass == FilePermission.class) - { - for (int i = 0; i < m_permissionInfos.length; i++) - { - if (m_permissionInfos[i].getType().equals( - FilePermission.class.getName())) - { - String postfix = ""; - String name = m_permissionInfos[i].getName(); - if (!"<null for all
* @param expr Filter Criteria or null
@@ -3944,36 +3870,9 @@ ServiceReference[] getAllowedServiceReferences(
BundleImpl bundle, String className, String expr, boolean checkAssignable)
throws InvalidSyntaxException
{
- ServiceReference[] refs = getServiceReferences(bundle, className, expr, checkAssignable);
-
- Object sm = System.getSecurityManager();
-
- if ((sm == null) || (refs == null))
- {
- return refs;
- }
-
- List- * This is a utility class to centralize all action that should be performed - * in a doPrivileged() block. To perform a secure action, simply - * create an instance of this class and use the specific method to perform - * the desired action. When an instance is created, this class will capture - * the security context and will then use that context when checking for - * permission to perform the action. Instances of this class should not be - * passed around since they may grant the receiver a capability to perform - * privileged actions. + * This is a utility class centralizing the I/O, reflection and class loading + * operations performed by the framework. + *
+ *+ * Historically every method here wrapped its operation in a + * doPrivileged() block against a captured security context. Java SE 24 + * permanently disabled the Security Manager (JEP 486), so those blocks no longer + * had any effect and have been removed; each method now performs its operation + * directly. The class is retained as the framework's single point of access for + * these operations. *
**/ public class SecureAction @@ -110,144 +108,31 @@ public class SecureAction getAccessor(URL.class); } - private static final ThreadLocal