Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BDC2611FA2 for ; Tue, 22 Jul 2014 23:55:57 +0000 (UTC) Received: (qmail 80262 invoked by uid 500); 22 Jul 2014 23:55:57 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 80235 invoked by uid 500); 22 Jul 2014 23:55:57 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 80226 invoked by uid 99); 22 Jul 2014 23:55:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2014 23:55:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jul 2014 23:55:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A25C23889D5; Tue, 22 Jul 2014 23:55:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1612730 - /logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java Date: Tue, 22 Jul 2014 23:55:34 -0000 To: commits@logging.apache.org From: mattsicker@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140722235534.5A25C23889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mattsicker Date: Tue Jul 22 23:55:33 2014 New Revision: 1612730 URL: http://svn.apache.org/r1612730 Log: Add security check for accessing BundleWiring class through adapt(). Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java Modified: logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java?rev=1612730&r1=1612729&r2=1612730&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java (original) +++ logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java Tue Jul 22 23:55:33 2014 @@ -21,6 +21,7 @@ import java.security.Permission; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.status.StatusLogger; +import org.osgi.framework.AdaptPermission; import org.osgi.framework.AdminPermission; import org.osgi.framework.Bundle; import org.osgi.framework.BundleActivator; @@ -56,6 +57,7 @@ public class Activator implements Bundle final URL url = bundle.getEntry(ProviderUtil.PROVIDER_RESOURCE); if (url != null) { checkPermission(new AdminPermission(bundle, AdminPermission.CLASS)); + checkPermission(new AdaptPermission(BundleWiring.class.getName(), bundle, AdaptPermission.ADAPT)); ProviderUtil.loadProvider(url, getBundleClassLoader(bundle)); } } catch (final Exception e) {