Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 63459 invoked from network); 17 Jul 2009 17:52:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Jul 2009 17:52:05 -0000 Received: (qmail 67499 invoked by uid 500); 17 Jul 2009 17:53:11 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 67429 invoked by uid 500); 17 Jul 2009 17:53:11 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 67420 invoked by uid 99); 17 Jul 2009 17:53:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2009 17:53:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 17 Jul 2009 17:53:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 95F6B23888E3; Fri, 17 Jul 2009 17:52:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r795168 - in /geronimo/server/trunk/plugins: j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/ tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/ Date: Fri, 17 Jul 2009 17:52:48 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090717175248.95F6B23888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Fri Jul 17 17:52:48 2009 New Revision: 795168 URL: http://svn.apache.org/viewvc?rev=795168&view=rev Log: GERONIMO-4748 Make sure default subject is set on the thread if there is any security configuration at all Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/WebContextConfig.java Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=795168&r1=795167&r2=795168&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Fri Jul 17 17:52:48 2009 @@ -333,6 +333,8 @@ if (!hasSecurityRealmName) { throw new DeploymentException("web.xml for web app " + module.getName() + " includes security elements but Geronimo deployment plan is not provided or does not contain element necessary to configure security accordingly."); } + } + if (hasSecurityRealmName) { earContext.setHasSecurity(true); } //TODO think about how to provide a default security realm name Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java?rev=795168&r1=795167&r2=795168&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/BaseGeronimoContextConfig.java Fri Jul 17 17:52:48 2009 @@ -100,12 +100,9 @@ authenticator = new DigestAuthenticator(loginService, realmName, unauthenticatedIdentity); } else if ("FORM".equalsIgnoreCase(authMethod)) { authenticator = new FormAuthenticator(loginService, unauthenticatedIdentity, loginPage, errorPage); - } else if ("NONE".equalsIgnoreCase(authMethod)) { + } else { authenticator = new NoneAuthenticator(unauthenticatedIdentity); } - if (authenticator == null) { - throw new IllegalStateException("No authenticator configured"); - } AccessControlContext defaultAcc = ContextManager.registerSubjectShort(defaultSubject, null, null); Authorizer authorizer = new JACCAuthorizer(defaultAcc); Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/WebContextConfig.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/WebContextConfig.java?rev=795168&r1=795167&r2=795168&view=diff ============================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/WebContextConfig.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/WebContextConfig.java Fri Jul 17 17:52:48 2009 @@ -36,11 +36,13 @@ if (geronimoContext.isAuthenticatorInstalled()) { return; } - SecurityConstraint constraints[] = context.findConstraints(); - if ((constraints == null) || (constraints.length == 0)) { + if (geronimoContext.getDefaultSubject() == null) { return; } LoginConfig loginConfig = context.getLoginConfig(); + if (loginConfig == null) { + loginConfig = new LoginConfig(); + } String authMethod = loginConfig.getAuthMethod(); String realmName = loginConfig.getRealmName(); String loginPage = loginConfig.getLoginPage();