Attachment #17297 for bug #34868

View | Details | Raw Unified | Return to bug 34868
Collapse All | Expand All

Lines 41-46 Link Here

(-)catalina/src/share/org/apache/catalina/Globals.java (+7 lines)
41	*/	41	*/
42	public static final String CERTIFICATES_ATTR =	42	public static final String CERTIFICATES_ATTR =
43	"javax.servlet.request.X509Certificate";	43	"javax.servlet.request.X509Certificate";
		44
		45	/**
		46	* The request attribute under which we store if the client certificate is trusted.
		47	* Only used if untrusted certificates are accepted
		48	*/
		49	public static final String CLIENT_CERTIFICATE_TRUSTED_ATTR =
		50	"javax.servlet.request.ClientCertificateTrusted";
44		51
45	/**	52	/**
46	* The request attribute under which we store the name of the cipher suite	53	* The request attribute under which we store the name of the cipher suite

Lines 869-874 Link Here

(-)catalina/src/share/org/apache/catalina/connector/Request.java (-1 / +6 lines)
869	if(attr != null) {	869	if(attr != null) {
870	attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);	870	attributes.put(Globals.SSL_SESSION_ID_ATTR, attr);
871	}	871	}
		872	attr = coyoteRequest.getAttribute(Globals.CLIENT_CERTIFICATE_TRUSTED_ATTR);
		873	if(attr != null) {
		874	attributes.put(Globals.CLIENT_CERTIFICATE_TRUSTED_ATTR, attr);
		875	}
872	attr = attributes.get(name);	876	attr = attributes.get(name);
873	}	877	}
874	return attr;	878	return attr;
Lines 882-888 Link Here
882	return Globals.CERTIFICATES_ATTR.equals(name) \|\|	886	return Globals.CERTIFICATES_ATTR.equals(name) \|\|
883	Globals.CIPHER_SUITE_ATTR.equals(name) \|\|	887	Globals.CIPHER_SUITE_ATTR.equals(name) \|\|
884	Globals.KEY_SIZE_ATTR.equals(name) \|\|	888	Globals.KEY_SIZE_ATTR.equals(name) \|\|
885	Globals.SSL_SESSION_ID_ATTR.equals(name);	889	Globals.SSL_SESSION_ID_ATTR.equals(name) \|\|
		890	Globals.CLIENT_CERTIFICATE_TRUSTED_ATTR.equals(name);
886	}	891	}
887		892
888	/**	893	/**

Return to bug 34868