cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
billbarker2003/03/23 00:57:49
Modified:coyote/src/java/org/apache/coyote Request.java
coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Fix problem where the scheme doesn't default to the connector.
Reported By: Randy Watler <[EMAIL PROTECTED]>
Revision ChangesPath
1.20 +1 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java
Index: Request.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Request.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Request.java 5 Mar 2003 02:31:47 - 1.19
+++ Request.java 23 Mar 2003 08:57:48 - 1.20
@@ -518,7 +518,7 @@
//remoteHostMB.recycle();
// XXX Do we need such defaults ?
-schemeMB.setString("http");
+schemeMB.recycle();
methodMB.setString("GET");
uriMB.setString("/");
queryMB.setString("");
1.18 +18 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CoyoteAdapter.java16 Mar 2003 01:57:57 - 1.17
+++ CoyoteAdapter.java23 Mar 2003 08:57:49 - 1.18
@@ -218,7 +218,20 @@
throws IOException {
// XXX the processor needs to set a correct scheme and port prior to this
point,
// in ajp13 protocols dont make sense to get the port from the connector..
-request.setSecure(req.scheme().equals("https"));
+// XXX the processor may have set a correct scheme and port prior to this
point,
+// in ajp13 protocols dont make sense to get the port from the connector...
+// otherwise, use connector configuration
+if (! req.scheme().isNull()) {
+// use processor specified scheme to determine secure state
+request.setSecure(req.scheme().equals("https"));
+} else {
+// use connector scheme and secure configuration, (defaults to
+// "http" and false respectively)
+req.scheme().setString(connector.getScheme());
+request.setSecure(connector.getSecure());
+}
+
+
request.setAuthorization
(req.getHeader(Constants.AUTHORIZATION_HEADER));
1.17 +17 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- CoyoteAdapter.java16 Mar 2003 01:58:58 - 1.16
+++ CoyoteAdapter.java23 Mar 2003 08:57:49 - 1.17
@@ -221,7 +221,19 @@
throws Exception {
// XXX the processor needs to set a correct scheme and port prior to this
point,
// in ajp13 protocols dont make sense to get the port from the connector..
-request.setSecure(req.scheme().equals("https"));
+// XXX the processor may have set a correct scheme and port prior to this
point,
+// in ajp13 protocols dont make sense to get the port from the connector...
+// otherwise, use connector configuration
+if (! req.scheme().isNull()) {
+// use processor specified scheme to determine secure state
+request.setSecure(req.scheme().equals("https"));
+} else {
+// use connector scheme and secure configuration, (defaults to
+// "http" and false respectively)
+req.scheme().setString(connector.getScheme());
+request.setSecure(connector.getSecure());
+}
+
// FIXME: the code below doesnt belongs to here, this is only have sense
// in Http11, not in ajp13..
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
billbarker2003/03/15 17:58:59
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
port patch.
Revision ChangesPath
1.16 +9 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CoyoteAdapter.java15 Mar 2003 11:37:05 - 1.15
+++ CoyoteAdapter.java16 Mar 2003 01:58:58 - 1.16
@@ -383,6 +383,11 @@
" /Value: " + scookie.getValue(),ex);
}
}
+if( idx < count ) {
+Cookie [] ncookies = new Cookie[idx];
+System.arraycopy(cookies, 0, ncookies, 0, idx);
+cookies = ncookies;
+}
request.setCookies(cookies);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
remm2003/03/15 03:37:39
Modified:coyote/src/java/org/apache/coyote/tomcat4 Tag: coyote_10
CoyoteAdapter.java
coyote/src/java/org/apache/coyote/tomcat5 Tag: coyote_10
CoyoteAdapter.java
Log:
- Return 400 for decoded URLs which don't start with '/'.
Revision ChangesPath
No revision
No revision
1.13.2.1 +9 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- CoyoteAdapter.java10 Dec 2002 08:43:21 - 1.13
+++ CoyoteAdapter.java15 Mar 2003 11:37:38 - 1.13.2.1
@@ -522,6 +522,11 @@
return false;
}
+// The URL must start with '/'
+if (b[start] != (byte) '/') {
+return false;
+}
+
// Replace "//" with "/"
for (pos = start; pos < (end - 1); pos++) {
if ((b[pos] == (byte) '/') && (b[pos + 1] == (byte) '/')) {
No revision
No revision
1.6.2.1 +9 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- CoyoteAdapter.java10 Dec 2002 08:44:05 - 1.6
+++ CoyoteAdapter.java15 Mar 2003 11:37:38 - 1.6.2.1
@@ -414,6 +414,11 @@
return false;
}
+// The URL must start with '/'
+if (b[start] != (byte) '/') {
+return false;
+}
+
// Replace "//" with "/"
for (pos = start; pos < (end - 1); pos++) {
if ((b[pos] == (byte) '/') && (b[pos + 1] == (byte) '/')) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
remm2003/03/15 03:37:05
Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
- Return 400 for decoded URLs which don't start with '/'.
Revision ChangesPath
1.16 +9 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CoyoteAdapter.java12 Mar 2003 07:41:04 - 1.15
+++ CoyoteAdapter.java15 Mar 2003 11:37:05 - 1.16
@@ -498,6 +498,11 @@
return false;
}
+// The URL must start with '/'
+if (b[start] != (byte) '/') {
+return false;
+}
+
// Replace "//" with "/"
for (pos = start; pos < (end - 1); pos++) {
if ((b[pos] == (byte) '/') && (b[pos + 1] == (byte) '/')) {
1.15 +9 -4
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CoyoteAdapter.java13 Mar 2003 10:05:10 - 1.14
+++ CoyoteAdapter.java15 Mar 2003 11:37:05 - 1.15
@@ -467,6 +467,11 @@
return false;
}
+// The URL must start with '/'
+if (b[start] != (byte) '/') {
+return false;
+}
+
// Replace "//" with "/"
for (pos = start; pos < (end - 1); pos++) {
if ((b[pos] == (byte) '/') && (b[pos + 1] == (byte) '/')) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
remm2003/03/13 02:05:11
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
- Remove tabs.
- Same, but optimized code.
- Please, please, try to write optimized code. Thanks.
Revision ChangesPath
1.14 +12 -13
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CoyoteAdapter.java12 Mar 2003 20:56:11 - 1.13
+++ CoyoteAdapter.java13 Mar 2003 10:05:10 - 1.14
@@ -272,18 +272,17 @@
// URI character decoding
convertURI(req.decodedURI(), request);
-/*
- * Request mapping.
- * Remove any remaining parameters (other than session id, which has
- * already been removed in parseSessionId()) from the URI, so they
- * won't be considered by the mapping algorithm.
- */
- MessageBytes decodedURI = req.decodedURI();
+// Request mapping.
+// Remove any remaining parameters (other than session id, which has
+// already been removed in parseSessionId()) from the URI, so they
+// won't be considered by the mapping algorithm.
+MessageBytes decodedURI = req.decodedURI();
CharChunk uriCC = decodedURI.getCharChunk();
int semicolon = uriCC.indexOf(';');
if (semicolon > 0) {
-decodedURI.setString(uriCC.toString().substring(0, semicolon));
- }
+decodedURI.setChars(uriCC.getBuffer(), uriCC.getStart(),
+semicolon);
+}
connector.getMapper().map(req.serverName(), decodedURI,
request.getMappingData());
request.setContext((Context) request.getMappingData().context);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
luehe 2003/03/12 12:56:11
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Remove any URI parameters from the request URI, so they won't be considered by
the wrapper/context mapping algorithm
Revision ChangesPath
1.13 +17 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CoyoteAdapter.java12 Mar 2003 07:50:38 - 1.12
+++ CoyoteAdapter.java12 Mar 2003 20:56:11 - 1.13
@@ -272,8 +272,19 @@
// URI character decoding
convertURI(req.decodedURI(), request);
-// Request mapping
-connector.getMapper().map(req.serverName(), req.decodedURI(),
+/*
+ * Request mapping.
+ * Remove any remaining parameters (other than session id, which has
+ * already been removed in parseSessionId()) from the URI, so they
+ * won't be considered by the mapping algorithm.
+ */
+ MessageBytes decodedURI = req.decodedURI();
+CharChunk uriCC = decodedURI.getCharChunk();
+int semicolon = uriCC.indexOf(';');
+if (semicolon > 0) {
+decodedURI.setString(uriCC.toString().substring(0, semicolon));
+ }
+connector.getMapper().map(req.serverName(), decodedURI,
request.getMappingData());
request.setContext((Context) request.getMappingData().context);
request.setWrapper((Wrapper) request.getMappingData().wrapper);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
billbarker2003/03/11 23:50:38
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Port cookie-validitity check from 4.1 branch.
Revision ChangesPath
1.12 +18 -12
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CoyoteAdapter.java28 Feb 2003 10:49:06 - 1.11
+++ CoyoteAdapter.java12 Mar 2003 07:50:38 - 1.12
@@ -341,6 +341,7 @@
Cookie[] cookies = new Cookie[count];
+int idx=0;
for (int i = 0; i < count; i++) {
ServerCookie scookie = serverCookies.getCookie(i);
if (scookie.getName().equals(Globals.SESSION_COOKIE_NAME)) {
@@ -357,15 +358,20 @@
.getRequestedSessionId());
}
}
-Cookie cookie = new Cookie(scookie.getName().toString(),
- scookie.getValue().toString());
-cookie.setPath(scookie.getPath().toString());
-cookie.setVersion(scookie.getVersion());
-String domain = scookie.getDomain().toString();
-if (domain != null) {
-cookie.setDomain(scookie.getDomain().toString());
+try {
+Cookie cookie = new Cookie(scookie.getName().toString(),
+ scookie.getValue().toString());
+cookie.setPath(scookie.getPath().toString());
+cookie.setVersion(scookie.getVersion());
+String domain = scookie.getDomain().toString();
+if (domain != null) {
+cookie.setDomain(scookie.getDomain().toString());
+}
+cookies[idx++] = cookie;
+} catch(Exception ex) {
+log("Bad Cookie Name: " + scookie.getName() +
+" /Value: " + scookie.getValue(),ex);
}
-cookies[i] = cookie;
}
request.setCookies(cookies);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
remm2003/02/28 02:49:06
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
- Fix NPE parsing cookies.
Revision ChangesPath
1.11 +8 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CoyoteAdapter.java26 Feb 2003 19:33:04 - 1.10
+++ CoyoteAdapter.java28 Feb 2003 10:49:06 - 1.11
@@ -361,7 +361,10 @@
scookie.getValue().toString());
cookie.setPath(scookie.getPath().toString());
cookie.setVersion(scookie.getVersion());
-cookie.setDomain(scookie.getDomain().toString());
+String domain = scookie.getDomain().toString();
+if (domain != null) {
+cookie.setDomain(scookie.getDomain().toString());
+}
cookies[i] = cookie;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
jfarcand2003/02/26 11:33:04 Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java Log: Fix bug 16474: Unable to obtain correct data for version, path, or domain information from Cookie. Revision ChangesPath 1.10 +7 -4 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java Index: CoyoteAdapter.java === RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- CoyoteAdapter.java29 Jan 2003 16:39:11 - 1.9 +++ CoyoteAdapter.java26 Feb 2003 19:33:04 - 1.10 @@ -359,6 +359,9 @@ } Cookie cookie = new Cookie(scookie.getName().toString(), scookie.getValue().toString()); +cookie.setPath(scookie.getPath().toString()); +cookie.setVersion(scookie.getVersion()); +cookie.setDomain(scookie.getDomain().toString()); cookies[i] = cookie; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java CoyoteConnector.java CoyoteRequest.java
remm2003/01/29 08:39:11
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
CoyoteConnector.java CoyoteRequest.java
Log:
- Allow configuring the URI B2C decoding.
- Fast conversion for ASCII.
Revision ChangesPath
1.9 +59 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CoyoteAdapter.java28 Jan 2003 18:19:38 - 1.8
+++ CoyoteAdapter.java29 Jan 2003 16:39:11 - 1.9
@@ -67,7 +67,9 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.Cookies;
import org.apache.tomcat.util.http.ServerCookie;
@@ -237,7 +239,6 @@
// URI decoding
req.decodedURI().duplicate(req.requestURI());
req.getURLDecoder().convert(req.decodedURI(), false);
-req.decodedURI().setEncoding("UTF-8");
// Normalize decoded URI
if (!normalize(req.decodedURI())) {
@@ -268,6 +269,9 @@
request.setUserPrincipal(new CoyotePrincipal(principal));
}
+// URI character decoding
+convertURI(req.decodedURI(), request);
+
// Request mapping
connector.getMapper().map(req.serverName(), req.decodedURI(),
request.getMappingData());
@@ -359,6 +363,56 @@
}
request.setCookies(cookies);
+
+}
+
+
+/**
+ * Character conversion of the URI.
+ */
+protected void convertURI(MessageBytes uri, CoyoteRequest request)
+throws Exception {
+
+ByteChunk bc = uri.getByteChunk();
+CharChunk cc = uri.getCharChunk();
+cc.allocate(bc.getLength(), -1);
+
+String enc = connector.getURIEncoding();
+if (enc != null) {
+B2CConverter conv = request.getURIConverter();
+try {
+if (conv == null) {
+conv = new B2CConverter(enc);
+request.setURIConverter(conv);
+} else {
+conv.recycle();
+}
+} catch (IOException e) {
+// Ignore
+log("Invalid URI encoding; using HTTP default");
+connector.setURIEncoding(null);
+}
+if (conv != null) {
+try {
+conv.convert(bc, cc);
+uri.setChars(cc.getBuffer(), cc.getStart(),
+ cc.getLength());
+return;
+} catch (IOException e) {
+log("Invalid URI character encoding; trying ascii");
+cc.recycle();
+}
+}
+}
+
+// Default encoding: fast conversion
+byte[] bbuf = bc.getBuffer();
+char[] cbuf = cc.getBuffer();
+int start = bc.getStart();
+for (int i = 0; i < bc.getLength(); i++) {
+cbuf[i] = (char) (bbuf[i + start] & 0xff);
+}
+uri.setChars(cbuf, 0, bc.getLength());
}
1.12 +29 -1
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CoyoteConnector.java 29 Jan 2003 12:54:59 - 1.11
+++ CoyoteConnector.java 29 Jan 2003 16:39:11 - 1.12
@@ -335,6 +335,12 @@
private MapperListener mapperListener = new MapperListener(mapper);
+ /**
+ * URI encoding.
+ */
+ private String URIEncoding = null;
+
+
// - Properties
@@ -878,6 +884,28 @@
this.tcpNoDelay = tcpNoDelay;
}
+
+
+ /**
+ * Return the character encoding to be used for the URI.
+ */
+ public String getURIEncoding() {
+
+ return (this.URIEncoding);
+
+ }
+
+
+ /**
+ * Set the URI encoding to be used for the URI.
+ *
+ * @param URIEncoding
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java CoyoteConnector.java CoyoteRequest.java
remm2003/01/28 10:19:39
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
CoyoteConnector.java CoyoteRequest.java
Log:
- "Use" the new mapper.
- Since the mapper is not populated, it doesn't do anything.
Revision ChangesPath
1.8 +14 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CoyoteAdapter.java16 Jan 2003 21:58:14 - 1.7
+++ CoyoteAdapter.java28 Jan 2003 18:19:38 - 1.8
@@ -77,8 +77,10 @@
import org.apache.coyote.Request;
import org.apache.coyote.Response;
+import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.Logger;
+import org.apache.catalina.Wrapper;
import org.apache.catalina.util.StringManager;
@@ -214,7 +216,7 @@
*/
protected void postParseRequest(Request req, CoyoteRequest request,
Response res, CoyoteResponse response)
-throws IOException {
+throws Exception {
// XXX the processor needs to set a correct scheme and port prior to this
point,
// in ajp13 protocols dont make sense to get the port from the connector..
request.setSecure(req.scheme().equals("https"));
@@ -249,7 +251,7 @@
// Parse cookies
parseCookies(req, request);
-
+
// Set the SSL properties
if( request.isSecure() ) {
res.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,
@@ -265,6 +267,12 @@
if (principal != null) {
request.setUserPrincipal(new CoyotePrincipal(principal));
}
+
+// Request mapping
+connector.getMapper().map(req.serverName(), req.decodedURI(),
+ request.getMappingData());
+request.setContext((Context) request.getMappingData().context);
+request.setWrapper((Wrapper) request.getMappingData().wrapper);
}
1.10 +26 -8
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java
Index: CoyoteConnector.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CoyoteConnector.java 16 Jan 2003 21:58:14 - 1.9
+++ CoyoteConnector.java 28 Jan 2003 18:19:38 - 1.10
@@ -60,9 +60,17 @@
package org.apache.coyote.tomcat5;
-
import java.util.Vector;
+import javax.management.ObjectName;
+import javax.management.MBeanServer;
+import javax.management.MBeanRegistration;
+
+import org.apache.commons.modeler.Registry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.tomcat.util.http.mapper.Mapper;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.coyote.Adapter;
@@ -81,12 +89,6 @@
import org.apache.catalina.net.ServerSocketFactory;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
-import org.apache.commons.modeler.Registry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import javax.management.ObjectName;
-import javax.management.MBeanServer;
-import javax.management.MBeanRegistration;
/**
@@ -321,6 +323,12 @@
private Adapter adapter = null;
+ /**
+ * Mapper.
+ */
+ private Mapper mapper = new Mapper();
+
+
// - Properties
@@ -580,6 +588,16 @@
return (info);
}
+
+
+ /**
+ * Return the mapper.
+ */
+ public Mapper getMapper() {
+
+ return (mapper);
+
+ }
/**
1.15 +46 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CoyoteRequest.java5 Jan 2003 11:24:22 - 1.14
+++ CoyoteRequest.java28 Jan 2003 18:19:38 - 1.15
@@ -109,6 +109,7 @@
import org.apache.catalina.Connector;
import org.ap
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java CoyoteConnector.java
costin 2003/01/16 13:58:15 Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java CoyoteConnector.java Log: Removed unused imports. Let the coyote connector know its name. Register the protocol adapter with JMX, so it can know its name too. Revision ChangesPath 1.7 +4 -35 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java Index: CoyoteAdapter.java === RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CoyoteAdapter.java10 Dec 2002 08:44:05 - 1.6 +++ CoyoteAdapter.java16 Jan 2003 21:58:14 - 1.7 @@ -63,54 +63,23 @@ package org.apache.coyote.tomcat5; - -import java.io.BufferedInputStream; -import java.io.EOFException; -import java.io.InterruptedIOException; -import java.io.InputStream; import java.io.IOException; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.Socket; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.Locale; -import java.util.StringTokenizer; -import java.util.TreeMap; -import javax.servlet.ServletException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.util.buf.HexUtils; import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.Cookies; import org.apache.tomcat.util.http.ServerCookie; import org.apache.coyote.ActionCode; -import org.apache.coyote.ActionHook; import org.apache.coyote.Adapter; -import org.apache.coyote.InputBuffer; -import org.apache.coyote.OutputBuffer; import org.apache.coyote.Request; import org.apache.coyote.Response; -import org.apache.catalina.Connector; -import org.apache.catalina.Container; import org.apache.catalina.Globals; -import org.apache.catalina.HttpRequest; -import org.apache.catalina.HttpResponse; -import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.LifecycleListener; import org.apache.catalina.Logger; -import org.apache.catalina.util.LifecycleSupport; -import org.apache.catalina.util.RequestUtil; import org.apache.catalina.util.StringManager; -import org.apache.catalina.util.StringParser; /** 1.9 +120 -57 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java Index: CoyoteConnector.java === RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteConnector.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- CoyoteConnector.java 14 Jan 2003 21:50:41 - 1.8 +++ CoyoteConnector.java 16 Jan 2003 21:58:14 - 1.9 @@ -1,8 +1,4 @@ /* - * $Header$ - * $Revision$ - * $Date$ - * * * * The Apache Software License, Version 1.1 @@ -65,36 +61,16 @@ package org.apache.coyote.tomcat5; -import java.io.IOException; -import java.net.InetAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.UnknownHostException; -import java.security.AccessControlException; -import java.util.Stack; import java.util.Vector; -import java.util.Enumeration; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; -import java.security.UnrecoverableKeyException; -import java.security.KeyManagementException; import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.coyote.ActionCode; -import org.apache.coyote.ActionHook; import org.apache.coyote.Adapter; -import org.apache.coyote.InputBuffer; -import org.apache.coyote.OutputBuffer; import org.apache.coyote.ProtocolHandler; import org.apache.catalina.Connector; import org.apache.catalina.Container; -import org.apache.catalina.HttpRequest; -import org.apache.catalina.HttpResponse; import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; import org.apache.catalina.Logger; @@ -105,6 +81,12 @@ import org.apache.catalina.net.ServerSocketFactory; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager;
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java CoyoteRequest.java
remm2002/11/26 03:06:23
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
CoyoteRequest.java
Log:
- Remove useless operations and fields, as the Catalina request always delegates
to the actual Coyote request.
Revision ChangesPath
1.5 +5 -12
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoyoteAdapter.java10 Oct 2002 09:07:33 - 1.4
+++ CoyoteAdapter.java26 Nov 2002 11:06:23 - 1.5
@@ -250,8 +250,6 @@
// in ajp13 protocols dont make sense to get the port from the connector..
request.setSecure(req.scheme().equals("https"));
-request.setAuthorization
-(req.getHeader(Constants.AUTHORIZATION_HEADER));
// FIXME: the code below doesnt belongs to here, this is only have sense
// in Http11, not in ajp13..
// At this point the Host header has been processed.
@@ -259,16 +257,10 @@
String proxyName = connector.getProxyName();
int proxyPort = connector.getProxyPort();
if (proxyPort != 0) {
-request.setServerPort(proxyPort);
req.setServerPort(proxyPort);
-} else {
-request.setServerPort(req.getServerPort());
}
if (proxyName != null) {
-request.setServerName(proxyName);
req.serverName().setString(proxyName);
-} else {
-request.setServerName(req.serverName().toString());
}
// URI decoding
@@ -292,6 +284,7 @@
// Set the SSL properties
res.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,request.getRequest());
}
+
/**
* Parse session id in URL.
1.10 +7 -15
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java
Index: CoyoteRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteRequest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CoyoteRequest.java25 Nov 2002 21:04:42 - 1.9
+++ CoyoteRequest.java26 Nov 2002 11:06:23 - 1.10
@@ -371,7 +371,6 @@
context = null;
wrapper = null;
-authorization = null;
authType = null;
usingInputStream = false;
usingReader = false;
@@ -382,7 +381,6 @@
inputStream.recycle();
userPrincipal = null;
sessionParsed = false;
-authorization = null;
requestParametersParsed = false;
locales.clear();
localesParsed = false;
@@ -414,17 +412,10 @@
/**
- * The authorization credentials sent with this Request.
- */
-protected String authorization = null;
-
-/**
* Return the authorization credentials sent with this request.
*/
public String getAuthorization() {
-
-return (this.authorization);
-
+return (coyoteRequest.getHeader(Constants.AUTHORIZATION_HEADER));
}
/**
@@ -433,7 +424,8 @@
* @param authorization The new authorization credentials
*/
public void setAuthorization(String authorization) {
-this.authorization = authorization;
+System.out.println("SA");
+//this.authorization = authorization;
}
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java CoyoteConnector.java
remm2002/10/10 02:07:34
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
CoyoteConnector.java
Log:
- Remove slow and ugly 4.0.x only code.
Revision ChangesPath
1.4 +4 -105
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoyoteAdapter.java4 Oct 2002 19:27:09 - 1.3
+++ CoyoteAdapter.java10 Oct 2002 09:07:33 - 1.4
@@ -286,22 +286,6 @@
// Parse session Id
parseSessionId(req, request);
-// Additional URI normalization and validation is needed for security
-// reasons on Tomcat 4.0.x
-if (connector.getUseURIValidationHack()) {
-String uri = validate(request.getRequestURI());
-if (uri == null) {
-res.setStatus(400);
-res.setMessage("Invalid URI");
-throw new IOException("Invalid URI");
-} else {
-req.requestURI().setString(uri);
-// Redoing the URI decoding
-req.decodedURI().duplicate(req.requestURI());
-req.getURLDecoder().convert(req.decodedURI(), true);
-}
-}
-
// Parse cookies
parseCookies(req, request);
@@ -391,91 +375,6 @@
}
request.setCookies(cookies);
-
-}
-
-
-/**
- * Return a context-relative path, beginning with a "/", that represents
- * the canonical version of the specified path after ".." and "." elements
- * are resolved out. If the specified path attempts to go outside the
- * boundaries of the current context (i.e. too many ".." path elements
- * are present), return null instead.
- * This code is not optimized, and is only needed for Tomcat 4.0.x.
- *
- * @param path Path to be validated
- */
-protected static String validate(String path) {
-
-if (path == null)
-return null;
-
-// Create a place for the normalized path
-String normalized = path;
-
-// Normalize "/%7E" and "/%7e" at the beginning to "/~"
-if (normalized.startsWith("/%7E") ||
-normalized.startsWith("/%7e"))
-normalized = "/~" + normalized.substring(4);
-
-// Prevent encoding '%', '/', '.' and '\', which are special reserved
-// characters
-if ((normalized.indexOf("%25") >= 0)
-|| (normalized.indexOf("%2F") >= 0)
-|| (normalized.indexOf("%2E") >= 0)
-|| (normalized.indexOf("%5C") >= 0)
-|| (normalized.indexOf("%2f") >= 0)
-|| (normalized.indexOf("%2e") >= 0)
-|| (normalized.indexOf("%5c") >= 0)) {
-return null;
-}
-
-if (normalized.equals("/."))
-return "/";
-
-// Normalize the slashes and add leading slash if necessary
-if (normalized.indexOf('\\') >= 0)
-normalized = normalized.replace('\\', '/');
-if (!normalized.startsWith("/"))
-normalized = "/" + normalized;
-
-// Resolve occurrences of "//" in the normalized path
-while (true) {
-int index = normalized.indexOf("//");
-if (index < 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 1);
-}
-
-// Resolve occurrences of "/./" in the normalized path
-while (true) {
-int index = normalized.indexOf("/./");
-if (index < 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 2);
-}
-
-// Resolve occurrences of "/../" in the normalized path
-while (true) {
-int index = normalized.indexOf("/../");
-if (index < 0)
-break;
-if (index == 0)
-return (null); // Trying to go outside our context
-int index2 = normalized.lastIndexOf('/', index - 1);
-normalized = normalized.substring(0, index2) +
-normalized.substring(index + 3);
-}
-
-// Declare occurrences of "/..." (three or more dots) to be invalid
-// (on some Windows platforms this walks the directory tree!!!)
-if (normalized.indexOf("/...") >= 0)
-return (null);
-
-// Return the normalized pat
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
nacho 2002/10/04 12:27:09
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Porting Fixes done for Tomcat 4
Revision ChangesPath
1.3 +9 -14
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteAdapter.java2 Oct 2002 05:30:50 - 1.2
+++ CoyoteAdapter.java4 Oct 2002 19:27:09 - 1.3
@@ -246,19 +246,14 @@
protected void postParseRequest(Request req, CoyoteRequest request,
Response res, CoyoteResponse response)
throws IOException {
-
-request.setSecure(connector.getSecure());
-req.scheme().setString(connector.getScheme());
+// XXX the processor needs to set a correct scheme and port prior to this
point,
+// in ajp13 protocols dont make sense to get the port from the connector..
+request.setSecure(req.scheme().equals("https"));
request.setAuthorization
(req.getHeader(Constants.AUTHORIZATION_HEADER));
-
-// Replace the default port if we are in secure mode
-if (req.getServerPort() == 80
-&& connector.getScheme().equals("https")) {
-req.setServerPort(443);
-}
-
+// FIXME: the code below doesnt belongs to here, this is only have sense
+// in Http11, not in ajp13..
// At this point the Host header has been processed.
// Override if the proxyPort/proxyHost are set
String proxyName = connector.getProxyName();
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
billbarker2002/10/01 22:30:50
Modified:coyote/src/java/org/apache/coyote/tomcat5 CoyoteAdapter.java
Log:
Port patch from tomcat4.
Revision ChangesPath
1.2 +5 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java
Index: CoyoteAdapter.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat5/CoyoteAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CoyoteAdapter.java4 Aug 2002 19:39:49 - 1.1
+++ CoyoteAdapter.java2 Oct 2002 05:30:50 - 1.2
@@ -278,7 +278,7 @@
// URI decoding
req.decodedURI().duplicate(req.requestURI());
-req.getURLDecoder().convert(req.decodedURI(), true);
+req.getURLDecoder().convert(req.decodedURI(), false);
req.decodedURI().setEncoding("UTF-8");
// Normalize decoded URI
--
To unsubscribe, e-mail:
For additional commands, e-mail:
