svn commit: r497379 - /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java

[pero]

Author: pero
Date: Thu Jan 18 01:52:25 2007
New Revision: 497379

URL: http://svn.apache.org/viewvc?view=rev&rev=497379
Log:
Refactor and remove some duplicate code.

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java?view=diff&rev=497379&r1=497378&r2=497379
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
 Thu Jan 18 01:52:25 2007
@@ -51,6 +51,8 @@
  * 
  *
  * @author Fabien Carrion
+ * @author Peter Rossbach
+ * @version $Revision:$ $Date:$
  */
 
 public class ClusterSingleSignOn
@@ -178,20 +180,7 @@
  * @param session Session to be associated
  */
 protected void associate(String ssoId, Session session) {
-if (cluster != null) {
-messageNumber++;
-SingleSignOnMessage msg =
-new SingleSignOnMessage(cluster.getLocalMember(),
-ssoId, session.getId());
-Manager mgr = session.getManager();
-if ((mgr != null) && (mgr instanceof ClusterManager))
-msg.setContextName(((ClusterManager) mgr).getName());
-msg.setAction(SingleSignOnMessage.ADD_SESSION);
-cluster.sendClusterDomain(msg);
-if (containerLog.isDebugEnabled())
-containerLog.debug("SingleSignOnMessage Send with action "
-+ msg.getAction());
-}
+sendSSOId(ssoId,session,SingleSignOnMessage.ADD_SESSION) ;
 associateLocal(ssoId, session);
 
 }
@@ -210,21 +199,8 @@
  * @param session Session to be deregistered
  */
 protected void deregister(String ssoId, Session session) {
-if (cluster != null) {
-messageNumber++;
-SingleSignOnMessage msg =
-new SingleSignOnMessage(cluster.getLocalMember(),
-ssoId, session.getId());
-Manager mgr = session.getManager();
-if ((mgr != null) && (mgr instanceof ClusterManager))
-msg.setContextName(((ClusterManager) mgr).getName());
-msg.setAction(SingleSignOnMessage.DEREGISTER_SESSION);
-cluster.sendClusterDomain(msg);
-if (containerLog.isDebugEnabled())
-containerLog.debug("SingleSignOnMessage Send with action "
-  + msg.getAction());
-}
-deregisterLocal(ssoId, session);
+   sendSSOId(ssoId,session,SingleSignOnMessage.DEREGISTER_SESSION) ;
+   deregisterLocal(ssoId, session);
 }
 
 protected void deregisterLocal(String ssoId, Session session) {
@@ -240,17 +216,7 @@
  * @param ssoId Single sign on identifier to deregister
  */
 protected void deregister(String ssoId) {
-if (cluster != null) {
-messageNumber++;
-SingleSignOnMessage msg =
-new SingleSignOnMessage(cluster.getLocalMember(),
-ssoId, null);
-msg.setAction(SingleSignOnMessage.LOGOUT_SESSION);
-cluster.sendClusterDomain(msg);
-if (containerLog.isDebugEnabled())
-containerLog.debug("SingleSignOnMessage Send with action "
-+ msg.getAction());
-}
+sendSSOId(ssoId,null,SingleSignOnMessage.LOGOUT_SESSION) ;
 deregisterLocal(ssoId);
 }
 
@@ -272,21 +238,10 @@
  */
 protected void register(String ssoId, Principal principal, String authType,
   String username, String password) {
-   if (cluster != null) {
-   messageNumber++;
-   SingleSignOnMessage msg =
-   new SingleSignOnMessage(cluster.getLocalMember(),
-   ssoId, null);
-   msg.setAction(SingleSignOnMessage.REGISTER_SESSION);
-   msg.setAuthType(authType);
-   msg.setUsername(username);
-   msg.setPassword(password);
-   cluster.sendClusterDomain(msg);
-   if (containerLog.isDebugEnabled())
-   containerLog.debug("SingleSignOnMessage Send with action "
-  + msg.getAction());
-   }
-   registerLocal(ssoId, principal, authType, username, password);
+sendSSOIdWithAuth(ssoId,
+authType, username, password,
+SingleSignOnMessage.REGISTER_SESSION);
+   registerLocal(ssoId, principal, authType, username, password);

svn commit: r497380 - in /tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator: ClusterSingleSignOn.java ClusterSingleSignOnListener.java SingleSignOnMessage.ja

[pero]

Author: pero
Date: Thu Jan 18 01:58:51 2007
New Revision: 497380

URL: http://svn.apache.org/viewvc?view=rev&rev=497380
Log:
add correct svn props

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
   (props changed)

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
   (props changed)

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java
   (props changed)

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml
   (props changed)

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
--
svn:eol-style = native

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
--
svn:keywords = Author Date Id Revision

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
--
svn:eol-style = native

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOnListener.java
--
svn:keywords = Author Date Id Revision

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java
--
svn:eol-style = native

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java
--
svn:keywords = Author Date Id Revision

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml
--
svn:eol-style = native

Propchange: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/mbeans-descriptors.xml
--
svn:keywords = Author Date Id Revision



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Build with Maven?

[Tim Funk]

There has been no desire to use maven to build tomcat.

Actually - there was interest but the answer turned to a quick no. See 
the mail list archives for details. (Many months ago)


-Tim

Ole Ersoy wrote:

Hi,

Does anyone know if there is a Maven build available
for Tomcat and whether there is any interest in
building Tomcat with Maven?


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[VOTE] Release build 6.0.8 as alpha

[Remy Maucherat]

http://people.apache.org/~remm/tomcat-6/v6.0.8/

Votes ?

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.8 as alpha

[Mark Thomas]

Remy Maucherat wrote:
> http://people.apache.org/~remm/tomcat-6/v6.0.8/
> 
> Votes ?

+1

Mark

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Build with Maven?

[Yoav Shapira]

Hi,
I was one of the people who said no, based on some investigations and
attempts at the time.  I have to say Maven 2 is eons better than Maven
1 -- I wouldn't be as quick to -1 the idea now, though I don't have
the bandwidth to +1 the effort.

Yoav

On 1/18/07, Tim Funk <[EMAIL PROTECTED]> wrote:

There has been no desire to use maven to build tomcat.

Actually - there was interest but the answer turned to a quick no. See
the mail list archives for details. (Many months ago)

-Tim

Ole Ersoy wrote:
> Hi,
>
> Does anyone know if there is a Maven build available
> for Tomcat and whether there is any interest in
> building Tomcat with Maven?

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.8 as alpha

[Filip Hanik - Dev Lists]

+1
Filip

Mark Thomas wrote:

Remy Maucherat wrote:
  

http://people.apache.org/~remm/tomcat-6/v6.0.8/

Votes ?



+1

Mark

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



  



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.8 as alpha

[Jim Jagielski]

On Jan 18, 2007, at 6:53 AM, Remy Maucherat wrote:


http://people.apache.org/~remm/tomcat-6/v6.0.8/

Votes ?


+1


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.8 as alpha

[Martin Dubuc]

+1

On 1/18/07, Remy Maucherat <[EMAIL PROTECTED]> wrote:

http://people.apache.org/~remm/tomcat-6/v6.0.8/

Votes ?

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 41401] New: - StandardService.getConnectorNames returns array of nulls.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41401

   Summary: StandardService.getConnectorNames returns array of
nulls.
   Product: Tomcat 5
   Version: Nightly Build
  Platform: Other
OS/Version: other
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


StandardService.getConnectorNames returns an array of nulls. The implementation
creates an array of the right size, but the body of the for loop that should
populate the array does nothing.
Easily verified if you look at the ConnectorNames property of the
Catalina:type=Service,serviceName=Catalina mbean.
I've seen it while running 5.5.12 and still see the problem in the 5.5.20 
sources.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Build with Maven?

[Ole Ersoy]

Hi Yoav,

Terrific - I have the bandwith...hopefully - so I
think I'll give it a shot.  I'm interested mainly
because it makes creating signed and verified FHS
compliant installs easy on UNIXes (I.e. combined with
Maven Archiva, etc. + best practices around the use of
Maven dependencies...a plugin I'm writing).

I have a proposal for this floating around on the
maven dev and codehaus dev list, centering around
this.  I'll be glad to send out a copy if anyone else
here is interested.

I also think it will be nice to be able to run a lot
of the Maven plugins on the build, for reporting, etc.

Cheers,
- Ole






--- Yoav Shapira <[EMAIL PROTECTED]> wrote:

> Hi,
> I was one of the people who said no, based on some
> investigations and
> attempts at the time.  I have to say Maven 2 is eons
> better than Maven
> 1 -- I wouldn't be as quick to -1 the idea now,
> though I don't have
> the bandwidth to +1 the effort.
> 
> Yoav
> 
> On 1/18/07, Tim Funk <[EMAIL PROTECTED]> wrote:
> > There has been no desire to use maven to build
> tomcat.
> >
> > Actually - there was interest but the answer
> turned to a quick no. See
> > the mail list archives for details. (Many months
> ago)
> >
> > -Tim
> >
> > Ole Ersoy wrote:
> > > Hi,
> > >
> > > Does anyone know if there is a Maven build
> available
> > > for Tomcat and whether there is any interest in
> > > building Tomcat with Maven?
> >
> >
>
-
> > To unsubscribe, e-mail:
> [EMAIL PROTECTED]
> > For additional commands, e-mail:
> [EMAIL PROTECTED]
> >
> >
> 
>
-
> To unsubscribe, e-mail:
> [EMAIL PROTECTED]
> For additional commands, e-mail:
> [EMAIL PROTECTED]
> 
> 



 

Never miss an email again!
Yahoo! Toolbar alerts you the instant new Mail arrives.
http://tools.search.yahoo.com/toolbar/features/mail/

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: [VOTE] Release build 6.0.8 as alpha

[Peter Rossbach]

+1

Peter

Am 18.01.2007 um 12:53 schrieb Remy Maucherat:


http://people.apache.org/~remm/tomcat-6/v6.0.8/

Votes ?

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 32048] - antiJARLocking antiResourceLocking do nothing

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=32048





--- Additional Comments From [EMAIL PROTECTED]  2007-01-18 07:40 ---
I would also like to report, in case anyone else stumbles across this bug, that
I hit the same problem but in tomcat 5.5.17.  The environment in my case is
Windows XP, struts 1.3.5, Tomcat 5.5.17, and the library that is locked is
struts-core-1.3.5.jar

so if this bug disappeared in version 5.5.7 then it came back.  and it's not
just me  http://comments.gmane.org/gmane.comp.jakarta.tomcat.user/133414

By the way, i tried the antiJARLocking attribute and it didnt work but
antiResourceLocking did (again for information purposes).  I would also agree
that the manager application shouldnt report that the application undeployed OK,
because it clearly didnt.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r497499 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/core/StandardService.java catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml webapps/docs/cha

[pero]

Author: pero
Date: Thu Jan 18 08:59:32 2007
New Revision: 497499

URL: http://svn.apache.org/viewvc?view=rev&rev=497499
Log:
StandardService.getConnectorNames() return array of Connector JMX objectnames.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java?view=diff&rev=497499&r1=497498&r2=497499
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardService.java
 Thu Jan 18 08:59:32 2007
@@ -281,10 +281,7 @@
 public ObjectName[] getConnectorNames() {
 ObjectName results[] = new ObjectName[connectors.length];
 for( int i=0; ihttp://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml?view=diff&rev=497499&r1=497498&r2=497499
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/mbeans-descriptors.xml
 Thu Jan 18 08:59:32 2007
@@ -589,6 +589,11 @@
  description="Connector object"
  type="org.apache.catalina.connector.Connector"/>
 
+
+
 
 
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=497499&r1=497498&r2=497499
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jan 18 08:59:32 2007
@@ -18,6 +18,10 @@
   
 
   
+41401: StandardService.getConnectorNames() return array of 
+Connector JMX objectnames. (pero)
+  
+  
 29727: If env-entry values in web.xml are changed then
 ensure new values are applied when context is reloaded. (markt)
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 41401] - StandardService.getConnectorNames returns array of nulls.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41401


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2007-01-18 09:02 ---
Hups, new Tomcat 5.5 Connector can report there ObjectName.

Many thanks to report this
Peter

Fix at revision 497499.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r497501 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java modules/cluster/src/share/org/apache/catalina/cluster/authenticator/Clus

[pero]

Author: pero
Date: Thu Jan 18 09:11:59 2007
New Revision: 497501

URL: http://svn.apache.org/viewvc?view=rev&rev=497501
Log:
Don't send a SSO ADD_SESSION event to cluster nodes after every auth request.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java?view=diff&rev=497501&r1=497500&r2=497501
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
 Thu Jan 18 09:11:59 2007
@@ -116,6 +116,21 @@
 }
 
 /**
+ * Is Session associated with this SSO?
+ *
+ * @param sso   The SingleSignOn valve that is managing
+ *  the SSO session.
+ * @return session exists
+ */
+public synchronized boolean sessionExists(Session session) {
+for (int i = 0; i < sessions.length; i++) {
+if (session == sessions[i])
+return true;
+}
+return false ;
+}
+
+/**
  * Gets the name of the authentication type originally used to authenticate
  * the user associated with the SSO.
  *

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java?view=diff&rev=497501&r1=497500&r2=497501
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/authenticator/ClusterSingleSignOn.java
 Thu Jan 18 09:11:59 2007
@@ -29,6 +29,7 @@
 import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
 import org.apache.catalina.authenticator.SingleSignOn;
+import org.apache.catalina.authenticator.SingleSignOnEntry;
 import org.apache.catalina.cluster.CatalinaCluster;
 import org.apache.catalina.cluster.ClusterManager;
 import org.apache.catalina.cluster.ClusterValve;
@@ -52,7 +53,7 @@
  *
  * @author Fabien Carrion
  * @author Peter Rossbach
- * @version $Revision:$ $Date:$
+ * @version $Revision$ $Date$
  */
 
 public class ClusterSingleSignOn
@@ -180,9 +181,15 @@
  * @param session Session to be associated
  */
 protected void associate(String ssoId, Session session) {
-sendSSOId(ssoId,session,SingleSignOnMessage.ADD_SESSION) ;
-associateLocal(ssoId, session);
-
+boolean addSession = true ;
+SingleSignOnEntry entry = lookup(ssoId);
+if (entry != null) {
+addSession = !entry.sessionExists(session);
+}
+if(addSession) {
+sendSSOId(ssoId,session,SingleSignOnMessage.ADD_SESSION) ;
+associateLocal(ssoId, session);
+}
 }
 
 protected void associateLocal(String ssoId, Session session) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r497516 - in /tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java InternalAprInputBuffer.java

[remm]

Author: remm
Date: Thu Jan 18 09:58:17 2007
New Revision: 497516

URL: http://svn.apache.org/viewvc?view=rev&rev=497516
Log:
- 37869: Refix getting certificates.
- 40960: Throw a timeout exception when getting a timeout.
- Submitted by Christophe Pierret.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?view=diff&rev=497516&r1=497515&r2=497516
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
Thu Jan 18 09:58:17 2007
@@ -1130,46 +1130,33 @@
 // Cipher suite
 Object sslO = SSLSocket.getInfoS(socket, 
SSL.SSL_INFO_CIPHER);
 if (sslO != null) {
-request.setAttribute
-(AprEndpoint.CIPHER_SUITE_KEY, sslO);
+request.setAttribute(AprEndpoint.CIPHER_SUITE_KEY, 
sslO);
 }
-// Client certificate chain if present
+// Get client certificate and the certificate chain if 
present
 int certLength = SSLSocket.getInfoI(socket, 
SSL.SSL_INFO_CLIENT_CERT_CHAIN);
+byte[] clientCert = SSLSocket.getInfoB(socket, 
SSL.SSL_INFO_CLIENT_CERT);
 X509Certificate[] certs = null;
-if (certLength > 0) {
-certs = new X509Certificate[certLength];
+if (clientCert != null) {
+certs = new X509Certificate[certLength + 1];
+CertificateFactory cf = 
CertificateFactory.getInstance("X.509");
+certs[0] = (X509Certificate) 
cf.generateCertificate(new ByteArrayInputStream(clientCert));
 for (int i = 0; i < certLength; i++) {
 byte[] data = SSLSocket.getInfoB(socket, 
SSL.SSL_INFO_CLIENT_CERT_CHAIN + i);
-CertificateFactory cf =
-CertificateFactory.getInstance("X.509");
-ByteArrayInputStream stream = new 
ByteArrayInputStream(data);
-certs[i] = (X509Certificate) 
cf.generateCertificate(stream);
-}
-} else if (certLength == 0) {
-byte[] data = SSLSocket.getInfoB(socket, 
SSL.SSL_INFO_CLIENT_CERT);
-if (data != null) {
-certs = new X509Certificate[1];
-CertificateFactory cf =
-CertificateFactory.getInstance("X.509");
-ByteArrayInputStream stream = new 
ByteArrayInputStream(data);
-certs[0] = (X509Certificate) 
cf.generateCertificate(stream);
+certs[i+1] = (X509Certificate) 
cf.generateCertificate(new ByteArrayInputStream(data));
 }
 }
 if (certs != null) {
-request.setAttribute
-(AprEndpoint.CERTIFICATE_KEY, certs);
+request.setAttribute(AprEndpoint.CERTIFICATE_KEY, 
certs);
 }
 // User key size
 sslO = new Integer(SSLSocket.getInfoI(socket, 
SSL.SSL_INFO_CIPHER_USEKEYSIZE));
 if (sslO != null) {
-request.setAttribute
-(AprEndpoint.KEY_SIZE_KEY, sslO);
+request.setAttribute(AprEndpoint.KEY_SIZE_KEY, sslO);
 }
 // SSL session ID
 sslO = SSLSocket.getInfoS(socket, SSL.SSL_INFO_SESSION_ID);
 if (sslO != null) {
-request.setAttribute
-(AprEndpoint.SESSION_ID_KEY, sslO);
+request.setAttribute(AprEndpoint.SESSION_ID_KEY, sslO);
 }
 } catch (Exception e) {
 log.warn(sm.getString("http11processor.socket.ssl"), e);
@@ -1182,38 +1169,26 @@
  // Consume and buffer the request body, so that it does not
  // interfere with the client's handshake messages
 InputFilter[] inputFilters = inputBuffer.getFilters();
-((BufferedInputFilter) inputFilters[Constants.BUFFERED_FILTER])
-.setLimit(maxSavePostSize);
-inputBuffer.addActiveFilter
-  

svn commit: r497521 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java

[remm]

Author: remm
Date: Thu Jan 18 10:24:17 2007
New Revision: 497521

URL: http://svn.apache.org/viewvc?view=rev&rev=497521
Log:
- Decrease logging level.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?view=diff&rev=497521&r1=497520&r2=497521
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Thu 
Jan 18 10:24:17 2007
@@ -710,11 +710,11 @@
  errorReportValveClass));
 }
 }
-if(log.isInfoEnabled()) {
+if(log.isDebugEnabled()) {
 if (xmlValidation)
-log.info( sm.getString("standardHost.validationEnabled"));
+log.debug(sm.getString("standardHost.validationEnabled"));
 else
-log.info( sm.getString("standardHost.validationDisabled"));
+log.debug(sm.getString("standardHost.validationDisabled"));
 }
 super.start();
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r497522 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java

[remm]

Author: remm
Date: Thu Jan 18 10:24:34 2007
New Revision: 497522

URL: http://svn.apache.org/viewvc?view=rev&rev=497522
Log:
- Port patch to return connector names.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java?view=diff&rev=497522&r1=497521&r2=497522
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardService.java Thu 
Jan 18 10:24:34 2007
@@ -280,11 +280,8 @@
 
 public ObjectName[] getConnectorNames() {
 ObjectName results[] = new ObjectName[connectors.length];
-for( int i=0; i

DO NOT REPLY [Bug 40960] - Timeout when reading from underlying socket does throw IOException with APR and SocketTimeoutException without APR

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40960


[EMAIL PROTECTED] changed:

   What|Removed |Added

Summary|APR versus non-APR behavior |Timeout when reading from
   |difference: Timeout when|underlying socket does throw
   |reading from underlying |IOException with APR and
   |socket does throw   |SocketTimeoutException
   |IOException with APR and|without APR
   |SocketTimeoutException  |
   |without APR |




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

[ANN] Apache Tomcat 6.0.8 Alpha released

[Remy Maucherat]

The 6.0.8 alpha build is now available for testing at:
http://www.apache.org/dist/tomcat/tomcat-6/v6.0.8-alpha/

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 41407] New: - CLIENT-CERT Authentication with JAASRealm not working

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=41407

   Summary: CLIENT-CERT Authentication with JAASRealm not working
   Product: Tomcat 5
   Version: 5.5.20
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


I tried to config my webapp to authenticate user by CLIENT-CERT auth method.

I verified my JAAS LoginModule by using "BASIC" to auth method and successfully 
authenticated user login.

After studying Tomcat 5.5.20 source, I found that the problem is caused by the 
RealmBase.java and JAASRealm.java.

if CLIENT-CERT auth method is used, SSLAuthenticator will call the :

  JAASRealm.authenticate(X509Certificate certs[])

As JAASRealm didn't override authenticate(X509Certificate certs[]), RealmBase's 
authenticate will be used and it will only validate the certs and then call
getPrincipal(X509Certificate) and then getPrincipal(String) is being called to 
get the Principal. However, in JAASRealm, this function always return null.

That means Tomcat can't use JAASRealm with CLIENT-CERT auth method.

Thanks
Butler

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]