Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 38610 invoked from network); 12 Apr 2005 21:38:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Apr 2005 21:38:29 -0000 Received: (qmail 57283 invoked by uid 500); 12 Apr 2005 21:38:25 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 57244 invoked by uid 500); 12 Apr 2005 21:38:25 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 57226 invoked by uid 99); 12 Apr 2005 21:38:24 -0000 X-ASF-Spam-Status: No, hits=-8.2 required=10.0 tests=ALL_TRUSTED,RCVD_IN_NJABL_DUL,RCVD_IN_SORBS_DUL X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from ss53.shared.server-system.net (HELO ss53.shared.server-system.net) (72.10.34.2) by apache.org (qpsmtpd/0.28) with ESMTP; Tue, 12 Apr 2005 14:38:23 -0700 Received: from [127.0.0.1] (cpe-66-108-84-172.nyc.res.rr.com [66.108.84.172]) (authenticated (0 bits)) by ss53.shared.server-system.net (8.11.6/8.11.6) with ESMTP id j3CLcLN01559 for ; Tue, 12 Apr 2005 14:38:21 -0700 Message-ID: <425C3FBD.8020103@toolazydogs.com> Date: Tue, 12 Apr 2005 17:38:05 -0400 From: "Alan D. Cabrera" User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: dev@geronimo.apache.org Subject: Re: svn commit: r161124 - geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java References: <20050412213256.37067.qmail@minotaur.apache.org> <425C3F1E.7040305@apache.org> In-Reply-To: <425C3F1E.7040305@apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Doh! Jeremy Boynes wrote: > We shouldn't log the passwords. > > -- > Jeremy > > adc@apache.org wrote: > >> Author: adc >> Date: Tue Apr 12 14:32:56 2005 >> New Revision: 161124 >> >> URL: http://svn.apache.org/viewcvs?view=rev&rev=161124 >> Log: >> Better logging. >> >> Modified: >> >> geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java >> >> >> Modified: >> geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java >> >> URL: >> http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java?view=diff&r1=161123&r2=161124 >> >> ============================================================================== >> >> --- >> geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java >> (original) >> +++ >> geronimo/trunk/modules/security/src/java/org/apache/geronimo/security/SecurityServiceImpl.java >> Tue Apr 12 14:32:56 2005 >> @@ -42,8 +42,6 @@ >> >> public static boolean POLICY_INSTALLED = false; >> >> - private final ServerInfo serverInfo; >> - >> private final Log log = >> LogFactory.getLog(SecurityServiceImpl.class); >> >> /** >> @@ -54,9 +52,8 @@ >> public SecurityServiceImpl(ClassLoader classLoader, ServerInfo >> serverInfo, String policyConfigurationFactory, >> String policyProvider, String >> keyStore, String keyStorePassword, >> String trustStore, String >> trustStorePassword) >> - throws PolicyContextException, ClassNotFoundException, >> IllegalAccessException, InstantiationException { >> - >> - this.serverInfo = serverInfo; >> + throws PolicyContextException, ClassNotFoundException, >> IllegalAccessException, InstantiationException >> + { >> >> /** >> * @see "JSR 115 4.6.1" Container Subject Policy Context >> Handler >> @@ -81,14 +78,16 @@ >> if (policyConfigurationFactory != null) >> PolicyConfigurationFactory.getPolicyConfigurationFactory(); >> >> - if (keyStore != null) >> - keyStore = sysOverRide(serverInfo.resolvePath(keyStore), >> KEYSTORE); >> - sysOverRide(keyStorePassword, KEYSTORE_PASSWORD); >> - >> - if (trustStore != null) >> - trustStore = >> sysOverRide(serverInfo.resolvePath(trustStore), TRUSTSTORE); >> - sysOverRide(trustStore, TRUSTSTORE); >> - sysOverRide(trustStorePassword, TRUSTSTORE_PASSWORD); >> + if (keyStore != null) >> sysOverRide(serverInfo.resolvePath(keyStore), KEYSTORE); >> + if (keyStorePassword != null) sysOverRide(keyStorePassword, >> KEYSTORE_PASSWORD); >> + >> + if (trustStore != null) >> sysOverRide(serverInfo.resolvePath(trustStore), TRUSTSTORE); >> + if (trustStorePassword != null) >> sysOverRide(trustStorePassword, TRUSTSTORE_PASSWORD); >> + >> + log.info(KEYSTORE + ": " + System.getProperty(KEYSTORE)); >> + log.info(KEYSTORE_PASSWORD + ": " + >> System.getProperty(KEYSTORE_PASSWORD)); >> + log.info(TRUSTSTORE + ": " + System.getProperty(TRUSTSTORE)); >> + log.info(TRUSTSTORE_PASSWORD + ": " + >> System.getProperty(TRUSTSTORE_PASSWORD)); >> >> log.info("JACC factory registered"); >> } >> >>