From e5910e576e1b247e45e288b616b4e856dc08bb65 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Tue, 10 Jun 2014 08:18:51 -0500 Subject: [PATCH 001/111] set for dev --- VERSION.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/VERSION.txt b/VERSION.txt index 3659df3faa5..e1b0835f12b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-9.2.2-SNAPSHOT + jetty-9.2.1.v20140609 - 09 June 2014 + 347110 Supprt ClassFileTransormers in WebAppClassLoader + 432192 jetty-start / Allow JETTY_LOGS use for start-log-file From 144a460407c493ef5b0155b136819850f848c41b Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Mon, 9 Jun 2014 18:35:49 +0200 Subject: [PATCH 002/111] 436894 GzipFilter code cleanup --- .../org/eclipse/jetty/http/mime.properties | 1 + .../eclipse/jetty/servlet/DefaultServlet.java | 42 +- .../jetty/servlets/AsyncGzipFilter.java | 19 +- .../eclipse/jetty/servlets/GzipFilter.java | 19 +- .../jetty/servlets/gzip/GzipHttpOutput.java | 11 + .../jetty/servlets/GzipFilterDefaultTest.java | 38 + .../jetty/servlets/gzip/GzipTester.java | 28 +- jetty-servlets/src/test/resources/test.svg | 2101 +++++++++++++++++ .../src/test/resources/test.svg.sha1 | 1 + jetty-servlets/src/test/resources/test.svgz | Bin 0 -> 6916 bytes .../src/test/resources/test.svgz.sha1 | 1 + 11 files changed, 2248 insertions(+), 13 deletions(-) create mode 100644 jetty-servlets/src/test/resources/test.svg create mode 100644 jetty-servlets/src/test/resources/test.svg.sha1 create mode 100644 jetty-servlets/src/test/resources/test.svgz create mode 100644 jetty-servlets/src/test/resources/test.svgz.sha1 diff --git a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties index b2709897ae5..654454c7a14 100644 --- a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties +++ b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties @@ -141,6 +141,7 @@ src=application/x-wais-source sv4cpio=application/x-sv4cpio sv4crc=application/x-sv4crc svg=image/svg+xml +svgz=image/svg+xml swf=application/x-shockwave-flash t=application/x-troff tar=application/x-tar diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index c3787395d38..30741657a15 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -25,8 +25,12 @@ import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; import javax.servlet.AsyncContext; import javax.servlet.RequestDispatcher; @@ -125,6 +129,9 @@ import org.eclipse.jetty.util.resource.ResourceFactory; * * cacheControl If set, all static content will have this value set as the cache-control * header. + * + * otherGzipFileExtensions + * Other file extensions that signify that a file is gzip compressed. Eg ".svgz" * * * @@ -164,6 +171,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory private String _relativeResourceBase; private ServletHandler _servletHandler; private ServletHolder _defaultHolder; + private List _gzipEquivalentFileExtensions; /* ------------------------------------------------------------ */ @Override @@ -273,6 +281,24 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory LOG.warn(Log.EXCEPTION,e); throw new UnavailableException(e.toString()); } + + _gzipEquivalentFileExtensions = new ArrayList(); + String otherGzipExtensions = getInitParameter("otherGzipFileExtensions"); + if (otherGzipExtensions != null) + { + //comma separated list + StringTokenizer tok = new StringTokenizer(otherGzipExtensions,",",false); + while (tok.hasMoreTokens()) + { + String s = tok.nextToken().trim(); + _gzipEquivalentFileExtensions.add((s.charAt(0)=='.'?s:"."+s)); + } + } + else + { + //.svgz files are gzipped svg files and must be served with Content-Encoding:gzip + _gzipEquivalentFileExtensions.add(".svgz"); + } _servletHandler= _contextHandler.getChildHandlerByClass(ServletHandler.class); for (ServletHolder h :_servletHandler.getServlets()) @@ -496,7 +522,7 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory if (included.booleanValue() || passConditionalHeaders(request,response, resource,content)) { - if (gzip) + if (gzip || isGzippedContent(pathInContext)) { response.setHeader(HttpHeader.CONTENT_ENCODING.asString(),"gzip"); String mt=_servletContext.getMimeType(pathInContext); @@ -585,6 +611,20 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory } + /** + * @param resource + * @return + */ + protected boolean isGzippedContent(String path) + { + if (path == null) return false; + + for (String suffix:_gzipEquivalentFileExtensions) + if (path.endsWith(suffix)) + return true; + return false; + } + /* ------------------------------------------------------------ */ private boolean hasDefinedRange(Enumeration reqRanges) { diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java index c9523ae2e89..6eb7c152aa3 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java @@ -209,14 +209,16 @@ public class AsyncGzipFilter extends UserAgentFilter implements GzipFactory { for (String type:MimeTypes.getKnownMimeTypes()) { + if (type.equals("image/svg+xml")) //always compressable (unless .svgz file) + continue; if (type.startsWith("image/")|| type.startsWith("audio/")|| type.startsWith("video/")) _mimeTypes.add(type); - _mimeTypes.add("application/compress"); - _mimeTypes.add("application/zip"); - _mimeTypes.add("application/gzip"); } + _mimeTypes.add("application/compress"); + _mimeTypes.add("application/zip"); + _mimeTypes.add("application/gzip"); } else { @@ -317,11 +319,11 @@ public class AsyncGzipFilter extends UserAgentFilter implements GzipFactory } // Exclude non compressible mime-types known from URI extension. - no Vary because no matter what client, this URI is always excluded - if (_mimeTypes.size()>0) + if (_mimeTypes.size()>0 && _excludeMimeTypes) { String mimeType = _context.getMimeType(request.getRequestURI()); - if (mimeType!=null && _mimeTypes.contains(mimeType)==_excludeMimeTypes) + if (mimeType!=null && _mimeTypes.contains(mimeType)) { LOG.debug("{} excluded by path suffix {}",this,request); // handle normally without setting vary header @@ -330,6 +332,13 @@ public class AsyncGzipFilter extends UserAgentFilter implements GzipFactory } } + //If the Content-Encoding is already set, then we won't compress + if (response.getHeader("Content-Encoding") != null) + { + super.doFilter(request,response,chain); + return; + } + if (_checkGzExists && request.getServletContext()!=null) { String path=request.getServletContext().getRealPath(URIUtil.addPaths(request.getServletPath(),request.getPathInfo())); diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java index e376349e703..69f2f62f119 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java @@ -208,14 +208,16 @@ public class GzipFilter extends UserAgentFilter { for (String type:MimeTypes.getKnownMimeTypes()) { + if (type.equals("image/svg+xml")) //always compressable (unless .svgz file) + continue; if (type.startsWith("image/")|| type.startsWith("audio/")|| type.startsWith("video/")) _mimeTypes.add(type); - _mimeTypes.add("application/compress"); - _mimeTypes.add("application/zip"); - _mimeTypes.add("application/gzip"); } + _mimeTypes.add("application/compress"); + _mimeTypes.add("application/zip"); + _mimeTypes.add("application/gzip"); } else { @@ -300,17 +302,24 @@ public class GzipFilter extends UserAgentFilter } // Exclude non compressible mime-types known from URI extension. - no Vary because no matter what client, this URI is always excluded - if (_mimeTypes.size()>0) + if (_mimeTypes.size()>0 && _excludeMimeTypes) { String mimeType = _context.getMimeType(request.getRequestURI()); - if (mimeType!=null && _mimeTypes.contains(mimeType)==_excludeMimeTypes) + if (mimeType!=null && _mimeTypes.contains(mimeType)) { // handle normally without setting vary header super.doFilter(request,response,chain); return; } } + + //If the Content-Encoding is already set, then we won't compress + if (response.getHeader("Content-Encoding") != null) + { + super.doFilter(request,response,chain); + return; + } if (_checkGzExists && request.getServletContext()!=null) { diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java index 3151ab8e5a9..063a76c97f1 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java @@ -151,6 +151,16 @@ public class GzipHttpOutput extends HttpOutput } } + // Has the Content-Encoding header already been site? + String ce=getHttpChannel().getResponse().getHeader("Content-Encoding"); + if (ce != null) + { + LOG.debug("{} exclude by content-encoding {}",this,ce); + noCompression(); + super.write(content,complete,callback); + return; + } + // Are we the thread that commits? if (_state.compareAndSet(GZState.MIGHT_COMPRESS,GZState.COMMITTING)) { @@ -188,6 +198,7 @@ public class GzipHttpOutput extends HttpOutput gzip(content,complete,callback); } + // TODO else ? } public void noCompression() diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java index 81aa29ec97a..bdcac4218d1 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java @@ -273,6 +273,24 @@ public class GzipFilterDefaultTest } } + @Test + public void testGzippedIfSVG() throws Exception + { + GzipTester tester = new GzipTester(testingdir, compressionType); + tester.setGzipFilterClass(testFilter); + tester.copyTestServerFile("test.svg"); + FilterHolder holder = tester.setContentServlet(org.eclipse.jetty.servlet.DefaultServlet.class); + try + { + tester.start(); + HttpTester.Response http = tester.assertIsResponseGzipCompressed("GET","test.svg",System.currentTimeMillis()-4000); + Assert.assertEquals("Accept-Encoding",http.get("Vary")); + } + finally + { + tester.stop(); + } + } @Test public void testNotGzipedIfNotModified() throws Exception @@ -553,4 +571,24 @@ public class GzipFilterDefaultTest tester.stop(); } } + + + @Test + public void testIsNotGzipCompressedSVGZ() throws Exception + { + GzipTester tester = new GzipTester(testingdir,compressionType); + tester.setGzipFilterClass(testFilter); + + FilterHolder holder = tester.setContentServlet(DefaultServlet.class); + tester.copyTestServerFile("test.svgz"); + try + { + tester.start(); + tester.assertIsResponseNotGzipFiltered("test.svgz", "test.svgz.sha1", "image/svg+xml", "gzip"); + } + finally + { + tester.stop(); + } + } } diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java index f6bfbb8c1cb..657c6dfc85b 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java @@ -282,6 +282,27 @@ public class GzipTester * @param expectedContentType */ public void assertIsResponseNotGzipFiltered(String requestedFilename, String testResourceSha1Sum, String expectedContentType) throws Exception + { + assertIsResponseNotGzipFiltered(requestedFilename, testResourceSha1Sum, expectedContentType,null); + } + + /** + * Makes sure that the response contains an unfiltered file contents. + *

+ * This is used to test exclusions and passthroughs in the GzipFilter. + *

+ * An example is to test that it is possible to configure GzipFilter to not recompress content that shouldn't be + * compressed by the GzipFilter. + * + * @param requestedFilename + * the filename used to on the GET request,. + * @param testResourceSha1Sum + * the sha1sum file that contains the SHA1SUM checksum that will be used to verify that the response + * contents are what is intended. + * @param expectedContentType + * @param expectedContentEncoding can be non-null in some circumstances, eg when dealing with pre-gzipped .svgz files + */ + public void assertIsResponseNotGzipFiltered(String requestedFilename, String testResourceSha1Sum, String expectedContentType, String expectedContentEncoding) throws Exception { //System.err.printf("[GzipTester] requesting /context/%s%n",requestedFilename); HttpTester.Request request = HttpTester.newRequest(); @@ -304,7 +325,10 @@ public class GzipTester String prefix = requestedFilename + " / Response"; Assert.assertThat(prefix + ".status",response.getStatus(),is(HttpServletResponse.SC_OK)); Assert.assertThat(prefix + ".header[Content-Length]",response.get("Content-Length"),notNullValue()); - Assert.assertThat(prefix + ".header[Content-Encoding] (should not be recompressed by GzipFilter)",response.get("Content-Encoding"),nullValue()); + Assert.assertThat(prefix + ".header[Content-Encoding] (should not be recompressed by GzipFilter)",response.get("Content-Encoding"), + expectedContentEncoding == null? nullValue() : notNullValue()); + if (expectedContentEncoding != null) + Assert.assertThat(prefix + ".header[Content-Encoding]",response.get("Content-Encoding"),is(expectedContentEncoding)); Assert.assertThat(prefix + ".header[Content-Type] (should have a Content-Type associated with it)",response.get("Content-Type"),notNullValue()); Assert.assertThat(prefix + ".header[Content-Type]",response.get("Content-Type"),is(expectedContentType)); @@ -339,7 +363,7 @@ public class GzipTester { String name = names.nextElement(); String value = message.get(name); - //System.out.printf(" [%s] = %s%n",name,value); + //System.out.printf(" [%s] = %s%n",name,value); } } diff --git a/jetty-servlets/src/test/resources/test.svg b/jetty-servlets/src/test/resources/test.svg new file mode 100644 index 00000000000..08fbae33514 --- /dev/null +++ b/jetty-servlets/src/test/resources/test.svg @@ -0,0 +1,2101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jetty-servlets/src/test/resources/test.svg.sha1 b/jetty-servlets/src/test/resources/test.svg.sha1 new file mode 100644 index 00000000000..3b170f0b098 --- /dev/null +++ b/jetty-servlets/src/test/resources/test.svg.sha1 @@ -0,0 +1 @@ +1ccb7a0b85585d0e9bdc3863ad093d4e53a9ea68 test.svg diff --git a/jetty-servlets/src/test/resources/test.svgz b/jetty-servlets/src/test/resources/test.svgz new file mode 100644 index 0000000000000000000000000000000000000000..c4d595ffd0a9ec7e5a8d7d86c51b3121ac1cd921 GIT binary patch literal 6916 zcmV+f8~fxRiwFoGxs_7@19W9`bS`stX8`P7TW{k=vVPC6(DA%va73!_7kMU&lMOc5 z1MDuaNwALrEm5{Ik|ZVAMR7<32S{_UC>>^@ctG}+QuCBg)`peUN*83X9 zt7)|Oe1m;-(+d})Xgpoqf4=$c*S~q{rngFh#WUog_PhL4I(CEra5JCfp+oo)mYWOq*DE1O#V~e!|{7d+M zo*@hHSJ65ig%ijb`in3b{PgQjd8CK@aWXCxlc8U#x6~zzU>>fP!6;k}vT&RKaXL;O zfEyUIpAX^m{vp|ZPsg8cpnb%CWYrIICPF?x_Do97Ro zmQkE|lj$r>s~$W=^KkG-6nvS^2OtyS;4!>QrtsgXXQ>(_@p|zk`|{S)K^&%C1c2_L z`*)D0fb0Pi*NbqSKPF5yi+BN2j*$9XN)(V68=QtQo zL7>t^X|i$*l|pXvK(191Ewi-HDarE;;4p#SD4Ip_@WW&>8jbj^4T^w+rpfaV-`;HV zM3c!X1fD^KFv~ZP1M1Q@y}>cHi90SD)P|k4Nu1aAX;5zVVU#l5fs9!=g7SmeWAMDX zIRK;3`Un`2{c8;)!bidAstq-V5z!OE2nymD{xE-)hWSbfCFMrbG=Nhmek4~qYHbWB z(AE;p9kdt{$1vT5P3R}Vc`#|I zGN6%ddELRv2p!WoBdSr`&VjnfaV$L6foh`0-7Jh)9ZI?EFJYu#g7AaImX(x`^~tj_ zQp!o`c&i?AGh+Gs6EwUx>~SJ|tT58>8#@y|rwK7AJopcCrup;pjbzM6nlV*h=!PsW zil_HeFfOPhK4OwENKQGhwvx1x6@V(V8>1~+hj6K6Bft=yP}92Q4dFc4H+7wzBLn7F z62?U=(hwL~$!@i?;4YkfzWFJRmc7+OFpeJcG?@|W^E@awWD8+HHCWDM8}M8Wu(IM! z7eK@^n!%(aT6ifd!Dl;fZ|tSD2^g}+$K@&9Ja zhoGb$$3KN%r?y&aC)>Y50x&t(GicNulv))2N%&Vo_&ji&JF=I@X$!Zs!ELi<#UX{>iz+OBr)K75G7$>*C7yCc7+ zOQXR~0^!MRQ5e+tHvKbvk}bzPk#a12dUOlL{ie*{7SjYoalH!TU(C$@UyI*XVQnj& zR*QF(QTbB4#XD{;GYQ9N)Otz?mWx+w;T?_7W&GrewKE+z9k1x}=t$0HhY`rUQ)C`!shCRHd zgWel6$Z!)74Q@_IP-#m8!)hi~H=ICC7*j;b&-| z90h=Cz^vyC07YkLhL~|An00H06xNIkhUF?CdMijHAfGB95u)i9+z~V!OXM>x3l_q} znRen#8-uB#eXgn8HHQm!OzMjJ-UIX)!%9=y_ppzIQb_2~Q+?EjI0pC&p>>}tpM&mG zq)*_dfl-h?T`vyznY-bp)grY+!28UT&~Sor62 zggB9!!w1IP*C1iyXhipVyd`&t)%*2$OI}=xeM^sb(SiBu9&a!&T6nxAmld$y*5l2! zqoB!M+1cE}fh~%2hHiY~g6+3)P};EwRTYA!%TTXiU6_q+2doPv z3U-9C7z8i}7z~Bc&{$}i`!=#6BO0|9~(BEQ-T^5|h#-ERg@F~m)%U*p-fnl}WmSmj!WgJ ztaB$G=clYJzzWfD<@Rg=pz5LlAd1kd=5!)sG^cK>In`Bhp0n5(#aY;xcbO1SfLZ$>I;(| zmmarwZfE3esvwY*+%X;ZL;TV%D$s4)dOi&1S^MA_MHl=7MPzX^JJ3)EQ>vDEESg> zCi99{xE?NaACazdE6mgM)R^XB<8~26%TWej1Sy0f!6S&$zCVnWy&)V52i+FW#l!=*YM89J%|* zx%+s!`zX8n*t`3zd_${SXzlVow6y$QaFXTaHy5}rOK@MS;J$*veO-h5Y6tgy5KS>x z)N|Zjbn2zwZ+WwfxuoO-dkw#72#CTLzGcc>R&)Xg-mTZU<(8@RVyz|%+-Ku-zC__c zloU6~9C;Dp{%e2BR|tA_4{J2Pxv=&?}I=_vDEukx}(GL9P#W#AkC3NC97g|)weQUqD(8cq;wHG0F?>Co~$4@$2 zwkkbxQs*_lx>zcHl7{Z5UGK~#xmS*|Z1z4dTe544_Ybm&yr#mYSA3EWph zyLpJS6;|%oKaY72V$buO4pLn2edY}yOqZ8@_cpYZ;koAp(9WLqY_^tD%Ylk}yhSe_ ze(|;e=d0r8qvo9Ne)G07P@64E)-_Hd?BtjlP*eM%g&L8Fdg6F6UG;ScX1c$umUf}r zF`)AS@CI0c+Cps@&-ny+S6G=NxpkB)g^FYXnB>wAT?aD&`IE<|3`E6pEa+S4mUH|Z7PlFeH4LXIXZ`FyRZ#3db?h^Z3}uT;TG(1&~x}B=FW9ogV1WK9E%mm^?1_LZSm7OFj_vrmx}i1*Rk4rT0E!|8CdxY?u#GXZ?=T*kT`%Zlu9hN_Hr ztIE!Y%MRP;O6+bEepN&BEM~$~$*WRphg%146`qk&s}W9p70xzGK`g!n9#UyZ~zUfH-xY(18z7)UMyOH5B;8eR&P9n6L=2Ft_a45re1*~O~u70VP$e(aXfR#RogeTF&beRIz^V}!Hw1oIR^ zekou!KGkxS@_H;!BIUr3lyj`koiVRNd1qKQKE8Ej%zBHw3(wCPS>$zSb+EA4fc1z^ zC0CT2MFLGV(&8-9RM&kC?QrX0iLaT-D3KC!p9Xv{Xx8j|5T`)%GKOY-5}WZ{u&h~- z7Ts#)48qIR~5s!lSJARlpz)Y*f167R!>fT_D% z--n?UDTTG(yxyFB!C=i{eAQI-JwkjXz({?kTiffv?2a=p9!xAw;TSVJ7_|}xO)w3? zG{WdCT45lL&jOCp9PS>aF(0u*b_Qh}}?!cJ5AkI8&niJgV>GJb2 z&Ff%0g=3fcNF#-)9k($-oL4`YPV3wb9tp#!Ws47Fn z8tpr-Fl|**7i{YMB}H-oE}y5m9CdvG&c@T8gXhw+f#jNf<38 z*nOoH8n=Cdsq*gT8+aExWj_Qu-AqPO_RGG2`-FL$R)D$fn@t)@oTYaWrFU9s%W zK)hnv<;vE%V_CCM-SL%o=VNQv@F2O`j2(h`o;KsB!8n|(?63UM=|wOP$6u%6<99h4 zcR}8=WpE$bhYkTlMa{oW#9b7R!#Il)_OBGRc?;1Pgc)bv$6!-Nvk)*Eg%DAAK>mI` z9fzg3O+<9}2XwA0CT9RcV_usxcJ&a9qepnSJ zWtO=nJB{6>$Zc_)-=J4b^5lSO6IDRb(qp=2<)+BSd3SfwQz_nLOS#}+L*~KLbUytv z9B&`l%#*AZ!O}BOK+Th2w%RGfCP*SLBQH&~Q5iXR+t^GZqS%P&W-b8(LM|%HXf@r0 z@AUk!&nB!~00dB8 z*dGzjmn$P_i+d1^JoM{yHN7+Mq89oZ(k=oB99Ke3w{6m!(v9L>MT^<;P_W_iFbT#%5^P6^EJS7k7mp{yfB*Eie9Au> z4gV9xU$W|YJ(D1~i`Jl(a>oFq8;^!&v<#9TrgKo#gVopj|9zUzV4%t)N{J1tZVOF| zje&#Ku^Ag4l4Lm?43_J7=11{86axR7Pfe!5FUfQ^`@5;6@DlK*&}lLYf3S6?KeJX0 zHqFR<358aE8e|yQuluTEjHC5(9*x6|g1^~fXTNv!-7L5ZXP<9=3`So}-bE&eiOZ@5 zM!_U|yyob-cgCzu-TxmZ$#bT`(}#}7)729445tetsE0`Mu&)>w2<9gkX>&wSs*f3W z+?UvnqQcvE?!uI>h@cd#b|@FdIjTcXeB64JmO=8cWrM_JbeRW_InRu)%@>r$G}!9e zY~klV)Sz`?K^NMcO90?!_y$InQSooJ8ae+eE-6DG#k}~2xe=QllRnW(QryQB`J5_F zd!wEKj|<8rOi~acJ(%JNut>B7(qVAWyyr0=Q6s|CCs;||o0&u~EI|-vU?vi7%7Hl! z63CXLxFXbqV4^UERK5hOSM*R?K%e+rQz!^h2tgEsEI@+bh8S!L){q5yfY}hrsLhkr zjW^l*oNmgowR4Vva7f1han-{Rz!47BOC zWEHj$`$JM2f^^Ry$Vr+2Yi7RHCOy>M1Jhj#vjk?Hq8bu#Fy_H%r-s`IMM(D4hHNu+ zHP zg6kWG2Q)2r07NipU}hcyZA=+XrfnoW%Ws%i`7pkPyr(?NZwgAIAm0`zEK0Fb}p97-mR8mWkmfWRj225y>r$DX)7e+l?#> zXl^+~ajc9`!DL2QZ6%G~vXW>sSR#ywnWuVk5u8{D3FEqFcrtCdZLSea z20U(?%Yb@|ApC$#eH$qZs3aE)3tORL1L2<~pS~SiCJ{`6R$%@Q!Pc0r=eKEqi3IHn zL;oxd`5MI2V3Cx<9_<9D6tqg>Fd02$VM+LucreWXvuKFYuV6O4Ukq1C5GQHC7^b$d zHJTvTBD^(Y+-B~S6*Ge|F^s*9(VK-n!rZ1BW=qURqO`#AG=|BmDSwv4w|BE>^u=4o z(LGo!D-)XB-9E-(pDpe^GhPp8u?ImZv5V0|6mO`t)9m2~WdCj_V8{$VOzfZi@HVsG zAx=NzH9#1C4Pgu$-vTbtmoTL#{hdxAhsp;*sXp7@v09CLd8M z!+q0L_30bzov+`iUYw}bxj*N##n;8Gb=KhPJBn_rHO6!S0jwPeF?U-THiyb)!^e~$ zRk+L@bkX^nA!tVh(WsCs=j! z<^FG^Zr2TWa|kvLoTW+0hH$O%hTZY*>%?A|*_`d6FiWlxN1CrqXfp=HlL-w- zE+JJ!K*CTB6avjUxkwQbeXyiH3yta>HI=o<%zQ>h(mqfLMekhdqzY4m!wDMt(N|EQ z=*(OU)McL`{+-Wh3h;Bu;?S&y;sI)(^y~0DNa2e265waVL2k03Wmy@ZAUK??R)QRe zst(NUD0hX_JkU`&y z`fR>lF7P(-ecN^%UBj2@FNFFU;OK~T4=Lw(Tn{{sA|w06%}d<$0p0AWsWTIKstwmu z0obaaL&RX!^%ix}_V!a8@@t=BhlzQ)DK5EZc!~4oqWpM{k$Q-u6U<>oh@(^|4>5-f znZxCOj5)^VJU)KTPiB{67e>p@Lr73dD}zU|YwXQIYPdz6t#_B5_Pu+RXtgY2A;!;- zOgOT<9vPv#_7q?`fXakaZcNG44sf^PRydzbWb{RpdQv&S(xW^m!H2wt0c^i!b-ZwEe0(E%N9- z!ghi!W~coAYTcpZw%<*n%>Oe7564-$EY42w`P(w?7&+HYa^LW*)?r)faO3QCsbZt$Ao`ex$8stMBt8Im&BCGL%IUt`G;0 z?925_)%)+zxw7%CAMx#R_6LsbQ*mscj^ozSaE_(vq@{8S#cmA6-G}n_o>#^`y!i{z K{07oO76AZ9pm`(! literal 0 HcmV?d00001 diff --git a/jetty-servlets/src/test/resources/test.svgz.sha1 b/jetty-servlets/src/test/resources/test.svgz.sha1 new file mode 100644 index 00000000000..e8ec3aa6650 --- /dev/null +++ b/jetty-servlets/src/test/resources/test.svgz.sha1 @@ -0,0 +1 @@ +62df7c3ac6ee6e4462b6abf9ef15b4e916ecf68f test.svgz From 94164b8fb215b944e505d7702ef3df3c42c4d258 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 10 Jun 2014 11:39:44 +0200 Subject: [PATCH 003/111] Add jetty-maven-plugin for spdy test webapp as only run-forked will work --- jetty-spdy/spdy-example-webapp/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jetty-spdy/spdy-example-webapp/pom.xml b/jetty-spdy/spdy-example-webapp/pom.xml index 907da39c54f..626d1a6fab4 100644 --- a/jetty-spdy/spdy-example-webapp/pom.xml +++ b/jetty-spdy/spdy-example-webapp/pom.xml @@ -24,6 +24,13 @@ ${basedir}/src/main/config/example-jetty-spdy.xml / + + run + run-war + deploy + start + stop + @@ -53,6 +60,13 @@ ${basedir}/src/main/config/example-jetty-spdy-proxy.xml / + + run + run-war + deploy + start + stop + From fb29f56b4db9314a0c20793a629ccf1edba49ad6 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 10 Jun 2014 16:27:33 +0200 Subject: [PATCH 004/111] 437051 Refactor Filter chain handling of Request.isAsyncSupported --- .../eclipse/jetty/servlet/ServletHandler.java | 52 ++++++++----------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 81243e01e78..9e8542e39f7 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -1632,25 +1632,20 @@ public class ServletHandler extends ScopedHandler { LOG.debug("call filter {}", _filterHolder); Filter filter= _filterHolder.getFilter(); - if (_filterHolder.isAsyncSupported()) - filter.doFilter(request, response, _next); - else + + //if the request already does not support async, then the setting for the filter + //is irrelevant. However if the request supports async but this filter does not + //temporarily turn it off for the execution of the filter + boolean requestAsyncSupported = baseRequest.isAsyncSupported(); + try { - final boolean suspendable=baseRequest.isAsyncSupported(); - if (suspendable) - { - try - { - baseRequest.setAsyncSupported(false); - filter.doFilter(request, response, _next); - } - finally - { - baseRequest.setAsyncSupported(true); - } - } - else - filter.doFilter(request, response, _next); + if (!_filterHolder.isAsyncSupported() && requestAsyncSupported) + baseRequest.setAsyncSupported(false); + filter.doFilter(request, response, _next); + } + finally + { + baseRequest.setAsyncSupported(requestAsyncSupported); } return; } @@ -1711,23 +1706,20 @@ public class ServletHandler extends ScopedHandler LOG.debug("call filter " + holder); Filter filter= holder.getFilter(); - if (holder.isAsyncSupported() || !_baseRequest.isAsyncSupported()) + //if the request already does not support async, then the setting for the filter + //is irrelevant. However if the request supports async but this filter does not + //temporarily turn it off for the execution of the filter + boolean requestAsyncSupported = _baseRequest.isAsyncSupported(); + try { + if (!holder.isAsyncSupported() && requestAsyncSupported) + _baseRequest.setAsyncSupported(false); filter.doFilter(request, response, this); } - else + finally { - try - { - _baseRequest.setAsyncSupported(false); - filter.doFilter(request, response, this); - } - finally - { - _baseRequest.setAsyncSupported(true); - } + _baseRequest.setAsyncSupported(requestAsyncSupported); } - return; } From bfce68e85c6ddace330ff0531ad02ed5d4e2fb47 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 10 Jun 2014 16:47:10 +0200 Subject: [PATCH 005/111] Fix typo in comment on GzipHttpOutput --- .../java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java index 063a76c97f1..636eab2b53c 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java @@ -151,7 +151,7 @@ public class GzipHttpOutput extends HttpOutput } } - // Has the Content-Encoding header already been site? + // Has the Content-Encoding header already been set? String ce=getHttpChannel().getResponse().getHeader("Content-Encoding"); if (ce != null) { From a41dd1caf5dc06616b4e9f4a9899214747d0ddaf Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 11 Jun 2014 08:30:52 -0700 Subject: [PATCH 006/111] 436874 - WebSocket client throwing a NullPointer when handling a pong + Adding NPE guard for PONG with no payload. --- .../endpoints/JsrEndpointEventDriver.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java index 9ac49062ace..845f4be4e3e 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java +++ b/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/endpoints/JsrEndpointEventDriver.java @@ -35,6 +35,7 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.websocket.api.WebSocketPolicy; import org.eclipse.jetty.websocket.api.extensions.Frame; +import org.eclipse.jetty.websocket.common.frames.ControlFrame; import org.eclipse.jetty.websocket.common.message.MessageInputStream; import org.eclipse.jetty.websocket.common.message.MessageReader; import org.eclipse.jetty.websocket.jsr356.JsrPongMessage; @@ -235,11 +236,20 @@ public class JsrEndpointEventDriver extends AbstractJsrEventDriver LOG.debug("No PONG MessageHandler declared"); return; } - - ByteBuffer pongBuf = ByteBuffer.allocate(buffer.remaining()); - BufferUtil.put(buffer,pongBuf); - BufferUtil.flipToFlush(pongBuf,0); + ByteBuffer pongBuf = null; + + if (BufferUtil.isEmpty(buffer)) + { + pongBuf = BufferUtil.EMPTY_BUFFER; + } + else + { + pongBuf = ByteBuffer.allocate(buffer.remaining()); + BufferUtil.put(buffer,pongBuf); + BufferUtil.flipToFlush(pongBuf,0); + } + @SuppressWarnings("unchecked") Whole pongHandler = (Whole)wrapper.getHandler(); pongHandler.onMessage(new JsrPongMessage(pongBuf)); From 424e4214397cfbd39ecf87e9f27d007e9b4c9644 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 11 Jun 2014 18:45:45 +0200 Subject: [PATCH 007/111] Added JDK 7u60 files and configuration for NPN and ALPN. --- .../config/modules/protonego-impl/alpn-1.7.0_60.mod | 8 ++++++++ .../config/modules/protonego-impl/npn-1.7.0_60.mod | 8 ++++++++ .../usecases/home/modules/npn/npn-1.7.0_60.mod | 8 ++++++++ pom.xml | 13 +++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod create mode 100644 jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod new file mode 100644 index 00000000000..639c70e3ffd --- /dev/null +++ b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar + +[exec] +-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod new file mode 100644 index 00000000000..6f6b4250803 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +npn-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar + +[exec] +-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/pom.xml b/pom.xml index 4578536f2bd..6070878b398 100644 --- a/pom.xml +++ b/pom.xml @@ -877,6 +877,19 @@ 7.0.0.v20140317 + + 7u60 + + + java.version + 1.7.0_60 + + + + 1.1.7.v20140316 + 7.0.0.v20140317 + + 8u00 From 4896672c94da16f39dce67b4c42dbb84ff95d10b Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 11 Jun 2014 18:08:22 +0200 Subject: [PATCH 008/111] 435895 jetty spring module is not in distribution --- jetty-distribution/pom.xml | 20 ++++++++++++++++++- jetty-spring/pom.xml | 2 +- .../src/main/config/modules/spring.mod | 16 +++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 jetty-spring/src/main/config/modules/spring.mod diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index bf5ae62b310..c08257930b2 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -302,7 +302,7 @@ org.eclipse.jetty org.eclipse.jetty.orbit,org.eclipse.jetty.spdy,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs - jetty-all,jetty-jsp,apache-jsp,jetty-start,jetty-monitor + jetty-all,jetty-jsp,apache-jsp,jetty-start,jetty-monitor,jetty-spring jar ${assembly-directory}/lib @@ -332,6 +332,19 @@ ${assembly-directory}/lib/fcgi + + copy-lib-spring-deps + generate-resources + + copy-dependencies + + + org.eclipse.jetty + jetty-spring + jar + ${assembly-directory}/lib/spring + + copy-lib-monitor-deps generate-resources @@ -765,6 +778,11 @@ fcgi-server ${project.version} + + org.eclipse.jetty + jetty-spring + ${project.version} + + + From d92f6c6fd3ec5b804a5f18018b37af05e0dd6045 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 19 Jun 2014 10:18:51 -0700 Subject: [PATCH 015/111] 437395 - Start / Properties in template sections should be default applied for enabled modules + Fixing typo in enableModule() + Fixing concurrent modification exception during walk of parents in enableModule() --- .../java/org/eclipse/jetty/start/Module.java | 5 +- .../java/org/eclipse/jetty/start/Modules.java | 29 ++++++-- .../org/eclipse/jetty/start/MainTest.java | 25 +++++++ .../org/eclipse/jetty/start/ModulesTest.java | 11 +-- .../eclipse/jetty/start/TestBadUseCases.java | 4 +- .../org/eclipse/jetty/start/TestUseCases.java | 2 +- .../test/resources/assert-home-with-spdy.txt | 71 +++++++++++++++++++ .../resources/usecases/assert-enable-spdy.txt | 18 ++++- .../usecases/home/etc/protonego-alpn.xml | 0 .../usecases/home/etc/protonego-npn.xml | 0 .../resources/usecases/home/modules/npn.mod | 4 -- .../modules/protonego-impl/alpn-1.7.0_40.mod | 8 +++ .../modules/protonego-impl/alpn-1.7.0_45.mod | 8 +++ .../modules/protonego-impl/alpn-1.7.0_51.mod | 8 +++ .../modules/protonego-impl/alpn-1.7.0_55.mod | 8 +++ .../modules/protonego-impl/alpn-1.7.0_60.mod | 8 +++ .../modules/protonego-impl/alpn-1.8.0.mod | 8 +++ .../modules/protonego-impl/alpn-1.8.0_05.mod | 8 +++ .../home/modules/protonego-impl/alpn.mod | 36 ++++++++++ .../{npn => protonego-impl}/npn-1.7.0_04.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_05.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_06.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_07.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_09.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_10.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_11.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_13.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_15.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_17.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_21.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_25.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_40.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_45.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_51.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_55.mod | 2 +- .../{npn => protonego-impl}/npn-1.7.0_60.mod | 2 +- .../home/modules/protonego-impl/npn.mod | 31 ++++++++ .../usecases/home/modules/protonego.mod | 15 ++++ .../resources/usecases/home/modules/spdy.mod | 19 ++++- .../resources/usecases/home/modules/ssl.mod | 35 +++++++++ 40 files changed, 356 insertions(+), 39 deletions(-) create mode 100644 jetty-start/src/test/resources/assert-home-with-spdy.txt create mode 100644 jetty-start/src/test/resources/usecases/home/etc/protonego-alpn.xml create mode 100644 jetty-start/src/test/resources/usecases/home/etc/protonego-npn.xml delete mode 100644 jetty-start/src/test/resources/usecases/home/modules/npn.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn.mod rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_04.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_05.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_06.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_07.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_09.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_10.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_11.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_13.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_15.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_17.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_21.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_25.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_40.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_45.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_51.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_55.mod (93%) rename jetty-start/src/test/resources/usecases/home/modules/{npn => protonego-impl}/npn-1.7.0_60.mod (93%) create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/protonego.mod create mode 100644 jetty-start/src/test/resources/usecases/home/modules/ssl.mod diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java index 17a3317f802..dc0de1ced59 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Module.java @@ -402,7 +402,10 @@ public class Module { StringBuilder str = new StringBuilder(); str.append("Module[").append(logicalName); - str.append(",").append(fileRef); + if (!logicalName.equals(fileRef)) + { + str.append(",file=").append(fileRef); + } if (enabled) { str.append(",enabled"); diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java index 40406894c58..804d63ae325 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java @@ -271,13 +271,30 @@ public class Modules implements Iterable { // A regex! Pattern pat = Pattern.compile(name); - for (Map.Entry entry : modules.entrySet()) + List matching = new ArrayList<>(); + do { - if (pat.matcher(entry.getKey()).matches()) + matching.clear(); + + // find matching entries that are not enabled + for (Map.Entry entry : modules.entrySet()) { - enableModule(entry.getValue(),sources); + if (pat.matcher(entry.getKey()).matches()) + { + if (!entry.getValue().isEnabled()) + { + matching.add(entry.getValue()); + } + } + } + + // enable them + for (Module module : matching) + { + enableModule(module,sources); } } + while (!matching.isEmpty()); } else { @@ -309,10 +326,12 @@ public class Modules implements Iterable } // enable any parents that haven't been enabled (yet) - for(String name: module.getParentNames()) + Set parentNames = new HashSet<>(); + parentNames.addAll(module.getParentNames()); + for(String name: parentNames) { Module parent = modules.get(name); - if (name == null) + if (parent == null) { // parent module doesn't exist, yet Path file = baseHome.getPath("modules/" + name + ".mod"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java index 2043d6b5ae9..1f436b2cf3a 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java @@ -133,6 +133,31 @@ public class MainTest ConfigurationAssert.assertConfiguration(baseHome,args,"assert-home-with-jvm.txt"); } + + @Test + public void testWithSpdy() throws Exception + { + List cmdLineArgs = new ArrayList<>(); + + File homePath = MavenTestingUtils.getTestResourceDir("usecases/home").getAbsoluteFile(); + cmdLineArgs.add("jetty.home=" + homePath); + cmdLineArgs.add("user.dir=" + homePath); + + // Modules + cmdLineArgs.add("--module=server"); + cmdLineArgs.add("--module=deploy"); + cmdLineArgs.add("--module=spdy"); + + Main main = new Main(); + + StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()])); + BaseHome baseHome = main.getBaseHome(); + + Assert.assertThat("jetty.home",baseHome.getHome(),is(homePath.getAbsolutePath())); + Assert.assertThat("jetty.base",baseHome.getBase(),is(homePath.getAbsolutePath())); + + ConfigurationAssert.assertConfiguration(baseHome,args,"assert-home-with-spdy.txt"); + } @Test public void testJettyHomeWithSpaces() throws Exception diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java index b7c0468442c..506ad932ce0 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java @@ -87,7 +87,6 @@ public class ModulesTest expected.add("deploy"); expected.add("debug"); expected.add("security"); - expected.add("npn"); expected.add("ext"); expected.add("websocket"); expected.add("rewrite"); @@ -104,6 +103,8 @@ public class ModulesTest // (only present if enabled) expected.add("jsp-impl"); expected.add("monitor"); expected.add("xml"); + expected.add("ssl"); + expected.add("protonego"); expected.add("servlet"); expected.add("jaas"); expected.add("http"); @@ -122,7 +123,7 @@ public class ModulesTest // Test Env File homeDir = MavenTestingUtils.getTestResourceDir("usecases/home"); File baseDir = testdir.getEmptyDir(); - String cmdLine[] = new String[] {"jetty.version=TEST", "java.version=1.7.0_21"}; + String cmdLine[] = new String[] {"jetty.version=TEST", "java.version=1.7.0_60"}; // Configuration CommandLineConfigSource cmdLineSource = new CommandLineConfigSource(cmdLine); @@ -155,8 +156,10 @@ public class ModulesTest expected.add("server"); // transitive expected.add("base"); - expected.add("npn"); - expected.add("npn-boot"); + expected.add("ssl"); + expected.add("protonego"); + expected.add("protonego-boot"); + expected.add("protonego-impl"); expected.add("xml"); expected.add("jsp-impl"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java index 8af10ece13a..9280cdab156 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java @@ -77,8 +77,8 @@ public class TestBadUseCases public void testWithSpdyBadNpnVersion() throws Exception { assertBadConfig("home","base.enable.spdy.bad.npn.version", - "Missing referenced dependency: npn/npn-1.7.0_01", - "java.version=1.7.0_01"); + "Missing referenced dependency: protonego-impl/npn-1.7.0_01", + "java.version=1.7.0_01", "protonego=npn"); } diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java index 3cfa5445ac6..bf77b48141d 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestUseCases.java @@ -106,7 +106,7 @@ public class TestUseCases @Test public void testWithSpdy() throws Exception { - assertUseCase("home","base.enable.spdy","assert-enable-spdy.txt","java.version=1.7.0_21"); + assertUseCase("home","base.enable.spdy","assert-enable-spdy.txt","java.version=1.7.0_60"); } @Test diff --git a/jetty-start/src/test/resources/assert-home-with-spdy.txt b/jetty-start/src/test/resources/assert-home-with-spdy.txt new file mode 100644 index 00000000000..7eddc13f688 --- /dev/null +++ b/jetty-start/src/test/resources/assert-home-with-spdy.txt @@ -0,0 +1,71 @@ +# The XMLs we expect (order is important) +XML|${jetty.base}/etc/jetty-jmx.xml +XML|${jetty.base}/etc/protonego-alpn.xml +XML|${jetty.base}/etc/jetty.xml +XML|${jetty.base}/etc/jetty-http.xml +XML|${jetty.base}/etc/jetty-ssl.xml +XML|${jetty.base}/etc/jetty-plus.xml +XML|${jetty.base}/etc/jetty-spdy.xml +XML|${jetty.base}/etc/jetty-annotations.xml +XML|${jetty.base}/etc/jetty-deploy.xml +XML|${jetty.base}/etc/jetty-websockets.xml + +# The LIBs we expect (order is irrelevant) +LIB|${jetty.base}/lib/annotations/javax.annotation-api-1.2.jar +LIB|${jetty.base}/lib/annotations/org.objectweb.asm-TEST.jar +LIB|${jetty.base}/lib/jetty-annotations-TEST.jar +LIB|${jetty.base}/lib/jetty-continuation-TEST.jar +LIB|${jetty.base}/lib/jetty-http-TEST.jar +LIB|${jetty.base}/lib/jetty-io-TEST.jar +LIB|${jetty.base}/lib/jetty-deploy-TEST.jar +LIB|${jetty.base}/lib/jetty-jmx-TEST.jar +LIB|${jetty.base}/lib/jetty-jndi-TEST.jar +LIB|${jetty.base}/lib/jetty-plus-TEST.jar +LIB|${jetty.base}/lib/jetty-schemas-3.1.jar +LIB|${jetty.base}/lib/jetty-security-TEST.jar +LIB|${jetty.base}/lib/jetty-server-TEST.jar +LIB|${jetty.base}/lib/jetty-servlet-TEST.jar +LIB|${jetty.base}/lib/jetty-util-TEST.jar +LIB|${jetty.base}/lib/jetty-webapp-TEST.jar +LIB|${jetty.base}/lib/jetty-xml-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-client-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-core-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-http-common-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-http-server-TEST.jar +LIB|${jetty.base}/lib/spdy/spdy-server-TEST.jar +LIB|${jetty.base}/lib/jndi/javax.activation-1.1.jar +LIB|${jetty.base}/lib/jndi/javax.transaction-api-1.2.jar +LIB|${jetty.base}/lib/servlet-api-3.1.jar +LIB|${jetty.base}/lib/websocket/javax.websocket-api-1.0.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-client-impl-TEST.jar +LIB|${jetty.base}/lib/websocket/javax-websocket-server-impl-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-api-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-client-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-common-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar +LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar + +# The Properties we expect (order is irrelevant) +PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g +PROP|jetty.keystore=etc/keystore +PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +PROP|jetty.secure.port=8443 +PROP|jetty.truststore=etc/keystore +PROP|jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +PROP|protonego=alpn +PROP|spdy.port=8443 +PROP|spdy.timeout=30000 + +# JVM Args +JVM|-Xms1024m +JVM|-Xmx1024m + +# Downloads +DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar +DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore + +# Files +FILE|lib/ +FILE|lib/alpn/ + + diff --git a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt index b097f5d12f4..40577a7ed30 100644 --- a/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt +++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy.txt @@ -1,10 +1,12 @@ # The XMLs we expect (order is important) XML|${jetty.home}/etc/jetty-jmx.xml +XML|${jetty.home}/etc/protonego-alpn.xml XML|${jetty.home}/etc/jetty.xml XML|${jetty.home}/etc/jetty-http.xml XML|${jetty.home}/etc/jetty-ssl.xml XML|${jetty.home}/etc/jetty-spdy.xml + # The LIBs we expect (order is irrelevant) LIB|${jetty.home}/lib/jetty-continuation-TEST.jar LIB|${jetty.home}/lib/jetty-http-TEST.jar @@ -23,15 +25,25 @@ LIB|${jetty.home}/lib/spdy/spdy-core-TEST.jar # The Properties we expect (order is irrelevant) PROP|jetty.port=9090 +PROP|jetty.secure.port=8443 PROP|jetty.keystore=etc/keystore PROP|jetty.keystore.password=friendly PROP|jetty.keymanager.password=icecream PROP|jetty.truststore=etc/keystore PROP|jetty.truststore.password=sundae -PROP|java.version=1.7.0_21 +PROP|java.version=1.7.0_60 +PROP|protonego=alpn +PROP|spdy.port=8443 +PROP|spdy.timeout=30000 # The Downloads -DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar +DOWNLOAD|http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar +DOWNLOAD|http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore # The Bootlib -BOOTLIB|-Xbootclasspath/p:lib/npn/npn-boot-1.1.5.v20130313.jar +BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar + +# The Files +FILE|lib/ +FILE|lib/alpn/ + diff --git a/jetty-start/src/test/resources/usecases/home/etc/protonego-alpn.xml b/jetty-start/src/test/resources/usecases/home/etc/protonego-alpn.xml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/etc/protonego-npn.xml b/jetty-start/src/test/resources/usecases/home/etc/protonego-npn.xml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn.mod b/jetty-start/src/test/resources/usecases/home/modules/npn.mod deleted file mode 100644 index 9c9d4bcd1d3..00000000000 --- a/jetty-start/src/test/resources/usecases/home/modules/npn.mod +++ /dev/null @@ -1,4 +0,0 @@ - -[depend] -npn/npn-${java.version} - diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_40.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_45.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_51.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_55.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.7.0_60.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod new file mode 100644 index 00000000000..65e6cb3c4db --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod new file mode 100644 index 00000000000..65e6cb3c4db --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn-1.8.0_05.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn.mod new file mode 100644 index 00000000000..0e399f05cb1 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/alpn.mod @@ -0,0 +1,36 @@ +# ALPN is provided via a -Xbootclasspath that modifies the secure connections +# in java to support the ALPN layer needed for SPDY (and eventually HTTP/2) +# +# This modification has a tight dependency on specific recent updates of +# Java 1.7 and Java 1.8 +# (Java versions prior to 1.7u40 are not supported) +# +# The alpn protonego module will use an appropriate alpn-boot jar for your +# specific version of Java. +# +# IMPORTANT: Versions of Java that exist after this module was created are +# not guaranteed to work with existing alpn-boot jars, and might +# need a new alpn-boot to be created / tested / deployed by the +# Jetty project in order to provide support for these future +# Java versions. +# +# All versions of alpn-boot can be found at +# http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/ + +[name] +protonego-impl + +[depend] +protonego-impl/alpn-${java.version} + +[lib] +lib/jetty-alpn-client-${jetty.version}.jar +lib/jetty-alpn-server-${jetty.version}.jar + +[xml] +etc/protonego-alpn.xml + +[files] +lib/ +lib/alpn/ + diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_04.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_04.mod index a6778222464..007570b6757 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_04.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_04.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_05.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_05.mod index a6778222464..007570b6757 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_05.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_05.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.0.v20120525/npn-boot-1.1.0.v20120525.jar|lib/npn/npn-boot-1.1.0.v20120525.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_06.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_06.mod index bb6b64bf1f1..868a7a77fcb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_06.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_06.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_07.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_07.mod index bb6b64bf1f1..868a7a77fcb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_07.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_07.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.1.v20121030/npn-boot-1.1.1.v20121030.jar|lib/npn/npn-boot-1.1.1.v20121030.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_09.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_09.mod index c488457f14e..20c1db27bd5 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_09.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_09.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_10.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_10.mod index c488457f14e..20c1db27bd5 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_10.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_10.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_11.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_11.mod index c488457f14e..20c1db27bd5 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_11.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_11.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.3.v20130313/npn-boot-1.1.3.v20130313.jar|lib/npn/npn-boot-1.1.3.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_13.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_13.mod index 0264d724869..1645a52dba0 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_13.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_13.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.4.v20130313/npn-boot-1.1.4.v20130313.jar|lib/npn/npn-boot-1.1.4.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_15.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_15.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_15.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_15.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_17.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_17.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_17.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_17.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_21.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_21.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_21.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_21.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_25.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_25.mod index d2d09ea2d68..73bc09007eb 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_25.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_25.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.5.v20130313/npn-boot-1.1.5.v20130313.jar|lib/npn/npn-boot-1.1.5.v20130313.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_40.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_40.mod index 909bebf5f70..465e6f034b6 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_40.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_40.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_45.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_45.mod index 909bebf5f70..465e6f034b6 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_45.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_45.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_51.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_51.mod index 909bebf5f70..465e6f034b6 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_51.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_51.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.6.v20130911/npn-boot-1.1.6.v20130911.jar|lib/npn/npn-boot-1.1.6.v20130911.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod index 6f6b4250803..639c70e3ffd 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_55.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_55.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod similarity index 93% rename from jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod rename to jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod index 6f6b4250803..639c70e3ffd 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/npn/npn-1.7.0_60.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn-1.7.0_60.mod @@ -1,5 +1,5 @@ [name] -npn-boot +protonego-boot [files] http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn.mod new file mode 100644 index 00000000000..040aad10197 --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego-impl/npn.mod @@ -0,0 +1,31 @@ +# NPN is provided via a -Xbootclasspath that modifies the secure connections +# in java to support the NPN layer needed for SPDY. +# +# This modification has a tight dependency on specific updates of Java 1.7. +# (No support for Java 8 exists for npn / npn-boot, use alpn instead) +# +# The npn module will use an appropriate npn-boot jar for your specific +# version of Java. +# +# IMPORTANT: Versions of Java that exist after this module was created are +# not guaranteed to work with existing npn-boot jars, and might +# need a new npn-boot to be created / tested / deployed by the +# Jetty project in order to provide support for these future +# Java versions. +# +# All versions of npn-boot can be found at +# http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/ + + +[name] +protonego-impl + +[depend] +protonego-impl/npn-${java.version} + +[xml] +etc/protonego-npn.xml + +[files] +lib/ +lib/npn/ diff --git a/jetty-start/src/test/resources/usecases/home/modules/protonego.mod b/jetty-start/src/test/resources/usecases/home/modules/protonego.mod new file mode 100644 index 00000000000..d7bba9fbeca --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/protonego.mod @@ -0,0 +1,15 @@ +# +# Protocol Negotiatin Selection Module +# + +[depend] +protonego-impl/${protonego} + +[ini-template] +# Protocol Negotiation Implementation Selection +# choices are: +# 'npn' : original implementation for SPDY (now deprecated) +# 'alpn' : replacement for NPN, in use by current SPDY implementations +# and the future HTTP/2 spec +# Note: java 1.8+ are ALPN only. +protonego=alpn diff --git a/jetty-start/src/test/resources/usecases/home/modules/spdy.mod b/jetty-start/src/test/resources/usecases/home/modules/spdy.mod index 92e31a2b231..cf79dfa0f20 100644 --- a/jetty-start/src/test/resources/usecases/home/modules/spdy.mod +++ b/jetty-start/src/test/resources/usecases/home/modules/spdy.mod @@ -1,7 +1,10 @@ +# +# SPDY Support Module +# [depend] -server -npn +ssl +protonego [lib] lib/spdy/*.jar @@ -9,3 +12,15 @@ lib/spdy/*.jar [xml] etc/jetty-ssl.xml etc/jetty-spdy.xml + +[ini-template] +## SPDY Configuration + +# Port for SPDY connections +spdy.port=8443 + +# SPDY idle timeout in milliseconds +spdy.timeout=30000 + +# Initial Window Size for SPDY +#spdy.initialWindowSize=65536 diff --git a/jetty-start/src/test/resources/usecases/home/modules/ssl.mod b/jetty-start/src/test/resources/usecases/home/modules/ssl.mod new file mode 100644 index 00000000000..449f58104fb --- /dev/null +++ b/jetty-start/src/test/resources/usecases/home/modules/ssl.mod @@ -0,0 +1,35 @@ +# +# SSL Keystore module +# + +[depend] +server + +[xml] +etc/jetty-ssl.xml + +[files] +http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore + +[ini-template] +## SSL Keystore Configuration +# define the port to use for secure redirection +jetty.secure.port=8443 + +# Setup a demonstration keystore and truststore +jetty.keystore=etc/keystore +jetty.truststore=etc/keystore + +# Set the demonstration passwords. +# Note that OBF passwords are not secure, just protected from casual observation +# See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html +jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g +jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + +# Set the client auth behavior +# Set to true if client certificate authentication is required +# jetty.ssl.needClientAuth=true +# Set to true if client certificate authentication is desired +# jetty.ssl.wantClientAuth=true + From fead772b64e27b9ed7421703e5a68a26522d0c4c Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Tue, 24 Jun 2014 10:43:15 +0200 Subject: [PATCH 016/111] 437706 ServletTester calls LocalConnector method with hardcoded timeout --- .../org/eclipse/jetty/servlet/ServletTester.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java index 2317195a183..965dd18de4a 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java @@ -23,6 +23,7 @@ import java.nio.ByteBuffer; import java.util.EnumSet; import java.util.Enumeration; import java.util.Map; +import java.util.concurrent.TimeUnit; import javax.servlet.DispatcherType; import javax.servlet.Filter; @@ -191,11 +192,21 @@ public class ServletTester extends ContainerLifeCycle { return _connector.getResponses(request); } - + + public String getResponses(String request, long idleFor,TimeUnit units) throws Exception + { + return _connector.getResponses(request, idleFor, units); + } + public ByteBuffer getResponses(ByteBuffer request) throws Exception { return _connector.getResponses(request); } + + public ByteBuffer getResponses(ByteBuffer requestsBuffer,long idleFor,TimeUnit units) throws Exception + { + return _connector.getResponses(requestsBuffer, idleFor, units); + } /* ------------------------------------------------------------ */ /** Create a port based connector. From 31ce7cabdad90f39581ec4641d75ee83125c5b4a Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 24 Jun 2014 11:32:40 +0200 Subject: [PATCH 017/111] 437800 Improved alias handling of different encodings --- .../java/org/eclipse/jetty/util/URIUtil.java | 29 +++++++++++++ .../jetty/util/resource/FileResource.java | 21 ++++------ .../util/{URITest.java => URIUtilTest.java} | 26 +++++++++++- .../jetty/util/resource/FileResourceTest.java | 42 +++++++++++++++++++ 4 files changed, 104 insertions(+), 14 deletions(-) rename jetty-util/src/test/java/org/eclipse/jetty/util/{URITest.java => URIUtilTest.java} (89%) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java index f333fc3b5f2..703ca0d0172 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java @@ -688,6 +688,35 @@ public class URIUtil url.append(':').append(port); } } + + public static boolean equalsIgnoreEncodings(String uriA, String uriB) + { + int lenA=uriA.length(); + int lenB=uriB.length(); + int a=0; + int b=0; + + while (a Date: Tue, 24 Jun 2014 12:27:03 +0200 Subject: [PATCH 018/111] 437996 avoid async status race by not setting 200 on handled --- .../org/eclipse/jetty/http/HttpStatus.java | 1 - .../rewrite/handler/ValidUrlRuleTest.java | 2 +- .../org/eclipse/jetty/server/Request.java | 3 -- .../org/eclipse/jetty/server/Response.java | 6 +-- .../server/handler/StatisticsHandler.java | 46 +++++++++---------- 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java index e6ea1f714a5..7db1fa64ff0 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpStatus.java @@ -612,7 +612,6 @@ package org.eclipse.jetty.http; */ public class HttpStatus { - public final static int NOT_SET_000 = 0; public final static int CONTINUE_100 = 100; public final static int SWITCHING_PROTOCOLS_101 = 101; public final static int PROCESSING_102 = 102; diff --git a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java index 47fa517d9b0..e8d6cda940e 100644 --- a/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java +++ b/jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/ValidUrlRuleTest.java @@ -45,7 +45,7 @@ public class ValidUrlRuleTest extends AbstractRuleTestCase _rule.matchAndApply(_request.getRequestURI(), _request, _response); - assertEquals(0,_response.getStatus()); + assertEquals(200,_response.getStatus()); } @Test diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index 77c80abc293..8dbb07792f3 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -1865,9 +1865,6 @@ public class Request implements HttpServletRequest public void setHandled(boolean h) { _handled = h; - Response r=getResponse(); - if (_handled && r.getStatus()==0) - r.setStatus(200); } /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index 0408c8825ca..eb95e204019 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -112,7 +112,7 @@ public class Response implements HttpServletResponse private final HttpFields _fields = new HttpFields(); private final AtomicInteger _include = new AtomicInteger(); private HttpOutput _out; - private int _status = HttpStatus.NOT_SET_000; + private int _status = HttpStatus.OK_200; private String _reason; private Locale _locale; private MimeTypes.Type _mimeType; @@ -137,7 +137,7 @@ public class Response implements HttpServletResponse protected void recycle() { - _status = HttpStatus.NOT_SET_000; + _status = HttpStatus.OK_200; _reason = null; _locale = null; _mimeType = null; @@ -1290,8 +1290,6 @@ public class Response implements HttpServletResponse protected ResponseInfo newResponseInfo() { - if (_status == HttpStatus.NOT_SET_000) - _status = HttpStatus.OK_200; return new ResponseInfo(_channel.getRequest().getHttpVersion(), _fields, getLongContentLength(), getStatus(), getReason(), _channel.getRequest().isHead()); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java index 98bb413429b..2e4ec6b7456 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java @@ -193,35 +193,35 @@ public class StatisticsHandler extends HandlerWrapper implements Graceful } } - private void updateResponse(Request request) + protected void updateResponse(Request request) { Response response = request.getResponse(); - switch (response.getStatus() / 100) + if (request.isHandled()) { - case 0: - if (request.isHandled()) + switch (response.getStatus() / 100) + { + case 1: + _responses1xx.incrementAndGet(); + break; + case 2: _responses2xx.incrementAndGet(); - else + break; + case 3: + _responses3xx.incrementAndGet(); + break; + case 4: _responses4xx.incrementAndGet(); - break; - case 1: - _responses1xx.incrementAndGet(); - break; - case 2: - _responses2xx.incrementAndGet(); - break; - case 3: - _responses3xx.incrementAndGet(); - break; - case 4: - _responses4xx.incrementAndGet(); - break; - case 5: - _responses5xx.incrementAndGet(); - break; - default: - break; + break; + case 5: + _responses5xx.incrementAndGet(); + break; + default: + break; + } } + else + // will fall through to not found handler + _responses4xx.incrementAndGet(); _responsesTotalBytes.addAndGet(response.getContentCount()); } From 3ff4195dbc3a5d2767e6ba1978d090ea41dd3d99 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 25 Jun 2014 11:28:22 +0200 Subject: [PATCH 019/111] Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. --- .../alpn/server/ALPNServerConnection.java | 3 +- .../client/AuthenticationProtocolHandler.java | 15 ++-- .../eclipse/jetty/client/ConnectionPool.java | 27 ++++--- .../org/eclipse/jetty/client/HttpChannel.java | 6 +- .../org/eclipse/jetty/client/HttpClient.java | 7 +- .../org/eclipse/jetty/client/HttpContent.java | 3 +- .../eclipse/jetty/client/HttpDestination.java | 6 +- .../eclipse/jetty/client/HttpExchange.java | 15 ++-- .../org/eclipse/jetty/client/HttpProxy.java | 3 +- .../eclipse/jetty/client/HttpReceiver.java | 18 +++-- .../eclipse/jetty/client/HttpRedirector.java | 3 +- .../org/eclipse/jetty/client/HttpSender.java | 45 +++++++---- .../client/MultiplexHttpDestination.java | 6 +- .../jetty/client/PoolingHttpDestination.java | 22 ++++-- .../org/eclipse/jetty/client/Socks4Proxy.java | 9 ++- .../jetty/client/TimeoutCompleteListener.java | 9 ++- .../client/http/HttpConnectionOverHTTP.java | 9 ++- .../client/http/HttpReceiverOverHTTP.java | 3 +- .../util/InputStreamContentProvider.java | 3 +- .../util/InputStreamResponseListener.java | 24 ++++-- .../client/util/PathContentProvider.java | 3 +- .../http/HttpClientTransportOverFCGI.java | 3 +- .../client/http/HttpConnectionOverFCGI.java | 3 +- .../eclipse/jetty/fcgi/generator/Flusher.java | 3 +- .../fcgi/parser/ResponseContentParser.java | 3 +- .../fcgi/server/HttpChannelOverFCGI.java | 6 +- .../org/eclipse/jetty/http/HttpGenerator.java | 12 ++- .../eclipse/jetty/io/AbstractConnection.java | 18 +++-- .../eclipse/jetty/io/AbstractEndPoint.java | 6 +- .../org/eclipse/jetty/io/ChannelEndPoint.java | 9 ++- .../org/eclipse/jetty/io/IdleTimeout.java | 6 +- .../jetty/io/SelectChannelEndPoint.java | 12 ++- .../org/eclipse/jetty/io/SelectorManager.java | 30 +++++--- .../jetty/io/UncheckedPrintWriter.java | 3 +- .../org/eclipse/jetty/jmx/MBeanContainer.java | 12 ++- .../org/eclipse/jetty/jmx/ObjectMBean.java | 74 ++++++++++++------- .../eclipse/jetty/proxy/ConnectHandler.java | 39 ++++++---- .../eclipse/jetty/proxy/ProxyConnection.java | 6 +- .../org/eclipse/jetty/server/HttpChannel.java | 12 ++- .../eclipse/jetty/server/HttpConnection.java | 9 ++- .../org/eclipse/jetty/server/HttpInput.java | 9 ++- .../jetty/server/HttpInputOverHTTP.java | 3 +- .../org/eclipse/jetty/server/HttpOutput.java | 5 +- .../eclipse/jetty/server/LocalConnector.java | 12 ++- .../server/NegotiatingServerConnection.java | 14 ++-- .../eclipse/jetty/server/QueuedHttpInput.java | 9 ++- .../java/org/eclipse/jetty/server/Server.java | 3 +- .../jetty/server/handler/AbstractHandler.java | 6 +- .../handler/AllowSymLinkAliasChecker.java | 6 +- .../jetty/server/handler/ContextHandler.java | 6 +- .../jetty/server/handler/ResourceHandler.java | 36 ++++----- .../jetty/server/handler/ShutdownHandler.java | 3 +- .../jetty/server/session/AbstractSession.java | 6 +- .../session/AbstractSessionIdManager.java | 3 +- .../server/session/JDBCSessionIdManager.java | 3 +- .../server/session/JDBCSessionManager.java | 15 ++-- .../jetty/server/session/SessionHandler.java | 3 +- .../eclipse/jetty/servlet/DefaultServlet.java | 6 +- .../eclipse/jetty/servlet/FilterHolder.java | 3 +- .../eclipse/jetty/servlet/ServletHandler.java | 16 ++-- .../eclipse/jetty/servlet/ServletHolder.java | 15 ++-- .../servlet/listener/ELContextCleaner.java | 24 +++--- .../jetty/spdy/client/SPDYConnection.java | 9 ++- .../eclipse/jetty/spdy/StandardSession.java | 63 ++++++++++------ .../eclipse/jetty/spdy/StandardStream.java | 24 ++++-- .../jetty/spdy/StandardSessionTest.java | 3 +- .../http/HTTPSPDYServerConnectionFactory.java | 9 ++- .../spdy/server/http/HttpChannelOverSPDY.java | 21 ++++-- .../server/http/HttpTransportOverSPDY.java | 36 ++++++--- .../server/http/ReferrerPushStrategy.java | 23 ++++-- .../spdy/server/proxy/HTTPProxyEngine.java | 18 +++-- .../server/proxy/ProxyEngineSelector.java | 15 ++-- .../spdy/server/proxy/SPDYProxyEngine.java | 60 ++++++++++----- .../spdy/server/NPNServerConnection.java | 3 +- .../org/eclipse/jetty/util/LeakDetector.java | 3 +- .../java/org/eclipse/jetty/util/Scanner.java | 8 +- .../jetty/util/SocketAddressResolver.java | 3 +- .../java/org/eclipse/jetty/util/TypeUtil.java | 14 ++-- .../util/component/AbstractLifeCycle.java | 12 +-- .../util/component/ContainerLifeCycle.java | 3 +- .../jetty/util/component/FileDestroyable.java | 3 +- .../util/preventers/AWTLeakPreventer.java | 3 +- .../preventers/AppContextLeakPreventer.java | 3 +- .../DriverManagerLeakPreventer.java | 3 +- .../jetty/util/resource/FileResource.java | 3 +- .../jetty/util/resource/JarFileResource.java | 3 +- .../jetty/util/ssl/SslContextFactory.java | 7 +- 87 files changed, 694 insertions(+), 369 deletions(-) diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java index 509682eb647..e3223c423b2 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java +++ b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java @@ -62,7 +62,8 @@ public class ALPNServerConnection extends NegotiatingServerConnection implements { negotiated = getDefaultProtocol(); } - LOG.debug("{} protocol selected {}", this, negotiated); + if (LOG.isDebugEnabled()) + LOG.debug("{} protocol selected {}", this, negotiated); setProtocol(negotiated); ALPN.remove(getSSLEngine()); return negotiated; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java index f6eabb6a3b6..306565ed2b9 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java @@ -86,7 +86,8 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler if (result.isFailed()) { Throwable failure = result.getFailure(); - LOG.debug("Authentication challenge failed {}", failure); + if (LOG.isDebugEnabled()) + LOG.debug("Authentication challenge failed {}", failure); forwardFailureComplete(request, result.getRequestFailure(), response, result.getResponseFailure()); return; } @@ -95,7 +96,8 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler if (conversation.getAttribute(AUTHENTICATION_ATTRIBUTE) != null) { // We have already tried to authenticate, but we failed again - LOG.debug("Bad credentials for {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Bad credentials for {}", request); forwardSuccessComplete(request, response); return; } @@ -104,7 +106,8 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler List headerInfos = parseAuthenticateHeader(response, header); if (headerInfos.isEmpty()) { - LOG.debug("Authentication challenge without {} header", header); + if (LOG.isDebugEnabled()) + LOG.debug("Authentication challenge without {} header", header); forwardFailureComplete(request, null, response, new HttpResponseException("HTTP protocol violation: Authentication challenge without " + header + " header", response)); return; } @@ -126,13 +129,15 @@ public abstract class AuthenticationProtocolHandler implements ProtocolHandler } if (authentication == null) { - LOG.debug("No authentication available for {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("No authentication available for {}", request); forwardSuccessComplete(request, response); return; } final Authentication.Result authnResult = authentication.authenticate(request, response, headerInfo, conversation); - LOG.debug("Authentication result {}", authnResult); + if (LOG.isDebugEnabled()) + LOG.debug("Authentication result {}", authnResult); if (authnResult == null) { forwardSuccessComplete(request, response); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java index 627228b3e38..49d1c650ac5 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java @@ -81,21 +81,24 @@ public class ConnectionPool implements Closeable, Dumpable if (next > maxConnections) { - LOG.debug("Max connections {}/{} reached", current, maxConnections); + if (LOG.isDebugEnabled()) + LOG.debug("Max connections {}/{} reached", current, maxConnections); // Try again the idle connections return acquireIdleConnection(); } if (connectionCount.compareAndSet(current, next)) { - LOG.debug("Connection {}/{} creation", next, maxConnections); + if (LOG.isDebugEnabled()) + LOG.debug("Connection {}/{} creation", next, maxConnections); destination.newConnection(new Promise() { @Override public void succeeded(Connection connection) { - LOG.debug("Connection {}/{} creation succeeded {}", next, maxConnections, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection {}/{} creation succeeded {}", next, maxConnections, connection); if (activate(connection)) connectionPromise.succeeded(connection); } @@ -103,7 +106,8 @@ public class ConnectionPool implements Closeable, Dumpable @Override public void failed(Throwable x) { - LOG.debug("Connection " + next + "/" + maxConnections + " creation failed", x); + if (LOG.isDebugEnabled()) + LOG.debug("Connection " + next + "/" + maxConnections + " creation failed", x); connectionCount.decrementAndGet(); connectionPromise.failed(x); } @@ -127,13 +131,15 @@ public class ConnectionPool implements Closeable, Dumpable { if (activeConnections.offer(connection)) { - LOG.debug("Connection active {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection active {}", connection); acquired(connection); return true; } else { - LOG.debug("Connection active overflow {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection active overflow {}", connection); connection.close(); return false; } @@ -151,12 +157,14 @@ public class ConnectionPool implements Closeable, Dumpable // Make sure we use "hot" connections first if (idleConnections.offerFirst(connection)) { - LOG.debug("Connection idle {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection idle {}", connection); return true; } else { - LOG.debug("Connection idle overflow {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection idle overflow {}", connection); connection.close(); } } @@ -177,7 +185,8 @@ public class ConnectionPool implements Closeable, Dumpable if (removed) { int pooled = connectionCount.decrementAndGet(); - LOG.debug("Connection removed {} - pooled: {}", connection, pooled); + if (LOG.isDebugEnabled()) + LOG.debug("Connection removed {} - pooled: {}", connection, pooled); } return removed; } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java index f4ee52bf144..3e6c31c0d80 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java @@ -46,7 +46,8 @@ public abstract class HttpChannel if (this.exchange.compareAndSet(null, exchange)) { exchange.associate(this); - LOG.debug("{} associated to {}", exchange, this); + if (LOG.isDebugEnabled()) + LOG.debug("{} associated to {}", exchange, this); } else { @@ -59,7 +60,8 @@ public abstract class HttpChannel HttpExchange exchange = this.exchange.getAndSet(null); if (exchange != null) exchange.disassociate(this); - LOG.debug("{} disassociated from {}", exchange, this); + if (LOG.isDebugEnabled()) + LOG.debug("{} disassociated from {}", exchange, this); return exchange; } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java index 3486c811039..28ea589492f 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java @@ -480,9 +480,14 @@ public class HttpClient extends ContainerLifeCycle { HttpDestination existing = destinations.putIfAbsent(origin, destination); if (existing != null) + { destination = existing; + } else - LOG.debug("Created {}", destination); + { + if (LOG.isDebugEnabled()) + LOG.debug("Created {}", destination); + } if (!isRunning()) destinations.remove(origin); } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java index 37476d7f6bd..d9cd89136c6 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpContent.java @@ -130,7 +130,8 @@ public class HttpContent implements Callback, Closeable if (content != AFTER) { content = buffer = AFTER; - LOG.debug("Advanced content past last chunk"); + if (LOG.isDebugEnabled()) + LOG.debug("Advanced content past last chunk"); } return false; } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java index cc83372c437..c539e78d4a3 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java @@ -175,14 +175,16 @@ public abstract class HttpDestination implements Destination, Closeable, Dumpabl } else { - LOG.debug("Queued {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {}", request); requestNotifier.notifyQueued(request); send(); } } else { - LOG.debug("Max queue size {} exceeded by {}", client.getMaxRequestsQueuedPerDestination(), request); + if (LOG.isDebugEnabled()) + LOG.debug("Max queue size {} exceeded by {}", client.getMaxRequestsQueuedPerDestination(), request); request.abort(new RejectedExecutionException("Max requests per destination " + client.getMaxRequestsQueuedPerDestination() + " exceeded for " + this)); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java index 704c9c3ccef..a7fde41be98 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java @@ -151,7 +151,8 @@ public class HttpExchange if ((current & terminated) == terminated) { // Request and response terminated - LOG.debug("{} terminated", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} terminated", this); return new Result(getRequest(), getRequestFailure(), getResponse(), getResponseFailure()); } return null; @@ -174,7 +175,8 @@ public class HttpExchange requestFailure = failure; if ((code & 0b0100) == 0b0100) responseFailure = failure; - LOG.debug("{} updated", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} updated", this); } break; } @@ -185,7 +187,8 @@ public class HttpExchange { if (destination.remove(this)) { - LOG.debug("Aborting while queued {}: {}", this, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborting while queued {}: {}", this, cause); return fail(cause); } else @@ -195,7 +198,8 @@ public class HttpExchange return fail(cause); boolean aborted = channel.abort(cause); - LOG.debug("Aborted while active ({}) {}: {}", aborted, this, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborted while active ({}) {}: {}", aborted, this, cause); return aborted; } } @@ -204,7 +208,8 @@ public class HttpExchange { if (update(0b0101, cause) == 0b0101) { - LOG.debug("Failing {}: {}", this, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Failing {}: {}", this, cause); destination.getRequestNotifier().notifyFailure(request, cause); List listeners = getConversation().getResponseListeners(); ResponseNotifier responseNotifier = destination.getResponseNotifier(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java index 0faf25e9ea2..5c3ac764fa0 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java @@ -186,7 +186,8 @@ public class HttpProxy extends ProxyConfiguration.Proxy // Avoid setting fill interest in the old Connection, // without closing the underlying EndPoint. oldConnection.softClose(); - LOG.debug("HTTP tunnel established: {} over {}", oldConnection, newConnection); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP tunnel established: {} over {}", oldConnection, newConnection); } catch (Throwable x) { diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java index becab10b57a..7e163caab04 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java @@ -117,11 +117,13 @@ public abstract class HttpReceiver if (protocolHandler != null) { handlerListener = protocolHandler.getResponseListener(); - LOG.debug("Found protocol handler {}", protocolHandler); + if (LOG.isDebugEnabled()) + LOG.debug("Found protocol handler {}", protocolHandler); } exchange.getConversation().updateResponseListeners(handlerListener); - LOG.debug("Response begin {}", response); + if (LOG.isDebugEnabled()) + LOG.debug("Response begin {}", response); ResponseNotifier notifier = destination.getResponseNotifier(); notifier.notifyBegin(conversation.getResponseListeners(), response); @@ -337,7 +339,8 @@ public abstract class HttpReceiver Result result = exchange.terminateResponse(null); HttpResponse response = exchange.getResponse(); - LOG.debug("Response success {}", response); + if (LOG.isDebugEnabled()) + LOG.debug("Response success {}", response); List listeners = exchange.getConversation().getResponseListeners(); ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifySuccess(listeners, response); @@ -347,7 +350,8 @@ public abstract class HttpReceiver boolean ordered = getHttpDestination().getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); - LOG.debug("Request/Response succeeded {}", response); + if (LOG.isDebugEnabled()) + LOG.debug("Request/Response succeeded {}", response); notifier.notifyComplete(listeners, result); if (ordered) channel.exchangeTerminated(result); @@ -388,7 +392,8 @@ public abstract class HttpReceiver Result result = exchange.terminateResponse(failure); HttpResponse response = exchange.getResponse(); - LOG.debug("Response failure {} {}", response, failure); + if (LOG.isDebugEnabled()) + LOG.debug("Response failure {} {}", response, failure); List listeners = exchange.getConversation().getResponseListeners(); ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifyFailure(listeners, response, failure); @@ -398,7 +403,8 @@ public abstract class HttpReceiver boolean ordered = getHttpDestination().getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); - LOG.debug("Request/Response failed {}", response); + if (LOG.isDebugEnabled()) + LOG.debug("Request/Response failed {}", response); notifier.notifyComplete(listeners, result); if (ordered) channel.exchangeTerminated(result); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java index 3d7f42d69ec..abcdd40db52 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java @@ -156,7 +156,8 @@ public class HttpRedirector URI newURI = extractRedirectURI(response); if (newURI != null) { - LOG.debug("Redirecting to {} (Location: {})", newURI, location); + if (LOG.isDebugEnabled()) + LOG.debug("Redirecting to {} (Location: {})", newURI, location); return redirect(request, response, listener, newURI); } else diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java index d2e26bdafd2..ddb15590197 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java @@ -99,7 +99,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.SENDING; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); contentCallback.iterate(); return; } @@ -110,7 +111,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.SENDING_WITH_CONTENT; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); return; } break; @@ -120,7 +122,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.EXPECTING_WITH_CONTENT; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); return; } break; @@ -130,7 +133,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener SenderState newSenderState = SenderState.PROCEEDING_WITH_CONTENT; if (updateSenderState(current, newSenderState)) { - LOG.debug("Deferred content available, {} -> {}", current, newSenderState); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {} -> {}", current, newSenderState); return; } break; @@ -140,7 +144,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener case PROCEEDING_WITH_CONTENT: case WAITING: { - LOG.debug("Deferred content available, {}", current); + if (LOG.isDebugEnabled()) + LOG.debug("Deferred content available, {}", current); return; } default: @@ -194,7 +199,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { if (!updateRequestState(RequestState.QUEUED, RequestState.BEGIN)) return false; - LOG.debug("Request begin {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request begin {}", request); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyBegin(request); return true; @@ -215,7 +221,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { if (!updateRequestState(RequestState.HEADERS, RequestState.COMMIT)) return false; - LOG.debug("Request committed {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request committed {}", request); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyCommit(request); return true; @@ -272,7 +279,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener // It is important to notify completion *after* we reset because // the notification may trigger another request/response Request request = exchange.getRequest(); - LOG.debug("Request success {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request success {}", request); HttpDestination destination = getHttpChannel().getHttpDestination(); destination.getRequestNotifier().notifySuccess(exchange.getRequest()); @@ -281,7 +289,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener boolean ordered = destination.getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); - LOG.debug("Request/Response succeded {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request/Response succeded {}", request); HttpConversation conversation = exchange.getConversation(); destination.getResponseNotifier().notifyComplete(conversation.getResponseListeners(), result); if (ordered) @@ -321,7 +330,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener Result result = exchange.terminateRequest(failure); Request request = exchange.getRequest(); - LOG.debug("Request failure {} {}", exchange, failure); + if (LOG.isDebugEnabled()) + LOG.debug("Request failure {} {}", exchange, failure); HttpDestination destination = getHttpChannel().getHttpDestination(); destination.getRequestNotifier().notifyFailure(request, failure); @@ -332,7 +342,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener if (exchange.responseComplete()) { result = exchange.terminateResponse(failure); - LOG.debug("Failed response from request {}", exchange); + if (LOG.isDebugEnabled()) + LOG.debug("Failed response from request {}", exchange); } } @@ -341,7 +352,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener boolean ordered = destination.getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); - LOG.debug("Request/Response failed {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Request/Response failed {}", request); HttpConversation conversation = exchange.getConversation(); destination.getResponseNotifier().notifyComplete(conversation.getResponseListeners(), result); if (ordered) @@ -426,7 +438,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener // We are still sending the headers, but we already got the 100 Continue. if (updateSenderState(current, SenderState.PROCEEDING)) { - LOG.debug("Proceeding while expecting"); + if (LOG.isDebugEnabled()) + LOG.debug("Proceeding while expecting"); return; } break; @@ -441,7 +454,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener // WritePendingException). if (updateSenderState(current, SenderState.PROCEEDING_WITH_CONTENT)) { - LOG.debug("Proceeding while scheduled"); + if (LOG.isDebugEnabled()) + LOG.debug("Proceeding while scheduled"); return; } break; @@ -451,7 +465,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener // We received the 100 Continue, now send the content if any. if (!updateSenderState(current, SenderState.SENDING)) throw illegalSenderState(current); - LOG.debug("Proceeding while waiting"); + if (LOG.isDebugEnabled()) + LOG.debug("Proceeding while waiting"); contentCallback.iterate(); return; } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java index 475007523fc..e95ecb96a57 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexHttpDestination.java @@ -94,7 +94,8 @@ public abstract class MultiplexHttpDestination extends Htt { HttpClient client = getHttpClient(); final HttpExchange exchange = getHttpExchanges().poll(); - LOG.debug("Processing {} on {}", exchange, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Processing {} on {}", exchange, connection); if (exchange == null) return false; @@ -102,7 +103,8 @@ public abstract class MultiplexHttpDestination extends Htt Throwable cause = request.getAbortCause(); if (cause != null) { - LOG.debug("Aborted before processing {}: {}", exchange, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborted before processing {}: {}", exchange, cause); // It may happen that the request is aborted before the exchange // is created. Aborting the exchange a second time will result in // a no-operation, so we just abort here to cover that edge case. diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java index 24c77e84d8e..17f780b85d2 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java @@ -93,7 +93,8 @@ public abstract class PoolingHttpDestination extends HttpD { HttpClient client = getHttpClient(); final HttpExchange exchange = getHttpExchanges().poll(); - LOG.debug("Processing exchange {} on connection {}", exchange, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Processing exchange {} on connection {}", exchange, connection); if (exchange == null) { if (!connectionPool.release(connection)) @@ -101,7 +102,8 @@ public abstract class PoolingHttpDestination extends HttpD if (!client.isRunning()) { - LOG.debug("{} is stopping", client); + if (LOG.isDebugEnabled()) + LOG.debug("{} is stopping", client); connection.close(); } } @@ -111,7 +113,8 @@ public abstract class PoolingHttpDestination extends HttpD Throwable cause = request.getAbortCause(); if (cause != null) { - LOG.debug("Aborted before processing {}: {}", exchange, cause); + if (LOG.isDebugEnabled()) + LOG.debug("Aborted before processing {}: {}", exchange, cause); // It may happen that the request is aborted before the exchange // is created. Aborting the exchange a second time will result in // a no-operation, so we just abort here to cover that edge case. @@ -145,18 +148,25 @@ public abstract class PoolingHttpDestination extends HttpD { @SuppressWarnings("unchecked") C connection = (C)c; - LOG.debug("{} released", connection); + if (LOG.isDebugEnabled()) + LOG.debug("{} released", connection); HttpClient client = getHttpClient(); if (client.isRunning()) { if (connectionPool.isActive(connection)) + { process(connection, false); + } else - LOG.debug("{} explicit", connection); + { + if (LOG.isDebugEnabled()) + LOG.debug("{} explicit", connection); + } } else { - LOG.debug("{} is stopped", client); + if (LOG.isDebugEnabled()) + LOG.debug("{} is stopped", client); close(connection); connection.close(); } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java b/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java index 037871e22fc..6886ef1aa29 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java @@ -133,7 +133,8 @@ public class Socks4Proxy extends ProxyConfiguration.Proxy @Override public void succeeded() { - LOG.debug("Written SOCKS4 connect request"); + if (LOG.isDebugEnabled()) + LOG.debug("Written SOCKS4 connect request"); fillInterested(); } @@ -153,7 +154,8 @@ public class Socks4Proxy extends ProxyConfiguration.Proxy { ByteBuffer buffer = BufferUtil.allocate(8); int filled = getEndPoint().fill(buffer); - LOG.debug("Read SOCKS4 connect response, {} bytes", filled); + if (LOG.isDebugEnabled()) + LOG.debug("Read SOCKS4 connect response, {} bytes", filled); if (filled != 8) throw new IOException("Invalid response from SOCKS4 proxy"); int result = buffer.get(1); @@ -179,7 +181,8 @@ public class Socks4Proxy extends ProxyConfiguration.Proxy connectionFactory = new SslClientConnectionFactory(client.getSslContextFactory(), client.getByteBufferPool(), client.getExecutor(), connectionFactory); org.eclipse.jetty.io.Connection connection = connectionFactory.newConnection(getEndPoint(), context); ClientConnectionFactory.Helper.replaceConnection(this, connection); - LOG.debug("SOCKS4 tunnel established: {} over {}", this, connection); + if (LOG.isDebugEnabled()) + LOG.debug("SOCKS4 tunnel established: {} over {}", this, connection); } catch (Throwable x) { diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java index 80859a439b5..e8e7cebbcd1 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java @@ -48,7 +48,8 @@ public class TimeoutCompleteListener implements Response.CompleteListener, Runna if (task != null) { boolean cancelled = task.cancel(); - LOG.debug("Cancelled (successfully: {}) timeout task {}", cancelled, task); + if (LOG.isDebugEnabled()) + LOG.debug("Cancelled (successfully: {}) timeout task {}", cancelled, task); } } @@ -58,14 +59,16 @@ public class TimeoutCompleteListener implements Response.CompleteListener, Runna Scheduler.Task task = scheduler.schedule(this, timeout, TimeUnit.MILLISECONDS); if (this.task.getAndSet(task) != null) throw new IllegalStateException(); - LOG.debug("Scheduled timeout task {} in {} ms for {}", task, timeout, request); + if (LOG.isDebugEnabled()) + LOG.debug("Scheduled timeout task {} in {} ms for {}", task, timeout, request); return true; } @Override public void run() { - LOG.debug("Executing timeout task {} for {}", task, request); + if (LOG.isDebugEnabled()) + LOG.debug("Executing timeout task {} for {}", task, request); request.abort(new TimeoutException("Total timeout elapsed")); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java index 0b1b1b0fcf2..d02574417fa 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java @@ -85,7 +85,8 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec @Override protected boolean onReadTimeout() { - LOG.debug("{} idle timeout", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} idle timeout", this); close(new TimeoutException()); return false; } @@ -127,9 +128,11 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec // from an onFailure() handler or by blocking code waiting for completion. getHttpDestination().close(this); getEndPoint().shutdownOutput(); - LOG.debug("{} oshut", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} oshut", this); getEndPoint().close(); - LOG.debug("{} closed", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} closed", this); abort(failure); } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java index f98f4828942..aa62323d013 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java @@ -230,7 +230,8 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res @Override public void resume() { - LOG.debug("Content consumed asynchronously, resuming processing"); + if (LOG.isDebugEnabled()) + LOG.debug("Content consumed asynchronously, resuming processing"); process(); } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java index 89d3022ae27..caa6a974d13 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamContentProvider.java @@ -149,7 +149,8 @@ public class InputStreamContentProvider implements ContentProvider byte[] bytes = new byte[bufferSize]; int read = stream.read(bytes); - LOG.debug("Read {} bytes from {}", read, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Read {} bytes from {}", read, stream); if (read > 0) { hasNext = Boolean.TRUE; diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java index 734e32d0bda..aba6602b80c 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java @@ -116,23 +116,27 @@ public class InputStreamResponseListener extends Listener.Adapter byte[] bytes = new byte[remaining]; content.get(bytes); - LOG.debug("Queuing {}/{} bytes", bytes, remaining); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {}/{} bytes", bytes, remaining); queue.offer(bytes); long newLength = length.addAndGet(remaining); while (newLength >= maxBufferSize) { - LOG.debug("Queued bytes limit {}/{} exceeded, waiting", newLength, maxBufferSize); + if (LOG.isDebugEnabled()) + LOG.debug("Queued bytes limit {}/{} exceeded, waiting", newLength, maxBufferSize); // Block to avoid infinite buffering if (!await()) break; newLength = length.get(); - LOG.debug("Queued bytes limit {}/{} exceeded, woken up", newLength, maxBufferSize); + if (LOG.isDebugEnabled()) + LOG.debug("Queued bytes limit {}/{} exceeded, woken up", newLength, maxBufferSize); } } else { - LOG.debug("Queuing skipped, empty content {}", content); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing skipped, empty content {}", content); } } else @@ -147,12 +151,14 @@ public class InputStreamResponseListener extends Listener.Adapter this.result = result; if (result.isSucceeded()) { - LOG.debug("Queuing end of content {}{}", EOF, ""); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing end of content {}{}", EOF, ""); queue.offer(EOF); } else { - LOG.debug("Queuing failure {} {}", FAILURE, failure); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing failure {} {}", FAILURE, failure); queue.offer(FAILURE); this.failure = result.getFailure(); responseLatch.countDown(); @@ -288,7 +294,8 @@ public class InputStreamResponseListener extends Listener.Adapter else { bytes = take(); - LOG.debug("Dequeued {}/{} bytes", bytes, bytes.length); + if (LOG.isDebugEnabled()) + LOG.debug("Dequeued {}/{} bytes", bytes, bytes.length); } } } @@ -319,7 +326,8 @@ public class InputStreamResponseListener extends Listener.Adapter if (!closed) { super.close(); - LOG.debug("Queuing close {}{}", CLOSED, ""); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing close {}{}", CLOSED, ""); queue.offer(CLOSED); closed = true; signal(); diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java index 676c7916091..8d480d87fc9 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/PathContentProvider.java @@ -107,7 +107,8 @@ public class PathContentProvider extends AbstractTypedContentProvider if (channel == null) { channel = Files.newByteChannel(filePath, StandardOpenOption.READ); - LOG.debug("Opened file {}", filePath); + if (LOG.isDebugEnabled()) + LOG.debug("Opened file {}", filePath); } buffer.clear(); diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java index 00c6778d5e3..26da12f29ce 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpClientTransportOverFCGI.java @@ -70,7 +70,8 @@ public class HttpClientTransportOverFCGI extends AbstractHttpClientTransport { HttpDestination destination = (HttpDestination)context.get(HTTP_DESTINATION_CONTEXT_KEY); HttpConnectionOverFCGI connection = new HttpConnectionOverFCGI(endPoint, destination, isMultiplexed()); - LOG.debug("Created {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Created {}", connection); @SuppressWarnings("unchecked") Promise promise = (Promise)context.get(HTTP_CONNECTION_PROMISE_CONTEXT_KEY); promise.succeeded(connection); diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java index a4625e366d7..ab41fe689d5 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java @@ -415,7 +415,8 @@ public class HttpConnectionOverFCGI extends AbstractConnection implements Connec private void noChannel(int request) { - LOG.debug("Channel not found for request {}", request); + if (LOG.isDebugEnabled()) + LOG.debug("Channel not found for request {}", request); } } } diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java index 2f1b750f2b7..d4bf7697d0f 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java @@ -137,7 +137,8 @@ public class Flusher private void shutdown() { - LOG.debug("Shutting down {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Shutting down {}", endPoint); endPoint.shutdownOutput(); } } diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java index 83a9a79ddb1..0e1b685bcb5 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/parser/ResponseContentParser.java @@ -89,7 +89,8 @@ public class ResponseContentParser extends StreamContentParser public boolean parse(ByteBuffer buffer) { - LOG.debug("Response {} {} content {} {}", request, FCGI.StreamType.STD_OUT, state, buffer); + if (LOG.isDebugEnabled()) + LOG.debug("Response {} {} content {} {}", request, FCGI.StreamType.STD_OUT, state, buffer); int remaining = buffer.remaining(); while (remaining > 0) diff --git a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java index 0338a402f4a..e01802c1952 100644 --- a/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java +++ b/jetty-fcgi/fcgi-server/src/main/java/org/eclipse/jetty/fcgi/server/HttpChannelOverFCGI.java @@ -132,7 +132,8 @@ public class HttpChannelOverFCGI extends HttpChannel while (true) { State current = state.get(); - LOG.debug("Dispatching, state={}", current); + if (LOG.isDebugEnabled()) + LOG.debug("Dispatching, state={}", current); switch (current) { case IDLE: @@ -167,7 +168,8 @@ public class HttpChannelOverFCGI extends HttpChannel while (true) { State current = state.get(); - LOG.debug("Running, state={}", current); + if (LOG.isDebugEnabled()) + LOG.debug("Running, state={}", current); switch (current) { case DISPATCH: diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java index a51e4ba7b85..b3a3b37c45d 100644 --- a/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java +++ b/jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java @@ -287,7 +287,8 @@ public class HttpGenerator { if (BufferUtil.hasContent(content)) { - LOG.debug("discarding content in COMPLETING"); + if (LOG.isDebugEnabled()) + LOG.debug("discarding content in COMPLETING"); BufferUtil.clear(content); } @@ -310,7 +311,8 @@ public class HttpGenerator case END: if (BufferUtil.hasContent(content)) { - LOG.debug("discarding content in COMPLETING"); + if (LOG.isDebugEnabled()) + LOG.debug("discarding content in COMPLETING"); BufferUtil.clear(content); } return Result.DONE; @@ -436,7 +438,8 @@ public class HttpGenerator { if (BufferUtil.hasContent(content)) { - LOG.debug("discarding content in COMPLETING"); + if (LOG.isDebugEnabled()) + LOG.debug("discarding content in COMPLETING"); BufferUtil.clear(content); } @@ -462,7 +465,8 @@ public class HttpGenerator case END: if (BufferUtil.hasContent(content)) { - LOG.debug("discarding content in COMPLETING"); + if (LOG.isDebugEnabled()) + LOG.debug("discarding content in COMPLETING"); BufferUtil.clear(content); } return Result.DONE; diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java index 7f8e9f81ca0..985065c4988 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java @@ -124,7 +124,8 @@ public abstract class AbstractConnection implements Connection */ public void fillInterested() { - LOG.debug("fillInterested {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("fillInterested {}",this); while(true) { @@ -136,7 +137,8 @@ public abstract class AbstractConnection implements Connection public void fillInterested(Callback callback) { - LOG.debug("fillInterested {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("fillInterested {}",this); while(true) { @@ -162,7 +164,8 @@ public abstract class AbstractConnection implements Connection */ protected void onFillInterestedFailed(Throwable cause) { - LOG.debug("{} onFillInterestedFailed {}", this, cause); + if (LOG.isDebugEnabled()) + LOG.debug("{} onFillInterestedFailed {}", this, cause); if (_endPoint.isOpen()) { boolean close = true; @@ -193,7 +196,8 @@ public abstract class AbstractConnection implements Connection @Override public void onOpen() { - LOG.debug("onOpen {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("onOpen {}", this); for (Listener listener : listeners) listener.onOpened(this); @@ -202,7 +206,8 @@ public abstract class AbstractConnection implements Connection @Override public void onClose() { - LOG.debug("onClose {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("onClose {}",this); for (Listener listener : listeners) listener.onClosed(this); @@ -262,7 +267,8 @@ public abstract class AbstractConnection implements Connection return true; if(_state.compareAndSet(state,next)) { - LOG.debug("{}-->{} {}",state,next,this); + if (LOG.isDebugEnabled()) + LOG.debug("{}-->{} {}",state,next,this); if (next!=state) next.onEnter(AbstractConnection.this); return true; diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java index 8fa2cc86ef9..6f2b011db66 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java @@ -94,7 +94,8 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint @Override public void onOpen() { - LOG.debug("onOpen {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("onOpen {}",this); super.onOpen(); } @@ -102,7 +103,8 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint public void onClose() { super.onClose(); - LOG.debug("onClose {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("onClose {}",this); _writeFlusher.onClose(); _fillInterest.onClose(); } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java index c65ca0ccfc8..7c80d06bcad 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java @@ -61,7 +61,8 @@ public class ChannelEndPoint extends AbstractEndPoint protected void shutdownInput() { - LOG.debug("ishut {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("ishut {}", this); _ishut=true; if (_oshut) close(); @@ -70,7 +71,8 @@ public class ChannelEndPoint extends AbstractEndPoint @Override public void shutdownOutput() { - LOG.debug("oshut {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("oshut {}", this); _oshut = true; if (_channel.isOpen()) { @@ -109,7 +111,8 @@ public class ChannelEndPoint extends AbstractEndPoint public void close() { super.close(); - LOG.debug("close {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("close {}", this); try { _channel.close(); diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java b/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java index 8b251ac862c..64b996f021e 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/IdleTimeout.java @@ -142,13 +142,15 @@ public abstract class IdleTimeout long idleElapsed = System.currentTimeMillis() - idleTimestamp; long idleLeft = idleTimeout - idleElapsed; - LOG.debug("{} idle timeout check, elapsed: {} ms, remaining: {} ms", this, idleElapsed, idleLeft); + if (LOG.isDebugEnabled()) + LOG.debug("{} idle timeout check, elapsed: {} ms, remaining: {} ms", this, idleElapsed, idleLeft); if (idleTimestamp != 0 && idleTimeout > 0) { if (idleLeft <= 0) { - LOG.debug("{} idle timeout expired", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} idle timeout expired", this); try { onIdleExpired(new TimeoutException("Idle timeout expired: " + idleElapsed + "/" + idleTimeout + " ms")); diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java index 30504029947..e60c9fa706b 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java @@ -132,18 +132,21 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa { if (_interestOps.compareAndSet(oldInterestOps, newInterestOps)) { - LOG.debug("Local interests updated {} -> {} for {}", oldInterestOps, newInterestOps, this); + if (LOG.isDebugEnabled()) + LOG.debug("Local interests updated {} -> {} for {}", oldInterestOps, newInterestOps, this); _selector.updateKey(_updateTask); } else { - LOG.debug("Local interests update conflict: now {}, was {}, attempted {} for {}", _interestOps.get(), oldInterestOps, newInterestOps, this); + if (LOG.isDebugEnabled()) + LOG.debug("Local interests update conflict: now {}, was {}, attempted {} for {}", _interestOps.get(), oldInterestOps, newInterestOps, this); continue; } } else { - LOG.debug("Ignoring local interests update {} -> {} for {}", oldInterestOps, newInterestOps, this); + if (LOG.isDebugEnabled()) + LOG.debug("Ignoring local interests update {} -> {} for {}", oldInterestOps, newInterestOps, this); } break; } @@ -152,7 +155,8 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa private void setKeyInterests(int oldInterestOps, int newInterestOps) { - LOG.debug("Key interests updated {} -> {}", oldInterestOps, newInterestOps); + if (LOG.isDebugEnabled()) + LOG.debug("Key interests updated {} -> {}", oldInterestOps, newInterestOps); _key.interestOps(newInterestOps); } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java index fd3c6c6b9ee..66da637c777 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java @@ -377,11 +377,13 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa @Override protected void doStop() throws Exception { - LOG.debug("Stopping {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Stopping {}", this); Stop stop = new Stop(); submit(stop); stop.await(getStopTimeout()); - LOG.debug("Stopped {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Stopped {}", this); } /** @@ -419,7 +421,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa // change to the queue and process the state. _changes.offer(change); - LOG.debug("Queued change {}", change); + if (LOG.isDebugEnabled()) + LOG.debug("Queued change {}", change); out: while (true) { @@ -463,7 +466,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa { try { - LOG.debug("Running change {}", change); + if (LOG.isDebugEnabled()) + LOG.debug("Running change {}", change); change.run(); } catch (Throwable x) @@ -480,14 +484,16 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa try { _thread.setName(name + "-selector-" + SelectorManager.this.getClass().getSimpleName()+"@"+Integer.toHexString(SelectorManager.this.hashCode())+"/"+_id); - LOG.debug("Starting {} on {}", _thread, this); + if (LOG.isDebugEnabled()) + LOG.debug("Starting {} on {}", _thread, this); while (isRunning()) select(); runChanges(); } finally { - LOG.debug("Stopped {} on {}", _thread, this); + if (LOG.isDebugEnabled()) + LOG.debug("Stopped {} on {}", _thread, this); _thread.setName(name); } } @@ -671,13 +677,15 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa Connection connection = newConnection(channel, endPoint, selectionKey.attachment()); endPoint.setConnection(connection); connectionOpened(connection); - LOG.debug("Created {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Created {}", endPoint); return endPoint; } public void destroyEndPoint(EndPoint endPoint) { - LOG.debug("Destroyed {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Destroyed {}", endPoint); Connection connection = endPoint.getConnection(); if (connection != null) connectionClosed(connection); @@ -792,7 +800,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa try { SelectionKey key = _channel.register(_selector, SelectionKey.OP_ACCEPT, null); - LOG.debug("{} acceptor={}", this, key); + if (LOG.isDebugEnabled()) + LOG.debug("{} acceptor={}", this, key); } catch (Throwable x) { @@ -881,7 +890,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa SocketChannel channel = connect.channel; if (channel.isConnectionPending()) { - LOG.debug("Channel {} timed out while connecting, closing it", channel); + if (LOG.isDebugEnabled()) + LOG.debug("Channel {} timed out while connecting, closing it", channel); connect.failed(new SocketTimeoutException()); } } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java b/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java index 6898ddfb93f..66e90a2c746 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/UncheckedPrintWriter.java @@ -129,7 +129,8 @@ public class UncheckedPrintWriter extends PrintWriter _ioException.initCause(th); } - LOG.debug(th); + if (LOG.isDebugEnabled()) + LOG.debug(th); } diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java index 35be7d6177f..e5386f19b2b 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java @@ -128,7 +128,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable @Override public void beanAdded(Container parent, Object obj) { - LOG.debug("beanAdded {}->{}",parent,obj); + if (LOG.isDebugEnabled()) + LOG.debug("beanAdded {}->{}",parent,obj); // Is their an object name for the parent ObjectName pname=null; @@ -206,7 +207,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable } ObjectInstance oinstance = _mbeanServer.registerMBean(mbean, oname); - LOG.debug("Registered {}", oinstance.getObjectName()); + if (LOG.isDebugEnabled()) + LOG.debug("Registered {}", oinstance.getObjectName()); _beans.put(obj, oinstance.getObjectName()); } @@ -219,7 +221,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable @Override public void beanRemoved(Container parent, Object obj) { - LOG.debug("beanRemoved {}",obj); + if (LOG.isDebugEnabled()) + LOG.debug("beanRemoved {}",obj); ObjectName bean = _beans.remove(obj); if (bean != null) @@ -227,7 +230,8 @@ public class MBeanContainer implements Container.InheritedListener, Dumpable try { _mbeanServer.unregisterMBean(bean); - LOG.debug("Unregistered {}", bean); + if (LOG.isDebugEnabled()) + LOG.debug("Unregistered {}", bean); } catch (javax.management.InstanceNotFoundException e) { diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java index 4445294a2f6..5a7ab0b4851 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java @@ -132,7 +132,8 @@ public class ObjectMBean implements DynamicMBean { Class mClass = (Object.class.equals(oClass))?oClass=ObjectMBean.class:Loader.loadClass(oClass,mName); - LOG.debug("ObjectMbean: mbeanFor {} mClass={}", o, mClass); + if (LOG.isDebugEnabled()) + LOG.debug("ObjectMbean: mbeanFor {} mClass={}", o, mClass); try { @@ -149,7 +150,8 @@ public class ObjectMBean implements DynamicMBean } } - LOG.debug("mbeanFor {} is {}", o, mbean); + if (LOG.isDebugEnabled()) + LOG.debug("mbeanFor {} is {}", o, mbean); return mbean; } @@ -241,7 +243,8 @@ public class ObjectMBean implements DynamicMBean Class o_class=_managed.getClass(); List> influences = findInfluences(new ArrayList>(), _managed.getClass()); - LOG.debug("Influence Count: {}", influences.size() ); + if (LOG.isDebugEnabled()) + LOG.debug("Influence Count: {}", influences.size() ); // Process Type Annotations ManagedObject primary = o_class.getAnnotation( ManagedObject.class); @@ -252,7 +255,8 @@ public class ObjectMBean implements DynamicMBean } else { - LOG.debug("No @ManagedObject declared on {}", _managed.getClass()); + if (LOG.isDebugEnabled()) + LOG.debug("No @ManagedObject declared on {}", _managed.getClass()); } @@ -263,10 +267,13 @@ public class ObjectMBean implements DynamicMBean ManagedObject typeAnnotation = oClass.getAnnotation( ManagedObject.class ); - LOG.debug("Influenced by: " + oClass.getCanonicalName() ); + if (LOG.isDebugEnabled()) + LOG.debug("Influenced by: " + oClass.getCanonicalName() ); + if ( typeAnnotation == null ) { - LOG.debug("Annotations not found for: {}", oClass.getCanonicalName() ); + if (LOG.isDebugEnabled()) + LOG.debug("Annotations not found for: {}", oClass.getCanonicalName() ); continue; } @@ -279,7 +286,8 @@ public class ObjectMBean implements DynamicMBean if (methodAttributeAnnotation != null) { // TODO sort out how a proper name could get here, its a method name as an attribute at this point. - LOG.debug("Attribute Annotation found for: {}", method.getName()); + if (LOG.isDebugEnabled()) + LOG.debug("Attribute Annotation found for: {}", method.getName()); MBeanAttributeInfo mai = defineAttribute(method,methodAttributeAnnotation); if ( mai != null ) { @@ -291,9 +299,9 @@ public class ObjectMBean implements DynamicMBean if (methodOperationAnnotation != null) { - LOG.debug("Method Annotation found for: {}", method.getName()); + if (LOG.isDebugEnabled()) + LOG.debug("Method Annotation found for: {}", method.getName()); MBeanOperationInfo oi = defineOperation(method,methodOperationAnnotation); - if (oi != null) { operations.add(oi); @@ -480,7 +488,8 @@ public class ObjectMBean implements DynamicMBean /* ------------------------------------------------------------ */ public AttributeList setAttributes(AttributeList attrs) { - LOG.debug("setAttributes"); + if (LOG.isDebugEnabled()) + LOG.debug("setAttributes"); AttributeList results = new AttributeList(attrs.size()); Iterator iter = attrs.iterator(); @@ -503,7 +512,8 @@ public class ObjectMBean implements DynamicMBean /* ------------------------------------------------------------ */ public Object invoke(String name, Object[] params, String[] signature) throws MBeanException, ReflectionException { - LOG.debug("ObjectMBean:invoke " + name); + if (LOG.isDebugEnabled()) + LOG.debug("ObjectMBean:invoke " + name); String methodKey = name + "("; if (signature != null) @@ -562,12 +572,14 @@ public class ObjectMBean implements DynamicMBean try { Class mbeanClazz = Class.forName(mName); - LOG.debug("MBean Influence found for " + aClass.getSimpleName()); + if (LOG.isDebugEnabled()) + LOG.debug("MBean Influence found for " + aClass.getSimpleName()); influences.add(mbeanClazz); } catch (ClassNotFoundException cnfe) { - LOG.debug("No MBean Influence for " + aClass.getSimpleName()); + if (LOG.isDebugEnabled()) + LOG.debug("No MBean Influence for " + aClass.getSimpleName()); } // So are the super classes @@ -637,7 +649,8 @@ public class ObjectMBean implements DynamicMBean String uName = name.substring(0, 1).toUpperCase(Locale.ENGLISH) + name.substring(1); Class oClass = onMBean ? this.getClass() : _managed.getClass(); - LOG.debug("defineAttribute {} {}:{}:{}:{}",name,onMBean,readonly,oClass,description); + if (LOG.isDebugEnabled()) + LOG.debug("defineAttribute {} {}:{}:{}:{}",name,onMBean,readonly,oClass,description); Method setter = null; @@ -646,7 +659,9 @@ public class ObjectMBean implements DynamicMBean { String declaredSetter = attributeAnnotation.setter(); - LOG.debug("DeclaredSetter: {}", declaredSetter); + if (LOG.isDebugEnabled()) + LOG.debug("DeclaredSetter: {}", declaredSetter); + Method[] methods = oClass.getMethods(); for (int m = 0; m < methods.length; m++) { @@ -670,7 +685,8 @@ public class ObjectMBean implements DynamicMBean LOG.warn("Type conflict for mbean attr {} in {}", name, oClass); continue; } - LOG.debug("Declared Setter: " + declaredSetter); + if (LOG.isDebugEnabled()) + LOG.debug("Declared Setter: " + declaredSetter); } } @@ -696,16 +712,17 @@ public class ObjectMBean implements DynamicMBean { if (component_type==null) { - LOG.warn("No mbean type for {} on {}", name, _managed.getClass()); - return null; - } + LOG.warn("No mbean type for {} on {}", name, _managed.getClass()); + return null; + } if (component_type.isPrimitive() && !component_type.isArray()) { - LOG.warn("Cannot convert mbean primative {}", name); - return null; - } - LOG.debug("passed convert checks {} for type {}", name, component_type); + LOG.warn("Cannot convert mbean primative {}", name); + return null; + } + if (LOG.isDebugEnabled()) + LOG.debug("passed convert checks {} for type {}", name, component_type); } try @@ -772,7 +789,8 @@ public class ObjectMBean implements DynamicMBean if ( returnType.isArray() ) { - LOG.debug("returnType is array, get component type"); + if (LOG.isDebugEnabled()) + LOG.debug("returnType is array, get component type"); returnType = returnType.getComponentType(); } @@ -783,8 +801,8 @@ public class ObjectMBean implements DynamicMBean String impactName = methodAnnotation.impact(); - - LOG.debug("defineOperation {} {}:{}:{}", method.getName(), onMBean, impactName, description); + if (LOG.isDebugEnabled()) + LOG.debug("defineOperation {} {}:{}:{}", method.getName(), onMBean, impactName, description); String signature = method.getName(); @@ -836,7 +854,9 @@ public class ObjectMBean implements DynamicMBean signature += ")"; Class returnClass = method.getReturnType(); - LOG.debug("Method Cache: " + signature ); + + if (LOG.isDebugEnabled()) + LOG.debug("Method Cache: " + signature ); if ( _methods.containsKey(signature) ) { diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java index 5a550145976..14b2155b986 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ConnectHandler.java @@ -186,7 +186,8 @@ public class ConnectHandler extends HandlerWrapper if (HttpMethod.CONNECT.is(request.getMethod())) { String serverAddress = request.getRequestURI(); - LOG.debug("CONNECT request for {}", serverAddress); + if (LOG.isDebugEnabled()) + LOG.debug("CONNECT request for {}", serverAddress); try { handleConnect(baseRequest, request, response, serverAddress); @@ -222,7 +223,8 @@ public class ConnectHandler extends HandlerWrapper boolean proceed = handleAuthentication(request, response, serverAddress); if (!proceed) { - LOG.debug("Missing proxy authentication"); + if (LOG.isDebugEnabled()) + LOG.debug("Missing proxy authentication"); sendConnectResponse(request, response, HttpServletResponse.SC_PROXY_AUTHENTICATION_REQUIRED); return; } @@ -238,7 +240,8 @@ public class ConnectHandler extends HandlerWrapper if (!validateDestination(host, port)) { - LOG.debug("Destination {}:{} forbidden", host, port); + if (LOG.isDebugEnabled()) + LOG.debug("Destination {}:{} forbidden", host, port); sendConnectResponse(request, response, HttpServletResponse.SC_FORBIDDEN); return; } @@ -252,7 +255,8 @@ public class ConnectHandler extends HandlerWrapper AsyncContext asyncContext = request.startAsync(); asyncContext.setTimeout(0); - LOG.debug("Connecting to {}", address); + if (LOG.isDebugEnabled()) + LOG.debug("Connecting to {}", address); ConnectContext connectContext = new ConnectContext(request, response, asyncContext, HttpConnection.getCurrentConnection()); selector.connect(channel, connectContext); } @@ -286,7 +290,8 @@ public class ConnectHandler extends HandlerWrapper upstreamConnection.setConnection(downstreamConnection); downstreamConnection.setConnection(upstreamConnection); - LOG.debug("Connection setup completed: {}<->{}", downstreamConnection, upstreamConnection); + if (LOG.isDebugEnabled()) + LOG.debug("Connection setup completed: {}<->{}", downstreamConnection, upstreamConnection); HttpServletResponse response = connectContext.getResponse(); sendConnectResponse(request, response, HttpServletResponse.SC_OK); @@ -297,7 +302,8 @@ public class ConnectHandler extends HandlerWrapper protected void onConnectFailure(HttpServletRequest request, HttpServletResponse response, AsyncContext asyncContext, Throwable failure) { - LOG.debug("CONNECT failed", failure); + if (LOG.isDebugEnabled()) + LOG.debug("CONNECT failed", failure); sendConnectResponse(request, response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR); if (asyncContext != null) asyncContext.complete(); @@ -311,7 +317,8 @@ public class ConnectHandler extends HandlerWrapper if (statusCode != HttpServletResponse.SC_OK) response.setHeader(HttpHeader.CONNECTION.asString(), HttpHeaderValue.CLOSE.asString()); response.getOutputStream().close(); - LOG.debug("CONNECT response sent {} {}", request.getProtocol(), response.getStatus()); + if (LOG.isDebugEnabled()) + LOG.debug("CONNECT response sent {} {}", request.getProtocol(), response.getStatus()); } catch (IOException x) { @@ -353,7 +360,8 @@ public class ConnectHandler extends HandlerWrapper // so that Jetty understands that it has to upgrade the connection request.setAttribute(HttpConnection.UPGRADE_CONNECTION_ATTRIBUTE, connection); response.setStatus(HttpServletResponse.SC_SWITCHING_PROTOCOLS); - LOG.debug("Upgraded connection to {}", connection); + if (LOG.isDebugEnabled()) + LOG.debug("Upgraded connection to {}", connection); } /** @@ -379,7 +387,8 @@ public class ConnectHandler extends HandlerWrapper */ protected void write(EndPoint endPoint, ByteBuffer buffer, Callback callback) { - LOG.debug("{} writing {} bytes", this, buffer.remaining()); + if (LOG.isDebugEnabled()) + LOG.debug("{} writing {} bytes", this, buffer.remaining()); endPoint.write(callback, buffer); } @@ -407,7 +416,8 @@ public class ConnectHandler extends HandlerWrapper { if (!whiteList.contains(hostPort)) { - LOG.debug("Host {}:{} not whitelisted", host, port); + if (LOG.isDebugEnabled()) + LOG.debug("Host {}:{} not whitelisted", host, port); return false; } } @@ -415,7 +425,8 @@ public class ConnectHandler extends HandlerWrapper { if (blackList.contains(hostPort)) { - LOG.debug("Host {}:{} blacklisted", host, port); + if (LOG.isDebugEnabled()) + LOG.debug("Host {}:{} blacklisted", host, port); return false; } } @@ -565,14 +576,16 @@ public class ConnectHandler extends HandlerWrapper @Override public void succeeded() { - LOG.debug("{} wrote initial {} bytes to server", DownstreamConnection.this, remaining); + if (LOG.isDebugEnabled()) + LOG.debug("{} wrote initial {} bytes to server", DownstreamConnection.this, remaining); fillInterested(); } @Override public void failed(Throwable x) { - LOG.debug(this + " failed to write initial " + remaining + " bytes to server", x); + if (LOG.isDebugEnabled()) + LOG.debug(this + " failed to write initial " + remaining + " bytes to server", x); close(); getConnection().close(); } diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java index 697de4fa4ce..f8572949833 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java @@ -73,7 +73,8 @@ public abstract class ProxyConnection extends AbstractConnection try { final int filled = read(getEndPoint(), buffer); - LOG.debug("{} filled {} bytes", this, filled); + if (LOG.isDebugEnabled()) + LOG.debug("{} filled {} bytes", this, filled); if (filled > 0) { write(getConnection().getEndPoint(), buffer, new Callback() @@ -81,7 +82,8 @@ public abstract class ProxyConnection extends AbstractConnection @Override public void succeeded() { - LOG.debug("{} wrote {} bytes", this, filled); + if (LOG.isDebugEnabled()) + LOG.debug("{} wrote {} bytes", this, filled); bufferPool.release(buffer); invoker.invoke(null); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java index 07b09ab7241..ce89cfde4af 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java @@ -247,7 +247,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H */ public boolean handle() { - LOG.debug("{} handle enter", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} handle enter", this); final HttpChannellast = setCurrentHttpChannel(this); @@ -270,7 +271,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H boolean error=false; try { - LOG.debug("{} action {}",this,action); + if (LOG.isDebugEnabled()) + LOG.debug("{} action {}",this,action); switch(action) { @@ -411,7 +413,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H } } - LOG.debug("{} handle exit, result {}", this, action); + if (LOG.isDebugEnabled()) + LOG.debug("{} handle exit, result {}", this, action); return action!=Action.WAIT; } @@ -666,7 +669,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H @Override public boolean messageComplete() { - LOG.debug("{} messageComplete", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} messageComplete", this); _request.getHttpInput().messageComplete(); return true; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index 16cbbf93d6b..18fdd27e38b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -103,7 +103,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http HttpInput input = newHttpInput(); _channel = newHttpChannel(input); _parser = newHttpParser(); - LOG.debug("New HTTP Connection {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("New HTTP Connection {}", this); } protected HttpGenerator newHttpGenerator() @@ -191,7 +192,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http @Override public void onFillable() { - LOG.debug("{} onFillable {}", this, _channel.getState()); + if (LOG.isDebugEnabled()) + LOG.debug("{} onFillable {}", this, _channel.getState()); final HttpConnection last=setCurrentConnection(this); int filled=Integer.MAX_VALUE; @@ -328,7 +330,8 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http Connection connection = (Connection)_channel.getRequest().getAttribute(UPGRADE_CONNECTION_ATTRIBUTE); if (connection != null) { - LOG.debug("Upgrade from {} to {}", this, connection); + if (LOG.isDebugEnabled()) + LOG.debug("Upgrade from {} to {}", this, connection); onClose(); getEndPoint().setConnection(connection); connection.onOpen(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java index 833ecdede7f..dc3e6dcbca9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java @@ -146,7 +146,8 @@ public abstract class HttpInput extends ServletInputStream implements Runnabl { if (_eofState != null) { - LOG.debug("{} eof {}", this, _eofState); + if (LOG.isDebugEnabled()) + LOG.debug("{} eof {}", this, _eofState); _contentState = _eofState; } } @@ -237,7 +238,8 @@ public abstract class HttpInput extends ServletInputStream implements Runnabl { if (!isEOF()) { - LOG.debug("{} early EOF", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} early EOF", this); _eofState = EARLY_EOF; if (_listener == null) return; @@ -256,7 +258,8 @@ public abstract class HttpInput extends ServletInputStream implements Runnabl { if (!isEOF()) { - LOG.debug("{} EOF", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} EOF", this); _eofState = EOF; if (_listener == null) return; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java index 35524500492..d22444db0cb 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInputOverHTTP.java @@ -61,7 +61,8 @@ public class HttpInputOverHTTP extends HttpInput implements Callback try (Blocker blocker=_readBlocker.acquire()) { _httpConnection.fillInterested(blocker); - LOG.debug("{} block readable on {}",this,blocker); + if (LOG.isDebugEnabled()) + LOG.debug("{} block readable on {}",this,blocker); blocker.block(); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index 7c0fd899a41..f4db0c6b985 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -755,7 +755,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable { Throwable th=_onError; _onError=null; - LOG.debug("onError",th); + if (LOG.isDebugEnabled()) + LOG.debug("onError",th); _writeListener.onError(th); close(); @@ -763,7 +764,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable } } - continue loop; + continue; } switch(_state.get()) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java index 5796226362e..1f05003a3da 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java @@ -133,12 +133,14 @@ public class LocalConnector extends AbstractConnector */ public ByteBuffer getResponses(ByteBuffer requestsBuffer,long idleFor,TimeUnit units) throws Exception { - LOG.debug("requests {}", BufferUtil.toUTF8String(requestsBuffer)); + if (LOG.isDebugEnabled()) + LOG.debug("requests {}", BufferUtil.toUTF8String(requestsBuffer)); LocalEndPoint endp = executeRequest(requestsBuffer); endp.waitUntilClosedOrIdleFor(idleFor,units); ByteBuffer responses = endp.takeOutput(); endp.getConnection().close(); - LOG.debug("responses {}", BufferUtil.toUTF8String(responses)); + if (LOG.isDebugEnabled()) + LOG.debug("responses {}", BufferUtil.toUTF8String(responses)); return responses; } @@ -164,7 +166,8 @@ public class LocalConnector extends AbstractConnector @Override protected void accept(int acceptorID) throws IOException, InterruptedException { - LOG.debug("accepting {}", acceptorID); + if (LOG.isDebugEnabled()) + LOG.debug("accepting {}", acceptorID); LocalEndPoint endPoint = _connects.take(); endPoint.onOpen(); onEndPointOpened(endPoint); @@ -249,7 +252,8 @@ public class LocalConnector extends AbstractConnector { if (size==getOutput().remaining()) { - LOG.debug("idle for {} {}",idleFor,units); + if (LOG.isDebugEnabled()) + LOG.debug("idle for {} {}",idleFor,units); return; } size=getOutput().remaining(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java index 3d010699e2a..6d9dd210216 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java @@ -26,8 +26,6 @@ import javax.net.ssl.SSLEngineResult; import org.eclipse.jetty.io.AbstractConnection; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.server.ConnectionFactory; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; @@ -95,7 +93,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection if (engine.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING) { // Here the SSL handshake is finished, but the protocol has not been negotiated. - LOG.debug("{} could not negotiate protocol, SSLEngine: {}", this, engine); + if (LOG.isDebugEnabled()) + LOG.debug("{} could not negotiate protocol, SSLEngine: {}", this, engine); close(); } else @@ -110,7 +109,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection ConnectionFactory connectionFactory = connector.getConnectionFactory(protocol); if (connectionFactory == null) { - LOG.debug("{} application selected protocol '{}', but no correspondent {} has been configured", + if (LOG.isDebugEnabled()) + LOG.debug("{} application selected protocol '{}', but no correspondent {} has been configured", this, protocol, ConnectionFactory.class.getName()); close(); } @@ -119,7 +119,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection EndPoint endPoint = getEndPoint(); Connection oldConnection = endPoint.getConnection(); Connection newConnection = connectionFactory.newConnection(connector, endPoint); - LOG.debug("{} switching from {} to {}", this, oldConnection, newConnection); + if (LOG.isDebugEnabled()) + LOG.debug("{} switching from {} to {}", this, oldConnection, newConnection); oldConnection.onClose(); endPoint.setConnection(newConnection); getEndPoint().getConnection().onOpen(); @@ -129,7 +130,8 @@ public abstract class NegotiatingServerConnection extends AbstractConnection else if (filled < 0) { // Something went bad, we need to close. - LOG.debug("{} closing on client close", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} closing on client close", this); close(); } else diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java index 881fbfa0842..c856d983d4d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java @@ -55,7 +55,8 @@ public abstract class QueuedHttpInput extends HttpInput { boolean wasEmpty = _inputQ.isEmpty(); _inputQ.add(item); - LOG.debug("{} queued {}", this, item); + if (LOG.isDebugEnabled()) + LOG.debug("{} queued {}", this, item); if (wasEmpty) { if (!onAsyncRead()) @@ -90,7 +91,8 @@ public abstract class QueuedHttpInput extends HttpInput { _inputQ.pollUnsafe(); onContentConsumed(item); - LOG.debug("{} consumed {}", this, item); + if (LOG.isDebugEnabled()) + LOG.debug("{} consumed {}", this, item); item = _inputQ.peekUnsafe(); } return item; @@ -105,7 +107,8 @@ public abstract class QueuedHttpInput extends HttpInput { try { - LOG.debug("{} waiting for content", this); + if (LOG.isDebugEnabled()) + LOG.debug("{} waiting for content", this); lock().wait(); } catch (InterruptedException e) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index b1437d6d98d..66919f42a7a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -384,7 +384,8 @@ public class Server extends HandlerWrapper implements Attributes if (stopTimeout>0) { long stop_by=System.currentTimeMillis()+stopTimeout; - LOG.debug("Graceful shutdown {} by ",this,new Date(stop_by)); + if (LOG.isDebugEnabled()) + LOG.debug("Graceful shutdown {} by ",this,new Date(stop_by)); // Wait for shutdowns for (Future future: futures) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java index 3d92512ca2b..d1c76088252 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandler.java @@ -54,7 +54,8 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand @Override protected void doStart() throws Exception { - LOG.debug("starting {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("starting {}",this); if (_server==null) LOG.warn("No Server set for {}",this); super.doStart(); @@ -67,7 +68,8 @@ public abstract class AbstractHandler extends ContainerLifeCycle implements Hand @Override protected void doStop() throws Exception { - LOG.debug("stopping {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("stopping {}",this); super.doStop(); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java index c3d8b5932d1..427c5b05929 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AllowSymLinkAliasChecker.java @@ -56,7 +56,8 @@ public class AllowSymLinkAliasChecker implements AliasCheck URI real = file.toPath().toRealPath().toUri(); if (real.equals(resource.getAlias())) { - LOG.debug("Allow symlink {} --> {}",resource,real); + if (LOG.isDebugEnabled()) + LOG.debug("Allow symlink {} --> {}",resource,real); return true; } } @@ -79,7 +80,8 @@ public class AllowSymLinkAliasChecker implements AliasCheck } if (resource.getAlias().equals(d.toURI())) { - LOG.debug("Allow symlink {} --> {}",resource,d); + if (LOG.isDebugEnabled()) + LOG.debug("Allow symlink {} --> {}",resource,d); return true; } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 397cde1fd13..f01f73a4ab8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -796,14 +796,16 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu /* ------------------------------------------------------------ */ protected void callContextInitialized (ServletContextListener l, ServletContextEvent e) { - LOG.debug("contextInitialized: {}->{}",e,l); + if (LOG.isDebugEnabled()) + LOG.debug("contextInitialized: {}->{}",e,l); l.contextInitialized(e); } /* ------------------------------------------------------------ */ protected void callContextDestroyed (ServletContextListener l, ServletContextEvent e) { - LOG.debug("contextDestroyed: {}->{}",e,l); + if (LOG.isDebugEnabled()) + LOG.debug("contextDestroyed: {}->{}",e,l); l.contextDestroyed(e); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java index 10d1e051301..8cbebbdbb52 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java @@ -240,18 +240,18 @@ public class ResourceHandler extends HandlerWrapper */ public Resource getStylesheet() { - if(_stylesheet != null) - { - return _stylesheet; - } - else - { - if(_defaultStylesheet == null) - { - _defaultStylesheet = Resource.newResource(this.getClass().getResource("/jetty-dir.css")); - } - return _defaultStylesheet; - } + if(_stylesheet != null) + { + return _stylesheet; + } + else + { + if(_defaultStylesheet == null) + { + _defaultStylesheet = Resource.newResource(this.getClass().getResource("/jetty-dir.css")); + } + return _defaultStylesheet; + } } /* ------------------------------------------------------------ */ @@ -269,12 +269,12 @@ public class ResourceHandler extends HandlerWrapper _stylesheet = null; } } - catch(Exception e) - { - LOG.warn(e.toString()); - LOG.debug(e); - throw new IllegalArgumentException(stylesheet); - } + catch(Exception e) + { + LOG.warn(e.toString()); + LOG.debug(e); + throw new IllegalArgumentException(stylesheet); + } } /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java index e946fb670e7..93c9f86a571 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java @@ -224,7 +224,8 @@ public class ShutdownHandler extends HandlerWrapper private boolean hasCorrectSecurityToken(HttpServletRequest request) { String tok = request.getParameter("token"); - LOG.debug("Token: {}", tok); + if (LOG.isDebugEnabled()) + LOG.debug("Token: {}", tok); return _shutdownToken.equals(tok); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java index 809d9d98923..ec586ac09c7 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java @@ -19,13 +19,10 @@ package org.eclipse.jetty.server.session; import java.util.ArrayList; -import java.util.Collections; import java.util.Enumeration; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; - import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSessionActivationListener; @@ -335,7 +332,8 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI { try { - LOG.debug("invalidate {}",_clusterId); + if (LOG.isDebugEnabled()) + LOG.debug("invalidate {}",_clusterId); if (isValid()) clearAttributes(); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java index 9414408338b..7b8a94cb5e0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java @@ -167,7 +167,8 @@ public abstract class AbstractSessionIdManager extends AbstractLifeCycle impleme // random chance to reseed if (_reseed>0 && (r0%_reseed)== 1L) { - LOG.debug("Reseeding {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Reseeding {}",this); if (_random instanceof SecureRandom) { SecureRandom secure = (SecureRandom)_random; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java index 4c7227d7717..a70d48ecfe0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java @@ -477,7 +477,8 @@ public class JDBCSessionIdManager extends AbstractSessionIdManager throws SQLException { _dbName = dbMeta.getDatabaseProductName().toLowerCase(Locale.ENGLISH); - LOG.debug ("Using database {}",_dbName); + if (LOG.isDebugEnabled()) + LOG.debug ("Using database {}",_dbName); _isLower = dbMeta.storesLowerCaseIdentifiers(); _isUpper = dbMeta.storesUpperCaseIdentifiers(); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java index dbe95335dae..fb4d7468c54 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java @@ -512,17 +512,20 @@ public class JDBCSessionManager extends AbstractSessionManager { if (memSession==null) { - LOG.debug("getSession("+idInCluster+"): no session in session map. Reloading session data from db."); + if (LOG.isDebugEnabled()) + LOG.debug("getSession("+idInCluster+"): no session in session map. Reloading session data from db."); session = loadSession(idInCluster, canonicalize(_context.getContextPath()), getVirtualHost(_context)); } else if ((now - memSession._lastSaved) >= (_saveIntervalSec * 1000L)) { - LOG.debug("getSession("+idInCluster+"): stale session. Reloading session data from db."); + if (LOG.isDebugEnabled()) + LOG.debug("getSession("+idInCluster+"): stale session. Reloading session data from db."); session = loadSession(idInCluster, canonicalize(_context.getContextPath()), getVirtualHost(_context)); } else { - LOG.debug("getSession("+idInCluster+"): session in session map"); + if (LOG.isDebugEnabled()) + LOG.debug("getSession("+idInCluster+"): session in session map"); session = memSession; } } @@ -562,7 +565,8 @@ public class JDBCSessionManager extends AbstractSessionManager } else { - LOG.debug("getSession ({}): Session has expired", idInCluster); + if (LOG.isDebugEnabled()) + LOG.debug("getSession ({}): Session has expired", idInCluster); //ensure that the session id for the expired session is deleted so that a new session with the //same id cannot be created (because the idInUse() test would succeed) _jdbcSessionIdMgr.removeSession(idInCluster); @@ -574,7 +578,8 @@ public class JDBCSessionManager extends AbstractSessionManager { //the session loaded from the db and the one in memory are the same, so keep using the one in memory session = memSession; - LOG.debug("getSession({}): Session not stale {}", idInCluster,session); + if (LOG.isDebugEnabled()) + LOG.debug("getSession({}): Session not stale {}", idInCluster,session); } } else diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java index e6aedc5b8c9..e85cc9e2ed5 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java @@ -262,7 +262,8 @@ public class SessionHandler extends ScopedHandler requested_session_id = cookies[i].getValue(); requested_session_id_from_cookie = true; - LOG.debug("Got Session ID {} from cookie",requested_session_id); + if (LOG.isDebugEnabled()) + LOG.debug("Got Session ID {} from cookie",requested_session_id); if (requested_session_id != null) { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java index 30741657a15..b17a112844e 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java @@ -257,7 +257,8 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory throw new UnavailableException("resourceCache specified with resource bases"); _cache=(ResourceCache)_servletContext.getAttribute(resourceCache); - LOG.debug("Cache {}={}",resourceCache,_cache); + if (LOG.isDebugEnabled()) + LOG.debug("Cache {}={}",resourceCache,_cache); } _etags = getInitBoolean("etags",_etags); @@ -560,7 +561,8 @@ public class DefaultServlet extends HttpServlet implements ResourceFactory // else look for a welcome file else if (null!=(welcome=getWelcomeFile(pathInContext))) { - LOG.debug("welcome={}",welcome); + if (LOG.isDebugEnabled()) + LOG.debug("welcome={}",welcome); if (_redirectWelcome) { // Redirect to the index diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java index d9635fae0e3..728dfdfdda9 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java @@ -133,7 +133,8 @@ public class FilterHolder extends Holder } _config=new Config(); - LOG.debug("Filter.init {}",_filter); + if (LOG.isDebugEnabled()) + LOG.debug("Filter.init {}",_filter); _filter.init(_config); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 9e8542e39f7..d180e46fda8 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -160,7 +160,8 @@ public class ServletHandler extends ScopedHandler if (getServletMapping("/")==null && _ensureDefaultServlet) { - LOG.debug("Adding Default404Servlet to {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Adding Default404Servlet to {}",this); addServletWithMapping(Default404Servlet.class,"/"); updateMappings(); getServletMapping("/").setDefault(true); @@ -543,7 +544,9 @@ public class ServletHandler extends ScopedHandler } } - LOG.debug("chain={}",chain); + if (LOG.isDebugEnabled()) + LOG.debug("chain={}",chain); + Throwable th=null; try { @@ -1528,7 +1531,8 @@ public class ServletHandler extends ScopedHandler /* ------------------------------------------------------------ */ protected void notFound(Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - LOG.debug("Not Found {}",request.getRequestURI()); + if (LOG.isDebugEnabled()) + LOG.debug("Not Found {}",request.getRequestURI()); if (getHandler()!=null) nextHandle(URIUtil.addPaths(request.getServletPath(),request.getPathInfo()),baseRequest,request,response); } @@ -1630,7 +1634,8 @@ public class ServletHandler extends ScopedHandler // pass to next filter if (_filterHolder!=null) { - LOG.debug("call filter {}", _filterHolder); + if (LOG.isDebugEnabled()) + LOG.debug("call filter {}", _filterHolder); Filter filter= _filterHolder.getFilter(); //if the request already does not support async, then the setting for the filter @@ -1729,7 +1734,8 @@ public class ServletHandler extends ScopedHandler notFound((request instanceof Request)?((Request)request):HttpChannel.getCurrentHttpChannel().getRequest(), srequest, (HttpServletResponse)response); else { - LOG.debug("call servlet {}", _servletHolder); + if (LOG.isDebugEnabled()) + LOG.debug("call servlet {}", _servletHolder); _servletHolder.handle(_baseRequest,request, response); } } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index 1df08b33dc6..b2a4d3e6322 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -289,11 +289,13 @@ public class ServletHolder extends Holder implements UserIdentity.Scope { // Look for a precompiled JSP Servlet String precompiled=getClassNameForJsp(_forcedPath); - LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath); + if (LOG.isDebugEnabled()) + LOG.debug("Checking for precompiled servlet {} for jsp {}", precompiled, _forcedPath); ServletHolder jsp=getServletHandler().getServlet(precompiled); if (jsp!=null) { - LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); + if (LOG.isDebugEnabled()) + LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); // set the className for this servlet to the precompiled one setClassName(jsp.getClassName()); } @@ -305,7 +307,8 @@ public class ServletHolder extends Holder implements UserIdentity.Scope jsp=getServletHandler().getServlet("jsp"); if (jsp!=null) { - LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); + if (LOG.isDebugEnabled()) + LOG.debug("JSP file {} for {} mapped to Servlet {}",_forcedPath, getName(),jsp.getClassName()); setClassName(jsp.getClassName()); //copy jsp init params that don't exist for this servlet for (Map.Entry entry:jsp.getInitParameters().entrySet()) @@ -591,7 +594,8 @@ public class ServletHolder extends Holder implements UserIdentity.Scope initMultiPart(); - LOG.debug("Filter.init {}",_servlet); + if (LOG.isDebugEnabled()) + LOG.debug("Filter.init {}",_servlet); _servlet.init(_config); } catch (UnavailableException e) @@ -642,7 +646,8 @@ public class ServletHolder extends Holder implements UserIdentity.Scope if ("?".equals(getInitParameter("classpath"))) { String classpath = ch.getClassPath(); - LOG.debug("classpath=" + classpath); + if (LOG.isDebugEnabled()) + LOG.debug("classpath=" + classpath); if (classpath != null) setInitParameter("classpath", classpath); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java index 81b75288744..08806501992 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java @@ -60,22 +60,15 @@ public class ELContextCleaner implements ServletContextListener //Get rid of references purgeEntries(field); - LOG.debug("javax.el.BeanELResolver purged"); + if (LOG.isDebugEnabled()) + LOG.debug("javax.el.BeanELResolver purged"); } catch (ClassNotFoundException e) { //BeanELResolver not on classpath, ignore } - catch (SecurityException e) - { - LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e); - } - catch (IllegalArgumentException e) - { - LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e); - } - catch (IllegalAccessException e) + catch (SecurityException | IllegalArgumentException | IllegalAccessException e) { LOG.warn("Cannot purge classes from javax.el.BeanELResolver", e); } @@ -113,14 +106,19 @@ public class ELContextCleaner implements ServletContextListener while (itor.hasNext()) { Class clazz = itor.next(); - LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader()); + if (LOG.isDebugEnabled()) + LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader()); if (Thread.currentThread().getContextClassLoader().equals(clazz.getClassLoader())) { itor.remove(); - LOG.debug("removed"); + if (LOG.isDebugEnabled()) + LOG.debug("removed"); } else - LOG.debug("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader()); + { + if (LOG.isDebugEnabled()) + LOG.debug("not removed: "+"contextclassloader="+Thread.currentThread().getContextClassLoader()+"clazz's classloader="+clazz.getClassLoader()); + } } } } diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java index f7d984b0574..52bc964278f 100644 --- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java +++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/SPDYConnection.java @@ -139,11 +139,13 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id EndPoint endPoint = getEndPoint(); // We need to gently close first, to allow // SSL close alerts to be sent by Jetty - LOG.debug("Shutting down output {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Shutting down output {}", endPoint); endPoint.shutdownOutput(); if (!onlyOutput) { - LOG.debug("Closing {}", endPoint); + if (LOG.isDebugEnabled()) + LOG.debug("Closing {}", endPoint); endPoint.close(); } } @@ -158,7 +160,8 @@ public class SPDYConnection extends AbstractConnection implements Controller, Id protected boolean onReadTimeout() { boolean idle = this.idle; - LOG.debug("Idle timeout on {}, idle={}", this, idle); + if (LOG.isDebugEnabled()) + LOG.debug("Idle timeout on {}, idle={}", this, idle); if (idle) goAway(session); return false; diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java index 469f3a87f78..8e86eb5ae9b 100644 --- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java +++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardSession.java @@ -339,11 +339,13 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable notifyIdle(idleListener, false); try { - LOG.debug("Processing {}", frame); + if (LOG.isDebugEnabled()) + LOG.debug("Processing {}", frame); if (goAwaySent.get()) { - LOG.debug("Skipped processing of {}", frame); + if (LOG.isDebugEnabled()) + LOG.debug("Skipped processing of {}", frame); return; } @@ -417,11 +419,13 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable notifyIdle(idleListener, false); try { - LOG.debug("Processing {}, {} data bytes", frame, data.remaining()); + if (LOG.isDebugEnabled()) + LOG.debug("Processing {}, {} data bytes", frame, data.remaining()); if (goAwaySent.get()) { - LOG.debug("Skipped processing of {}", frame); + if (LOG.isDebugEnabled()) + LOG.debug("Skipped processing of {}", frame); return; } @@ -430,7 +434,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (stream == null) { RstInfo rstInfo = new RstInfo(streamId, StreamStatus.INVALID_STREAM); - LOG.debug("Unknown stream {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Unknown stream {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); } else @@ -569,13 +574,15 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable throw duplicateIdException; } RstInfo rstInfo = new RstInfo(streamId, StreamStatus.PROTOCOL_ERROR); - LOG.debug("Duplicate stream, {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Duplicate stream, {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); // We don't care (too much) if the reset fails. return null; } else { - LOG.debug("Created {}", stream); + if (LOG.isDebugEnabled()) + LOG.debug("Created {}", stream); notifyStreamCreated(stream); return stream; } @@ -617,7 +624,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (streamIds.get() % 2 == stream.getId() % 2) localStreamCount.decrementAndGet(); - LOG.debug("Removed {}", stream); + if (LOG.isDebugEnabled()) + LOG.debug("Removed {}", stream); notifyStreamClosed(stream); } } @@ -652,7 +660,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (stream == null) { RstInfo rstInfo = new RstInfo(streamId, StreamStatus.INVALID_STREAM); - LOG.debug("Unknown stream {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Unknown stream {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); } else @@ -689,14 +698,16 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { int windowSize = windowSizeSetting.value(); setWindowSize(windowSize); - LOG.debug("Updated session window size to {}", windowSize); + if (LOG.isDebugEnabled()) + LOG.debug("Updated session window size to {}", windowSize); } Settings.Setting maxConcurrentStreamsSetting = frame.getSettings().get(Settings.ID.MAX_CONCURRENT_STREAMS); if (maxConcurrentStreamsSetting != null) { int maxConcurrentStreamsValue = maxConcurrentStreamsSetting.value(); maxConcurrentLocalStreams = maxConcurrentStreamsValue; - LOG.debug("Updated session maxConcurrentLocalStreams to {}", maxConcurrentStreamsValue); + if (LOG.isDebugEnabled()) + LOG.debug("Updated session maxConcurrentLocalStreams to {}", maxConcurrentStreamsValue); } SettingsInfo settingsInfo = new SettingsInfo(frame.getSettings(), frame.isClearPersisted()); notifyOnSettings(listener, settingsInfo); @@ -735,7 +746,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable if (stream == null) { RstInfo rstInfo = new RstInfo(streamId, StreamStatus.INVALID_STREAM); - LOG.debug("Unknown stream, {}", rstInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Unknown stream, {}", rstInfo); rst(rstInfo, Callback.Adapter.INSTANCE); } else @@ -777,7 +789,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", x, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", x, listener); listener.onFailure(this, x); } } @@ -798,7 +811,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener == null) return null; - LOG.debug("Invoking callback with {} on listener {}", pushInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", pushInfo, listener); return listener.onPush(stream, pushInfo); } catch (Exception x) @@ -819,7 +833,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener == null) return null; - LOG.debug("Invoking callback with {} on listener {}", synInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", synInfo, listener); return listener.onSyn(stream, synInfo); } catch (Exception x) @@ -840,7 +855,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", rstInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", rstInfo, listener); listener.onRst(this, rstInfo); } } @@ -861,7 +877,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", settingsInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", settingsInfo, listener); listener.onSettings(this, settingsInfo); } } @@ -882,7 +899,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", pingResultInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", pingResultInfo, listener); listener.onPing(this, pingResultInfo); } } @@ -903,7 +921,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable { if (listener != null) { - LOG.debug("Invoking callback with {} on listener {}", goAwayResultInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking callback with {} on listener {}", goAwayResultInfo, listener); listener.onGoAway(this, goAwayResultInfo); } } @@ -936,7 +955,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable synchronized (this) { ByteBuffer buffer = generator.control(frame); - LOG.debug("Queuing {} on {}", frame, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {} on {}", frame, stream); frameBytes = new ControlFrameBytes(stream, callback, frame, buffer); if (timeout > 0) frameBytes.task = scheduler.schedule(frameBytes, timeout, unit); @@ -966,7 +986,8 @@ public class StandardSession implements ISession, Parser.Listener, Dumpable @Override public void data(IStream stream, DataInfo dataInfo, long timeout, TimeUnit unit, Callback callback) { - LOG.debug("Queuing {} on {}", dataInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing {} on {}", dataInfo, stream); DataFrameBytes frameBytes = new DataFrameBytes(stream, callback, dataInfo); if (timeout > 0) frameBytes.task = scheduler.schedule(frameBytes, timeout, unit); diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java index 778fe0b95d5..25389d39681 100644 --- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java +++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/StandardStream.java @@ -141,7 +141,8 @@ public class StandardStream extends IdleTimeout implements IStream public void updateWindowSize(int delta) { int size = windowSize.addAndGet(delta); - LOG.debug("Updated window size {} -> {} for {}", size - delta, size, this); + if (LOG.isDebugEnabled()) + LOG.debug("Updated window size {} -> {} for {}", size - delta, size, this); } @Override @@ -183,7 +184,8 @@ public class StandardStream extends IdleTimeout implements IStream @Override public void updateCloseState(boolean close, boolean local) { - LOG.debug("{} close={} local={}", this, close, local); + if (LOG.isDebugEnabled()) + LOG.debug("{} close={} local={}", this, close, local); if (close) { switch (closeState) @@ -265,13 +267,15 @@ public class StandardStream extends IdleTimeout implements IStream // ignore data frame if this stream is remotelyClosed already if (isRemotelyClosed()) { - LOG.debug("Stream is remotely closed, ignoring {}", dataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Stream is remotely closed, ignoring {}", dataInfo); return; } if (!canReceive()) { - LOG.debug("Protocol error receiving {}, resetting", dataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Protocol error receiving {}, resetting", dataInfo); session.rst(new RstInfo(getId(), StreamStatus.PROTOCOL_ERROR), Callback.Adapter.INSTANCE); return; } @@ -301,7 +305,8 @@ public class StandardStream extends IdleTimeout implements IStream { if (listener != null) { - LOG.debug("Invoking reply callback with {} on listener {}", replyInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking reply callback with {} on listener {}", replyInfo, listener); listener.onReply(this, replyInfo); } } @@ -323,7 +328,8 @@ public class StandardStream extends IdleTimeout implements IStream { if (listener != null) { - LOG.debug("Invoking headers callback with {} on listener {}", headersInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking headers callback with {} on listener {}", headersInfo, listener); listener.onHeaders(this, headersInfo); } } @@ -345,9 +351,11 @@ public class StandardStream extends IdleTimeout implements IStream { if (listener != null) { - LOG.debug("Invoking data callback with {} on listener {}", dataInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoking data callback with {} on listener {}", dataInfo, listener); listener.onData(this, dataInfo); - LOG.debug("Invoked data callback with {} on listener {}", dataInfo, listener); + if (LOG.isDebugEnabled()) + LOG.debug("Invoked data callback with {} on listener {}", dataInfo, listener); } } catch (Exception x) diff --git a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java index 37105897357..295a49bf6a2 100644 --- a/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java +++ b/jetty-spdy/spdy-core/src/test/java/org/eclipse/jetty/spdy/StandardSessionTest.java @@ -576,7 +576,8 @@ public class StandardSessionTest StandardSession.FrameBytes frameBytes = (StandardSession.FrameBytes)callback; int streamId = frameBytes.getStream().getId(); - LOG.debug("last: {}, current: {}", lastStreamId, streamId); + if (LOG.isDebugEnabled()) + LOG.debug("last: {}, current: {}", lastStreamId, streamId); if (lastStreamId < streamId) lastStreamId = streamId; else diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java index cffdba25e9a..e94ab73d389 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HTTPSPDYServerConnectionFactory.java @@ -94,7 +94,8 @@ public class HTTPSPDYServerConnectionFactory extends SPDYServerConnectionFactory // can arrive on the same connection, so we need to create an // HttpChannel for each SYN in order to run concurrently. - LOG.debug("Received {} on {}", synInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Received {} on {}", synInfo, stream); Fields headers = synInfo.getHeaders(); // According to SPDY/3 spec section 3.2.1 user-agents MUST support gzip compression. Firefox omits the @@ -136,7 +137,8 @@ public class HTTPSPDYServerConnectionFactory extends SPDYServerConnectionFactory @Override public void onHeaders(Stream stream, HeadersInfo headersInfo) { - LOG.debug("Received {} on {}", headersInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Received {} on {}", headersInfo, stream); HttpChannelOverSPDY channel = (HttpChannelOverSPDY)stream.getAttribute(CHANNEL_ATTRIBUTE); channel.requestHeaders(headersInfo.getHeaders(), headersInfo.isClose()); } @@ -150,7 +152,8 @@ public class HTTPSPDYServerConnectionFactory extends SPDYServerConnectionFactory @Override public void onData(Stream stream, final DataInfo dataInfo) { - LOG.debug("Received {} on {}", dataInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Received {} on {}", dataInfo, stream); HttpChannelOverSPDY channel = (HttpChannelOverSPDY)stream.getAttribute(CHANNEL_ATTRIBUTE); channel.requestContent(dataInfo, dataInfo.isClose()); } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java index d032aa1c9e3..3a19386a3d9 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java @@ -67,7 +67,8 @@ public class HttpChannelOverSPDY extends HttpChannel redispatch=true; else { - LOG.debug("Dispatch {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Dispatch {}", this); dispatched=true; execute(this); } @@ -83,12 +84,14 @@ public class HttpChannelOverSPDY extends HttpChannel { try { - LOG.debug("Executing {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("Executing {}",this); super.run(); } finally { - LOG.debug("Completing {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Completing {}", this); synchronized (this) { dispatched = redispatch; @@ -130,7 +133,8 @@ public class HttpChannelOverSPDY extends HttpChannel if (!headersComplete && headerComplete()) dispatch=true; - LOG.debug("HTTP > {} bytes of content", dataInfo.length()); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP > {} bytes of content", dataInfo.length()); // We need to copy the dataInfo since we do not know when its bytes // will be consumed. When the copy is consumed, we consume also the @@ -145,7 +149,8 @@ public class HttpChannelOverSPDY extends HttpChannel dataInfo.consume(delta); } }; - LOG.debug("Queuing last={} content {}", endRequest, copyDataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Queuing last={} content {}", endRequest, copyDataInfo); if (content(copyDataInfo)) dispatch=true; @@ -184,7 +189,8 @@ public class HttpChannelOverSPDY extends HttpChannel // that we have to deal with ByteBuffer uri = BufferUtil.toBuffer(uriHeader.getValue()); - LOG.debug("HTTP > {} {} {}", httpMethod, uriHeader.getValue(), httpVersion); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP > {} {} {}", httpMethod, uriHeader.getValue(), httpVersion); startRequest(httpMethod, httpMethod.asString(), uri, httpVersion); Fields.Field schemeHeader = headers.get(HTTPSPDYHeader.SCHEME.name(version)); @@ -223,7 +229,8 @@ public class HttpChannelOverSPDY extends HttpChannel { // Spec says headers must be single valued String value = header.getValue(); - LOG.debug("HTTP > {}: {}", name, value); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP > {}: {}", name, value); parsedHeader(new HttpField(name,value)); break; } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java index 63ff7a40ffc..520ad181cdd 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpTransportOverSPDY.java @@ -130,7 +130,8 @@ public class HttpTransportOverSPDY implements HttpTransport StreamException exception = new StreamException(stream.getId(), StreamStatus.PROTOCOL_ERROR, "Stream already committed!"); callback.failed(exception); - LOG.debug("Committed response twice.", exception); + if (LOG.isDebugEnabled()) + LOG.debug("Committed response twice.", exception); return; } sendReply(info, !hasContent ? callback : new Callback.Adapter() @@ -147,7 +148,8 @@ public class HttpTransportOverSPDY implements HttpTransport if (hasContent) { // send the data and let it call the callback - LOG.debug("Send content: {} on stream: {} lastContent={}", BufferUtil.toDetailString(content), stream, + if (LOG.isDebugEnabled()) + LOG.debug("Send content: {} on stream: {} lastContent={}", BufferUtil.toDetailString(content), stream, lastContent); stream.data(new ByteBufferDataInfo(endPoint.getIdleTimeout(), TimeUnit.MILLISECONDS, content, lastContent ), callback); @@ -156,7 +158,8 @@ public class HttpTransportOverSPDY implements HttpTransport else if (lastContent && info == null) { // send empty data to close and let the send call the callback - LOG.debug("No content and lastContent=true. Sending empty ByteBuffer to close stream: {}", stream); + if (LOG.isDebugEnabled()) + LOG.debug("No content and lastContent=true. Sending empty ByteBuffer to close stream: {}", stream); stream.data(new ByteBufferDataInfo(endPoint.getIdleTimeout(), TimeUnit.MILLISECONDS, BufferUtil.EMPTY_BUFFER, lastContent), callback); } @@ -180,7 +183,8 @@ public class HttpTransportOverSPDY implements HttpTransport if (reason != null) httpStatus.append(" ").append(reason); headers.put(HTTPSPDYHeader.STATUS.name(version), httpStatus.toString()); - LOG.debug("HTTP < {} {}", httpVersion, httpStatus); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP < {} {}", httpVersion, httpStatus); // TODO merge the two Field classes into one HttpFields fields = info.getHttpFields(); @@ -192,7 +196,8 @@ public class HttpTransportOverSPDY implements HttpTransport String name = field.getName(); String value = field.getValue(); headers.add(name, value); - LOG.debug("HTTP < {}: {}", name, value); + if (LOG.isDebugEnabled()) + LOG.debug("HTTP < {}: {}", name, value); } } @@ -202,14 +207,16 @@ public class HttpTransportOverSPDY implements HttpTransport headers.add(HttpHeader.X_POWERED_BY.asString(), HttpConfiguration.SERVER_VERSION); ReplyInfo reply = new ReplyInfo(headers, close); - LOG.debug("Sending reply: {} on stream: {}", reply, stream); + if (LOG.isDebugEnabled()) + LOG.debug("Sending reply: {} on stream: {}", reply, stream); reply(stream, reply, callback); } @Override public void completed() { - LOG.debug("Completed {}", this); + if (LOG.isDebugEnabled()) + LOG.debug("Completed {}", this); } private void reply(Stream stream, ReplyInfo replyInfo, Callback callback) @@ -249,7 +256,8 @@ public class HttpTransportOverSPDY implements HttpTransport public void completed() { Stream stream = getStream(); - LOG.debug("Resource pushed for {} on {}", + if (LOG.isDebugEnabled()) + LOG.debug("Resource pushed for {} on {}", getRequestHeaders().get(HTTPSPDYHeader.URI.name(version)), stream); coordinator.complete(); } @@ -268,7 +276,8 @@ public class HttpTransportOverSPDY implements HttpTransport private void coordinate() { - LOG.debug("Pushing resources: {}", resources); + if (LOG.isDebugEnabled()) + LOG.debug("Pushing resources: {}", resources); // Must send all push frames to the client at once before we // return from this method and send the main resource data for (String pushResource : resources) @@ -277,13 +286,15 @@ public class HttpTransportOverSPDY implements HttpTransport private void sendNextResourceData() { - LOG.debug("{} sendNextResourceData active: {}", hashCode(), active.get()); + if (LOG.isDebugEnabled()) + LOG.debug("{} sendNextResourceData active: {}", hashCode(), active.get()); if (active.compareAndSet(false, true)) { PushResource resource = queue.poll(); if (resource != null) { - LOG.debug("Opening new push channel for: {}", resource); + if (LOG.isDebugEnabled()) + LOG.debug("Opening new push channel for: {}", resource); HttpChannelOverSPDY pushChannel = newHttpChannelOverSPDY(resource.getPushStream(), resource.getPushRequestHeaders()); pushChannel.requestStart(resource.getPushRequestHeaders(), true); return; @@ -322,7 +333,8 @@ public class HttpTransportOverSPDY implements HttpTransport @Override public void succeeded(Stream pushStream) { - LOG.debug("Headers pushed for {} on {}", pushHeaders.get(HTTPSPDYHeader.URI.name(version)), pushStream); + if (LOG.isDebugEnabled()) + LOG.debug("Headers pushed for {} on {}", pushHeaders.get(HTTPSPDYHeader.URI.name(version)), pushStream); queue.offer(new PushResource(pushStream, pushRequestHeaders)); sendNextResourceData(); } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java index 9e60819ac9b..3a4652f8c1b 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategy.java @@ -167,7 +167,8 @@ public class ReferrerPushStrategy implements PushStrategy String origin = scheme + "://" + host; String url = requestHeaders.get(HTTPSPDYHeader.URI.name(version)).getValue(); String absoluteURL = origin + url; - LOG.debug("Applying push strategy for {}", absoluteURL); + if (LOG.isDebugEnabled()) + LOG.debug("Applying push strategy for {}", absoluteURL); if (isMainResource(url, responseHeaders)) { MainResource mainResource = getOrCreateMainResource(absoluteURL); @@ -190,7 +191,8 @@ public class ReferrerPushStrategy implements PushStrategy result = getPushResources(absoluteURL); } } - LOG.debug("Pushing {} resources for {}: {}", result.size(), absoluteURL, result); + if (LOG.isDebugEnabled()) + LOG.debug("Pushing {} resources for {}: {}", result.size(), absoluteURL, result); } return result; } @@ -208,7 +210,8 @@ public class ReferrerPushStrategy implements PushStrategy MainResource mainResource = mainResources.get(absoluteURL); if (mainResource == null) { - LOG.debug("Creating new main resource for {}", absoluteURL); + if (LOG.isDebugEnabled()) + LOG.debug("Creating new main resource for {}", absoluteURL); MainResource value = new MainResource(absoluteURL); mainResource = mainResources.putIfAbsent(absoluteURL, value); if (mainResource == null) @@ -283,7 +286,8 @@ public class ReferrerPushStrategy implements PushStrategy long delay = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - firstResourceAdded.get()); if (!referrer.startsWith(origin) && !isPushOriginAllowed(origin)) { - LOG.debug("Skipped store of push metadata {} for {}: Origin: {} doesn't match or origin not allowed", + if (LOG.isDebugEnabled()) + LOG.debug("Skipped store of push metadata {} for {}: Origin: {} doesn't match or origin not allowed", url, name, origin); return false; } @@ -293,18 +297,21 @@ public class ReferrerPushStrategy implements PushStrategy // although in rare cases few more resources will be stored if (resources.size() >= maxAssociatedResources) { - LOG.debug("Skipped store of push metadata {} for {}: max associated resources ({}) reached", + if (LOG.isDebugEnabled()) + LOG.debug("Skipped store of push metadata {} for {}: max associated resources ({}) reached", url, name, maxAssociatedResources); return false; } if (delay > referrerPushPeriod) { - LOG.debug("Delay: {}ms longer than referrerPushPeriod ({}ms). Not adding resource: {} for: {}", delay, - referrerPushPeriod, url, name); + if (LOG.isDebugEnabled()) + LOG.debug("Delay: {}ms longer than referrerPushPeriod ({}ms). Not adding resource: {} for: {}", + delay, referrerPushPeriod, url, name); return false; } - LOG.debug("Adding: {} to: {} with delay: {}ms.", url, this, delay); + if (LOG.isDebugEnabled()) + LOG.debug("Adding: {} to: {} with delay: {}ms.", url, this, delay); resources.add(url); return true; } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java index cd656bb31d8..8d500a366ed 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/HTTPProxyEngine.java @@ -88,7 +88,8 @@ public class HTTPProxyEngine extends ProxyEngine String host = proxyServerInfo.getHost(); int port = proxyServerInfo.getAddress().getPort(); - LOG.debug("Sending HTTP request to: {}", host + ":" + port); + if (LOG.isDebugEnabled()) + LOG.debug("Sending HTTP request to: {}", host + ":" + port); final Request request = httpClient.newRequest(host, port) .path(path) .method(HttpMethod.fromString(method)); @@ -119,7 +120,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onData(Stream clientStream, final DataInfo clientDataInfo) { - LOG.debug("received clientDataInfo: {} for stream: {}", clientDataInfo, clientStream); + if (LOG.isDebugEnabled()) + LOG.debug("received clientDataInfo: {} for stream: {}", clientDataInfo, clientStream); DeferredContentProvider contentProvider = (DeferredContentProvider)request.getContent(); contentProvider.offer(clientDataInfo.asByteBuffer(true)); @@ -139,7 +141,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onHeaders(final Response response) { - LOG.debug("onHeaders called with response: {}. Sending replyInfo to client.", response); + if (LOG.isDebugEnabled()) + LOG.debug("onHeaders called with response: {}. Sending replyInfo to client.", response); Fields responseHeaders = createResponseHeaders(clientStream, response); removeHopHeaders(responseHeaders); ReplyInfo replyInfo = new ReplyInfo(responseHeaders, false); @@ -163,7 +166,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onContent(final Response response, ByteBuffer content) { - LOG.debug("onContent called with response: {} and content: {}. Sending response content to client.", + if (LOG.isDebugEnabled()) + LOG.debug("onContent called with response: {} and content: {}. Sending response content to client.", response, content); final ByteBuffer contentCopy = httpClient.getByteBufferPool().acquire(content.remaining(), true); BufferUtil.flipPutFlip(content, contentCopy); @@ -194,7 +198,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void onSuccess(Response response) { - LOG.debug("onSuccess called. Closing client stream."); + if (LOG.isDebugEnabled()) + LOG.debug("onSuccess called. Closing client stream."); clientStream.data(new ByteBufferDataInfo(BufferUtil.EMPTY_BUFFER, true), LOGGING_CALLBACK); } @@ -264,7 +269,8 @@ public class HTTPProxyEngine extends ProxyEngine @Override public void succeeded() { - LOG.debug("succeeded"); + if (LOG.isDebugEnabled()) + LOG.debug("succeeded"); } } } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java index 18b8c5db285..3c41023ee1d 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyEngineSelector.java @@ -57,7 +57,8 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter @Override public final StreamFrameListener onSyn(final Stream clientStream, SynInfo clientSynInfo) { - LOG.debug("C -> P {} on {}", clientSynInfo, clientStream); + if (LOG.isDebugEnabled()) + LOG.debug("C -> P {} on {}", clientSynInfo, clientStream); final Session clientSession = clientStream.getSession(); short clientVersion = clientSession.getVersion(); @@ -66,7 +67,8 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter Fields.Field hostHeader = headers.get(HTTPSPDYHeader.HOST.name(clientVersion)); if (hostHeader == null) { - LOG.debug("No host header found: " + headers); + if (LOG.isDebugEnabled()) + LOG.debug("No host header found: " + headers); rst(clientStream); return null; } @@ -79,7 +81,8 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter ProxyServerInfo proxyServerInfo = getProxyServerInfo(host); if (proxyServerInfo == null) { - LOG.debug("No matching ProxyServerInfo found for: " + host); + if (LOG.isDebugEnabled()) + LOG.debug("No matching ProxyServerInfo found for: " + host); rst(clientStream); return null; } @@ -88,11 +91,13 @@ public class ProxyEngineSelector extends ServerSessionFrameListener.Adapter ProxyEngine proxyEngine = proxyEngines.get(protocol); if (proxyEngine == null) { - LOG.debug("No matching ProxyEngine found for: " + protocol); + if (LOG.isDebugEnabled()) + LOG.debug("No matching ProxyEngine found for: " + protocol); rst(clientStream); return null; } - LOG.debug("Forwarding request: {} -> {}", clientSynInfo, proxyServerInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Forwarding request: {} -> {}", clientSynInfo, proxyServerInfo); return proxyEngine.proxy(clientStream, clientSynInfo, proxyServerInfo); } diff --git a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java index 5316575bb5c..8042d584226 100644 --- a/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java +++ b/jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/SPDYProxyEngine.java @@ -154,7 +154,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onData(Stream clientStream, final DataInfo clientDataInfo) { - LOG.debug("C -> P {} on {}", clientDataInfo, clientStream); + if (LOG.isDebugEnabled()) + LOG.debug("C -> P {} on {}", clientDataInfo, clientStream); ByteBufferDataInfo serverDataInfo = new ByteBufferDataInfo(clientDataInfo.asByteBuffer(false), clientDataInfo.isClose()) { @@ -185,7 +186,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { SPDYClient client = factory.newSPDYClient(version); session = client.connect(address, sessionListener); - LOG.debug("Proxy session connected to {}", address); + if (LOG.isDebugEnabled()) + LOG.debug("Proxy session connected to {}", address); Session existing = serverSessions.putIfAbsent(host, session); if (existing != null) { @@ -237,7 +239,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public StreamFrameListener onPush(Stream stream, PushInfo pushInfo) { - LOG.debug("S -> P pushed {} on {}. Opening new PushStream P -> C now.", pushInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P pushed {} on {}. Opening new PushStream P -> C now.", pushInfo, stream); PushStreamPromise newPushStreamPromise = new PushStreamPromise(stream, pushInfo); this.pushStreamPromise.push(newPushStreamPromise); return new ProxyPushStreamFrameListener(newPushStreamPromise); @@ -259,7 +262,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onData(Stream serverStream, final DataInfo serverDataInfo) { - LOG.debug("S -> P pushed {} on {}", serverDataInfo, serverStream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P pushed {} on {}", serverDataInfo, serverStream); ByteBufferDataInfo clientDataInfo = new ByteBufferDataInfo(serverDataInfo.asByteBuffer(false), serverDataInfo.isClose()) { @@ -293,7 +297,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public StreamFrameListener onPush(Stream senderStream, PushInfo pushInfo) { - LOG.debug("S -> P {} on {}"); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P {} on {}"); PushInfo newPushInfo = convertPushInfo(pushInfo, senderStream, receiverStream); PushStreamPromise pushStreamPromise = new PushStreamPromise(senderStream, newPushInfo); receiverStream.push(newPushInfo, pushStreamPromise); @@ -303,7 +308,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onReply(final Stream stream, ReplyInfo replyInfo) { - LOG.debug("S -> P {} on {}", replyInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P {} on {}", replyInfo, stream); final ReplyInfo clientReplyInfo = new ReplyInfo(convertHeaders(stream, receiverStream, replyInfo.getHeaders()), replyInfo.isClose()); reply(stream, clientReplyInfo); @@ -316,7 +322,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void succeeded() { - LOG.debug("P -> C {} from {} to {}", clientReplyInfo, stream, receiverStream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> C {} from {} to {}", clientReplyInfo, stream, receiverStream); } @Override @@ -338,7 +345,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void onData(final Stream stream, final DataInfo dataInfo) { - LOG.debug("S -> P {} on {}", dataInfo, stream); + if (LOG.isDebugEnabled()) + LOG.debug("S -> P {} on {}", dataInfo, stream); data(stream, dataInfo); } @@ -359,7 +367,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void succeeded() { - LOG.debug("P -> C {} from {} to {}", clientDataInfo, stream, receiverStream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> C {} from {} to {}", clientDataInfo, stream, receiverStream); } @Override @@ -396,7 +405,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener @Override public void succeeded(Stream stream) { - LOG.debug("P -> S {} from {} to {}", info, senderStream, stream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> S {} from {} to {}", info, senderStream, stream); stream.setAttribute(CLIENT_STREAM_ATTRIBUTE, senderStream); @@ -409,18 +419,21 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { if (dataInfoCallback.flushing) { - LOG.debug("SYN completed, flushing {}, queue size {}", dataInfoCallback.dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("SYN completed, flushing {}, queue size {}", dataInfoCallback.dataInfo, queue.size()); dataInfoCallback = null; } else { dataInfoCallback.flushing = true; - LOG.debug("SYN completed, queue size {}", queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("SYN completed, queue size {}", queue.size()); } } else { - LOG.debug("SYN completed, queue empty"); + if (LOG.isDebugEnabled()) + LOG.debug("SYN completed, queue empty"); } } if (dataInfoCallback != null) @@ -448,18 +461,21 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener dataInfoCallbackToFlush = queue.peek(); if (dataInfoCallbackToFlush.flushing) { - LOG.debug("Queued {}, flushing {}, queue size {}", dataInfo, dataInfoCallbackToFlush.dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {}, flushing {}, queue size {}", dataInfo, dataInfoCallbackToFlush.dataInfo, queue.size()); receiverStream = null; } else { dataInfoCallbackToFlush.flushing = true; - LOG.debug("Queued {}, queue size {}", dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {}, queue size {}", dataInfo, queue.size()); } } else { - LOG.debug("Queued {}, SYN incomplete, queue size {}", dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Queued {}, SYN incomplete, queue size {}", dataInfo, queue.size()); } } if (receiverStream != null) @@ -468,7 +484,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener private void flush(Stream receiverStream, DataInfoCallback dataInfoCallback) { - LOG.debug("P -> S {} on {}", dataInfoCallback.dataInfo, receiverStream); + if (LOG.isDebugEnabled()) + LOG.debug("P -> S {} on {}", dataInfoCallback.dataInfo, receiverStream); receiverStream.data(dataInfoCallback.dataInfo, dataInfoCallback); //TODO: timeout??? } @@ -498,11 +515,13 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { assert !dataInfoCallback.flushing; dataInfoCallback.flushing = true; - LOG.debug("Completed {}, queue size {}", dataInfo, queue.size()); + if (LOG.isDebugEnabled()) + LOG.debug("Completed {}, queue size {}", dataInfo, queue.size()); } else { - LOG.debug("Completed {}, queue empty", dataInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Completed {}, queue empty", dataInfo); } } if (dataInfoCallback != null) @@ -550,7 +569,8 @@ public class SPDYProxyEngine extends ProxyEngine implements StreamFrameListener { super.succeeded(receiverStream); - LOG.debug("P -> C PushStreamPromise.succeeded() called with pushStreamPromise: {}", pushStreamPromise); + if (LOG.isDebugEnabled()) + LOG.debug("P -> C PushStreamPromise.succeeded() called with pushStreamPromise: {}", pushStreamPromise); PushStreamPromise promise = pushStreamPromise; if (promise != null) diff --git a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java index 1a9e291e0a6..58de4d3e2c7 100644 --- a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java +++ b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NPNServerConnection.java @@ -53,7 +53,8 @@ public class NPNServerConnection extends NegotiatingServerConnection implements @Override public void protocolSelected(String protocol) { - LOG.debug("{} protocol selected {}", this, protocol); + if (LOG.isDebugEnabled()) + LOG.debug("{} protocol selected {}", this, protocol); setProtocol(protocol != null ? protocol : getDefaultProtocol()); NextProtoNego.remove(getSSLEngine()); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java b/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java index b0ac94e9b4d..29b187bc83d 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/LeakDetector.java @@ -138,7 +138,8 @@ public class LeakDetector extends AbstractLifeCycle implements Runnable { @SuppressWarnings("unchecked") LeakInfo leakInfo = (LeakInfo)queue.remove(); - LOG.debug("Resource GC'ed: {}", leakInfo); + if (LOG.isDebugEnabled()) + LOG.debug("Resource GC'ed: {}", leakInfo); if (resources.remove(leakInfo.id) != null) leaked(leakInfo); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java index f29db3daac4..f2068bb43d2 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java @@ -557,12 +557,16 @@ public class Scanner extends AbstractLifeCycle { if ((_filter == null) || ((_filter != null) && _filter.accept(f.getParentFile(), f.getName()))) { - LOG.debug("scan accepted {}",f); + if (LOG.isDebugEnabled()) + LOG.debug("scan accepted {}",f); String name = f.getCanonicalPath(); scanInfoMap.put(name, new TimeNSize(f.lastModified(),f.length())); } else - LOG.debug("scan rejected {}",f); + { + if (LOG.isDebugEnabled()) + LOG.debug("scan rejected {}",f); + } } // If it is a directory, scan if it is a known directory or the depth is OK. diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java b/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java index e75abfc064f..b7916f3d2f7 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java @@ -148,7 +148,8 @@ public class SocketAddressResolver long start = System.nanoTime(); InetSocketAddress result = new InetSocketAddress(host, port); long elapsed = System.nanoTime() - start; - LOG.debug("Resolved {} in {} ms", host, TimeUnit.NANOSECONDS.toMillis(elapsed)); + if (LOG.isDebugEnabled()) + LOG.debug("Resolved {} in {} ms", host, TimeUnit.NANOSECONDS.toMillis(elapsed)); if (complete.compareAndSet(false, true)) { if (result.isUnresolved()) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java index b96a520c110..d30ad320f9b 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java @@ -569,8 +569,9 @@ public class TypeUtil // target has no annotations if ( parameterAnnotations == null || parameterAnnotations.length == 0 ) - { - LOG.debug("Target has no parameter annotations"); + { + if (LOG.isDebugEnabled()) + LOG.debug("Target has no parameter annotations"); return constructor.newInstance(arguments); } else @@ -588,19 +589,22 @@ public class TypeUtil if (namedArgMap.containsKey(param.value())) { - LOG.debug("placing named {} in position {}", param.value(), count); + if (LOG.isDebugEnabled()) + LOG.debug("placing named {} in position {}", param.value(), count); swizzled[count] = namedArgMap.get(param.value()); } else { - LOG.debug("placing {} in position {}", arguments[count], count); + if (LOG.isDebugEnabled()) + LOG.debug("placing {} in position {}", arguments[count], count); swizzled[count] = arguments[count]; } ++count; } else { - LOG.debug("passing on annotation {}", annotation); + if (LOG.isDebugEnabled()) + LOG.debug("passing on annotation {}", annotation); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java index 8f2d9dc7ab0..1b0d7366ebc 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java @@ -174,15 +174,15 @@ public abstract class AbstractLifeCycle implements LifeCycle { _state = __STARTED; if (LOG.isDebugEnabled()) - - LOG.debug(STARTED+" @{}ms {}",ManagementFactory.getRuntimeMXBean().getUptime(),this); + LOG.debug(STARTED+" @{}ms {}",ManagementFactory.getRuntimeMXBean().getUptime(),this); for (Listener listener : _listeners) listener.lifeCycleStarted(this); } private void setStarting() { - LOG.debug("starting {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("starting {}",this); _state = __STARTING; for (Listener listener : _listeners) listener.lifeCycleStarting(this); @@ -190,7 +190,8 @@ public abstract class AbstractLifeCycle implements LifeCycle private void setStopping() { - LOG.debug("stopping {}",this); + if (LOG.isDebugEnabled()) + LOG.debug("stopping {}",this); _state = __STOPPING; for (Listener listener : _listeners) listener.lifeCycleStopping(this); @@ -199,7 +200,8 @@ public abstract class AbstractLifeCycle implements LifeCycle private void setStopped() { _state = __STOPPED; - LOG.debug("{} {}",STOPPED,this); + if (LOG.isDebugEnabled()) + LOG.debug("{} {}",STOPPED,this); for (Listener listener : _listeners) listener.lifeCycleStopped(this); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java index 464c0f7e4a8..28c45664bf7 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/ContainerLifeCycle.java @@ -320,7 +320,8 @@ public class ContainerLifeCycle extends AbstractLifeCycle implements Container, throw new RuntimeException(e); } - LOG.debug("{} added {}",this,new_bean); + if (LOG.isDebugEnabled()) + LOG.debug("{} added {}",this,new_bean); return true; } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java index 94936452bd3..29c54b31009 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/component/FileDestroyable.java @@ -86,7 +86,8 @@ public class FileDestroyable implements Destroyable { if (file.exists()) { - LOG.debug("Destroy {}",file); + if (LOG.isDebugEnabled()) + LOG.debug("Destroy {}",file); IO.delete(file); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java index 0f6caf9b072..39064e378d1 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AWTLeakPreventer.java @@ -40,7 +40,8 @@ public class AWTLeakPreventer extends AbstractLeakPreventer @Override public void prevent(ClassLoader loader) { - LOG.debug("Pinning classloader for java.awt.EventQueue using "+loader); + if (LOG.isDebugEnabled()) + LOG.debug("Pinning classloader for java.awt.EventQueue using "+loader); Toolkit.getDefaultToolkit(); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java index 0cfd3c9553d..1ca99601d26 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/AppContextLeakPreventer.java @@ -34,7 +34,8 @@ public class AppContextLeakPreventer extends AbstractLeakPreventer @Override public void prevent(ClassLoader loader) { - LOG.debug("Pinning classloader for AppContext.getContext() with "+loader); + if (LOG.isDebugEnabled()) + LOG.debug("Pinning classloader for AppContext.getContext() with "+loader); ImageIO.getUseCache(); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java index d229ba740aa..a8d211bdda6 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/DriverManagerLeakPreventer.java @@ -35,7 +35,8 @@ public class DriverManagerLeakPreventer extends AbstractLeakPreventer @Override public void prevent(ClassLoader loader) { - LOG.debug("Pinning DriverManager classloader with "+loader); + if (LOG.isDebugEnabled()) + LOG.debug("Pinning DriverManager classloader with "+loader); DriverManager.getDrivers(); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java index 7175a9c3d7c..47776f4643a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java @@ -148,7 +148,8 @@ public class FileResource extends Resource if (!abs.equals(can)) { - LOG.debug("ALIAS abs={} can={}",abs,can); + if (LOG.isDebugEnabled()) + LOG.debug("ALIAS abs={} can={}",abs,can); URI alias=new File(can).toURI(); // Have to encode the path as File.toURI does not! diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java index 434aa887565..9d3b932b665 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java @@ -73,7 +73,8 @@ class JarFileResource extends JarResource { try { - LOG.debug("Closing JarFile "+_jarFile.getName()); + if (LOG.isDebugEnabled()) + LOG.debug("Closing JarFile "+_jarFile.getName()); _jarFile.close(); } catch ( IOException ioe ) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java index 016c81273eb..d7300954003 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java @@ -251,7 +251,8 @@ public class SslContextFactory extends AbstractLifeCycle if (_trustAll) { - LOG.debug("No keystore or trust store configured. ACCEPTING UNTRUSTED CERTIFICATES!!!!!"); + if (LOG.isDebugEnabled()) + LOG.debug("No keystore or trust store configured. ACCEPTING UNTRUSTED CERTIFICATES!!!!!"); // Create a trust manager that does not validate certificate chains trust_managers = TRUST_ALL_CERTS; } @@ -304,9 +305,11 @@ public class SslContextFactory extends AbstractLifeCycle } SSLEngine engine = newSSLEngine(); - LOG.debug("Enabled Protocols {} of {}",Arrays.asList(engine.getEnabledProtocols()),Arrays.asList(engine.getSupportedProtocols())); if (LOG.isDebugEnabled()) + { + LOG.debug("Enabled Protocols {} of {}",Arrays.asList(engine.getEnabledProtocols()),Arrays.asList(engine.getSupportedProtocols())); LOG.debug("Enabled Ciphers {} of {}",Arrays.asList(engine.getEnabledCipherSuites()),Arrays.asList(engine.getSupportedCipherSuites())); + } } } From 2a943887b66e8dc88383d4cf8a30c09df3377859 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 25 Jun 2014 06:52:18 -0700 Subject: [PATCH 020/111] 437800 - URLs with single quote and spaces return 404 + Expanded FileResourceTest + Added PathResource + PathResourceTest to show java.nio.file alternative approach (currently POC) --- .../jetty/util/resource/PathResource.java | 331 +++++++++++++ .../eclipse/jetty/util/resource/Resource.java | 4 + .../eclipse/jetty/util/CollectionAssert.java | 137 ++++++ .../util/resource/AbstractFSResourceTest.java | 447 ++++++++++++++++++ .../jetty/util/resource/FileResourceTest.java | 128 +---- .../jetty/util/resource/PathResourceTest.java | 38 ++ 6 files changed, 964 insertions(+), 121 deletions(-) create mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java create mode 100644 jetty-util/src/test/java/org/eclipse/jetty/util/CollectionAssert.java create mode 100644 jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java create mode 100644 jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java new file mode 100644 index 00000000000..2a4f8d0c5c1 --- /dev/null +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java @@ -0,0 +1,331 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util.resource; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.channels.FileChannel; +import java.nio.channels.ReadableByteChannel; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.InvalidPathException; +import java.nio.file.LinkOption; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.nio.file.StandardOpenOption; +import java.nio.file.attribute.FileTime; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; + +/** + * Java NIO Path equivalent of FileResource. + */ +public class PathResource extends Resource +{ + private static final Logger LOG = Log.getLogger(PathResource.class); + + private final Path path; + private final URI uri; + private LinkOption linkOptions[] = new LinkOption[] { LinkOption.NOFOLLOW_LINKS }; + + public PathResource(File file) + { + this(file.toPath()); + } + + public PathResource(Path path) + { + this.path = path; + this.uri = this.path.toUri(); + } + + public PathResource(URI uri) throws IOException + { + if (!uri.isAbsolute()) + { + throw new IllegalArgumentException("not an absolute uri"); + } + + if (!uri.getScheme().equalsIgnoreCase("file")) + { + throw new IllegalArgumentException("not file: scheme"); + } + + Path path; + try + { + path = new File(uri).toPath(); + } + catch (InvalidPathException e) + { + throw e; + } + catch (IllegalArgumentException e) + { + throw e; + } + catch (Exception e) + { + LOG.ignore(e); + throw new IOException("Unable to build Path from: " + uri,e); + } + + this.path = path; + this.uri = path.toUri(); + } + + public PathResource(URL url) throws IOException, URISyntaxException + { + this(url.toURI()); + } + + @Override + public Resource addPath(String apath) throws IOException, MalformedURLException + { + return new PathResource(this.path.resolve(apath)); + } + + @Override + public void close() + { + // not applicable for FileSytem / Path + } + + @Override + public boolean delete() throws SecurityException + { + try + { + return Files.deleteIfExists(path); + } + catch (IOException e) + { + LOG.ignore(e); + return false; + } + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + { + return true; + } + if (obj == null) + { + return false; + } + if (getClass() != obj.getClass()) + { + return false; + } + PathResource other = (PathResource)obj; + if (path == null) + { + if (other.path != null) + { + return false; + } + } + else if (!path.equals(other.path)) + { + return false; + } + return true; + } + + @Override + public boolean exists() + { + return Files.exists(path,linkOptions); + } + + @Override + public File getFile() throws IOException + { + return path.toFile(); + } + + public boolean getFollowLinks() + { + return (linkOptions != null) && (linkOptions.length > 0) && (linkOptions[0] == LinkOption.NOFOLLOW_LINKS); + } + + @Override + public InputStream getInputStream() throws IOException + { + return Files.newInputStream(path,StandardOpenOption.READ); + } + + @Override + public String getName() + { + return path.toAbsolutePath().toString(); + } + + @Override + public ReadableByteChannel getReadableByteChannel() throws IOException + { + return FileChannel.open(path,StandardOpenOption.READ); + } + + @Override + public URI getURI() + { + return this.uri; + } + + @Override + public URL getURL() + { + try + { + return path.toUri().toURL(); + } + catch (MalformedURLException e) + { + return null; + } + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = (prime * result) + ((path == null)?0:path.hashCode()); + return result; + } + + @Override + public boolean isContainedIn(Resource r) throws MalformedURLException + { + // not applicable for FileSystem / path + return false; + } + + @Override + public boolean isDirectory() + { + return Files.isDirectory(path,linkOptions); + } + + @Override + public long lastModified() + { + try + { + FileTime ft = Files.getLastModifiedTime(path,linkOptions); + return ft.toMillis(); + } + catch (IOException e) + { + LOG.ignore(e); + return 0; + } + } + + @Override + public long length() + { + try + { + return Files.size(path); + } + catch (IOException e) + { + // in case of error, use File.length logic of 0L + return 0L; + } + } + + @Override + public String[] list() + { + try + { + List entries = new ArrayList<>(); + try (DirectoryStream dir = Files.newDirectoryStream(path)) + { + for (Path entry : dir) + { + String name = entry.getFileName().toString(); + + if (Files.isDirectory(entry)) + { + name += "/"; + } + + entries.add(name); + } + } + int size = entries.size(); + return entries.toArray(new String[size]); + } + catch (IOException e) + { + LOG.ignore(e); + } + return null; + } + + @Override + public boolean renameTo(Resource dest) throws SecurityException + { + if (dest instanceof PathResource) + { + PathResource destRes = (PathResource)dest; + try + { + Path result = Files.move(path,destRes.path,StandardCopyOption.ATOMIC_MOVE); + return Files.exists(result,linkOptions); + } + catch (IOException e) + { + LOG.ignore(e); + return false; + } + } + else + { + return false; + } + } + + public void setFollowLinks(boolean followLinks) + { + if (followLinks) + { + linkOptions = new LinkOption[0]; + } + else + { + linkOptions = new LinkOption[] { LinkOption.NOFOLLOW_LINKS }; + } + } +} diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java index b36a9355823..181ccf0d2af 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java @@ -352,6 +352,7 @@ public abstract class Resource implements ResourceFactory, Closeable /** * Returns an URL representing the given resource */ + // TODO: should deprecate this one and only use getURI() public abstract URL getURL(); /* ------------------------------------------------------------ */ @@ -405,6 +406,7 @@ public abstract class Resource implements ResourceFactory, Closeable /** * Deletes the given resource */ + // TODO: can throw IOException public abstract boolean delete() throws SecurityException; @@ -412,6 +414,7 @@ public abstract class Resource implements ResourceFactory, Closeable /** * Rename the given resource */ + // TODO: can throw IOException public abstract boolean renameTo( Resource dest) throws SecurityException; @@ -420,6 +423,7 @@ public abstract class Resource implements ResourceFactory, Closeable * Returns a list of resource names contained in the given resource * The resource names are not URL encoded. */ + // TODO: can throw IOException public abstract String[] list(); /* ------------------------------------------------------------ */ diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/CollectionAssert.java b/jetty-util/src/test/java/org/eclipse/jetty/util/CollectionAssert.java new file mode 100644 index 00000000000..9ddba2aab32 --- /dev/null +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/CollectionAssert.java @@ -0,0 +1,137 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.junit.Assert; + +public class CollectionAssert +{ + public static void assertContainsUnordered(String msg, Collection expectedSet, Collection actualSet) + { + // same size? + boolean mismatch = expectedSet.size() != actualSet.size(); + + // test content + Set missing = new HashSet<>(); + for (String expected : expectedSet) + { + if (!actualSet.contains(expected)) + { + missing.add(expected); + } + } + + if (mismatch || missing.size() > 0) + { + // build up detailed error message + StringWriter message = new StringWriter(); + PrintWriter err = new PrintWriter(message); + + err.printf("%s: Assert Contains (Unordered)",msg); + if (mismatch) + { + err.print(" [size mismatch]"); + } + if (missing.size() >= 0) + { + err.printf(" [%d entries missing]",missing.size()); + } + err.println(); + err.printf("Actual Entries (size: %d)%n",actualSet.size()); + for (String actual : actualSet) + { + char indicator = expectedSet.contains(actual)?' ':'>'; + err.printf("%s| %s%n",indicator,actual); + } + err.printf("Expected Entries (size: %d)%n",expectedSet.size()); + for (String expected : expectedSet) + { + char indicator = actualSet.contains(expected)?' ':'>'; + err.printf("%s| %s%n",indicator,expected); + } + err.flush(); + Assert.fail(message.toString()); + } + } + + public static void assertOrdered(String msg, List expectedList, List actualList) + { + // same size? + boolean mismatch = expectedList.size() != actualList.size(); + + // test content + List badEntries = new ArrayList<>(); + int min = Math.min(expectedList.size(),actualList.size()); + int max = Math.max(expectedList.size(),actualList.size()); + for (int i = 0; i < min; i++) + { + if (!expectedList.get(i).equals(actualList.get(i))) + { + badEntries.add(i); + } + } + for (int i = min; i < max; i++) + { + badEntries.add(i); + } + + if (mismatch || badEntries.size() > 0) + { + // build up detailed error message + StringWriter message = new StringWriter(); + PrintWriter err = new PrintWriter(message); + + err.printf("%s: Assert Contains (Unordered)",msg); + if (mismatch) + { + err.print(" [size mismatch]"); + } + if (badEntries.size() >= 0) + { + err.printf(" [%d entries not matched]",badEntries.size()); + } + err.println(); + err.printf("Actual Entries (size: %d)%n",actualList.size()); + for (int i = 0; i < actualList.size(); i++) + { + String actual = actualList.get(i); + char indicator = badEntries.contains(i)?'>':' '; + err.printf("%s[%d] %s%n",indicator,i,actual); + } + + err.printf("Expected Entries (size: %d)%n",expectedList.size()); + for (int i = 0; i < expectedList.size(); i++) + { + String expected = expectedList.get(i); + char indicator = badEntries.contains(i)?'>':' '; + err.printf("%s[%d] %s%n",indicator,i,expected); + } + err.flush(); + Assert.fail(message.toString()); + } + } +} diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java new file mode 100644 index 00000000000..a00ec851bca --- /dev/null +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java @@ -0,0 +1,447 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util.resource; + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; +import static org.junit.Assume.*; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URI; +import java.net.URL; +import java.nio.ByteBuffer; +import java.nio.channels.ReadableByteChannel; +import java.nio.file.InvalidPathException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.eclipse.jetty.toolchain.test.FS; +import org.eclipse.jetty.toolchain.test.IO; +import org.eclipse.jetty.toolchain.test.OS; +import org.eclipse.jetty.toolchain.test.TestingDir; +import org.eclipse.jetty.util.BufferUtil; +import org.eclipse.jetty.util.CollectionAssert; +import org.junit.Rule; +import org.junit.Test; + +public abstract class AbstractFSResourceTest +{ + @Rule + public TestingDir testdir = new TestingDir(); + + public abstract Resource newResource(URI uri) throws IOException; + + public abstract Resource newResource(File file) throws IOException; + + private URI createEmptyFile(String name) throws IOException + { + File file = testdir.getFile(name); + file.createNewFile(); + return file.toURI(); + } + + @Test(expected = IllegalArgumentException.class) + public void testNonAbsoluteURI() throws Exception + { + newResource(new URI("path/to/resource")); + } + + @Test(expected = IllegalArgumentException.class) + public void testNotFileURI() throws Exception + { + newResource(new URI("http://www.eclipse.org/jetty/")); + } + + @Test(expected = IllegalArgumentException.class) + public void testBogusFilename() throws Exception + { + if (OS.IS_UNIX) + { + newResource(new URI("file://Z:/:")); + } + else if (OS.IS_WINDOWS) + { + newResource(new URI("file:/dev/null")); + } + } + + @Test + public void testIsContainedIn() throws Exception + { + createEmptyFile("foo"); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("is contained in",res.isContainedIn(base),is(false)); + } + } + + @Test + public void testIsDirectory() throws Exception + { + File dir = testdir.getDir(); + createEmptyFile("foo"); + + File subdir = new File(dir,"sub"); + FS.ensureDirExists(subdir); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.isDirectory",res.isDirectory(),is(false)); + + Resource sub = base.addPath("sub"); + assertThat("sub/.isDirectory",sub.isDirectory(),is(true)); + } + } + + @Test + public void testLastModified() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + long expected = file.lastModified(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.lastModified",res.lastModified(),is(expected)); + } + } + + @Test + public void testLastModified_NotExists() throws Exception + { + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.lastModified",res.lastModified(),is(0L)); + } + } + + @Test + public void testLength() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + try (StringReader reader = new StringReader("foo"); FileWriter writer = new FileWriter(file)) + { + IO.copy(reader,writer); + } + + long expected = file.length(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.length",res.length(),is(expected)); + } + } + + @Test + public void testLength_NotExists() throws Exception + { + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo"); + assertThat("foo.length",res.length(),is(0L)); + } + } + + @Test + public void testDelete() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + try (Resource base = newResource(testdir.getDir())) + { + // Is it there? + Resource res = base.addPath("foo"); + assertThat("foo.exists",res.exists(),is(true)); + // delete it + assertThat("foo.delete",res.delete(),is(true)); + // is it there? + assertThat("foo.exists",res.exists(),is(false)); + } + } + + @Test + public void testDelete_NotExists() throws Exception + { + try (Resource base = newResource(testdir.getDir())) + { + // Is it there? + Resource res = base.addPath("foo"); + assertThat("foo.exists",res.exists(),is(false)); + // delete it + assertThat("foo.delete",res.delete(),is(false)); + // is it there? + assertThat("foo.exists",res.exists(),is(false)); + } + } + + @Test + public void testName() throws Exception + { + String expected = testdir.getDir().getAbsolutePath(); + + try (Resource base = newResource(testdir.getDir())) + { + assertThat("base.name",base.getName(),is(expected)); + } + } + + @Test + public void testInputStream() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + String content = "Foo is here"; + + try (StringReader reader = new StringReader(content); FileWriter writer = new FileWriter(file)) + { + IO.copy(reader,writer); + } + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + try (InputStream stream = foo.getInputStream(); InputStreamReader reader = new InputStreamReader(stream); StringWriter writer = new StringWriter()) + { + IO.copy(reader,writer); + assertThat("Stream",writer.toString(),is(content)); + } + } + } + + @Test + public void testReadableByteChannel() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + String content = "Foo is here"; + + try (StringReader reader = new StringReader(content); FileWriter writer = new FileWriter(file)) + { + IO.copy(reader,writer); + } + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + try (ReadableByteChannel channel = foo.getReadableByteChannel()) + { + ByteBuffer buf = ByteBuffer.allocate(256); + channel.read(buf); + buf.flip(); + String actual = BufferUtil.toUTF8String(buf); + assertThat("ReadableByteChannel content",actual,is(content)); + } + } + } + + @Test + public void testGetURI() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + URI expected = file.toURI(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + assertThat("getURI",foo.getURI(),is(expected)); + } + } + + @Test + public void testGetURL() throws Exception + { + File file = testdir.getFile("foo"); + file.createNewFile(); + + URL expected = file.toURI().toURL(); + + try (Resource base = newResource(testdir.getDir())) + { + Resource foo = base.addPath("foo"); + assertThat("getURL",foo.getURL(),is(expected)); + } + } + + @Test + public void testList() throws Exception + { + File dir = testdir.getDir(); + FS.touch(new File(dir, "foo")); + FS.touch(new File(dir, "bar")); + FS.ensureDirExists(new File(dir, "tick")); + FS.ensureDirExists(new File(dir, "tock")); + + List expected = new ArrayList<>(); + expected.add("foo"); + expected.add("bar"); + expected.add("tick/"); + expected.add("tock/"); + + try (Resource base = newResource(testdir.getDir())) + { + String list[] = base.list(); + List actual = Arrays.asList(list); + + CollectionAssert.assertContainsUnordered("Resource Directory Listing", + expected,actual); + } + } + + @Test + public void testSemicolon() throws Exception + { + assumeTrue(!OS.IS_WINDOWS); + createEmptyFile("foo;"); + + try (Resource base = newResource(testdir.getDir())) + { + Resource res = base.addPath("foo;"); + assertThat("Alias: " + res,res.getAlias(),nullValue()); + } + } + + @Test + public void testExist_Normal() throws Exception + { + createEmptyFile("a.jsp"); + + URI ref = testdir.getDir().toURI().resolve("a.jsp"); + try (Resource fileres = newResource(ref)) + { + assertThat("Resource: " + fileres,fileres.exists(),is(true)); + } + } + + @Test + public void testSingleQuoteInFileName() throws Exception + { + createEmptyFile("foo's.txt"); + createEmptyFile("f o's.txt"); + + URI refQuoted = testdir.getDir().toURI().resolve("foo's.txt"); + + try (Resource fileres = newResource(refQuoted)) + { + assertThat("Exists: " + refQuoted,fileres.exists(),is(true)); + assertThat("Alias: " + refQuoted,fileres.getAlias(),nullValue()); + } + + URI refEncoded = testdir.getDir().toURI().resolve("foo%27s.txt"); + + try (Resource fileres = newResource(refEncoded)) + { + assertThat("Exists: " + refEncoded,fileres.exists(),is(true)); + assertThat("Alias: " + refEncoded,fileres.getAlias(),nullValue()); + } + + URI refQuoteSpace = testdir.getDir().toURI().resolve("f%20o's.txt"); + + try (Resource fileres = newResource(refQuoteSpace)) + { + assertThat("Exists: " + refQuoteSpace,fileres.exists(),is(true)); + assertThat("Alias: " + refQuoteSpace,fileres.getAlias(),nullValue()); + } + + URI refEncodedSpace = testdir.getDir().toURI().resolve("f%20o%27s.txt"); + + try (Resource fileres = newResource(refEncodedSpace)) + { + assertThat("Exists: " + refEncodedSpace,fileres.exists(),is(true)); + assertThat("Alias: " + refEncodedSpace,fileres.getAlias(),nullValue()); + } + + URI refA = testdir.getDir().toURI().resolve("foo's.txt"); + URI refB = testdir.getDir().toURI().resolve("foo%27s.txt"); + + StringBuilder msg = new StringBuilder(); + msg.append("URI[a].equals(URI[b])").append(System.lineSeparator()); + msg.append("URI[a] = ").append(refA).append(System.lineSeparator()); + msg.append("URI[b] = ").append(refB); + + // show that simple URI.equals() doesn't work + assertThat(msg.toString(),refA.equals(refB),is(false)); + + // now show that Resource.equals() does work + try (Resource a = newResource(refA); Resource b = newResource(refB);) + { + assertThat("A.equals(B)",a.equals(b),is(true)); + } + } + + @Test + public void testExist_BadNull() throws Exception + { + createEmptyFile("a.jsp"); + + try + { + // request with null at end + URI ref = testdir.getDir().toURI().resolve("a.jsp%00"); + assertThat("Null URI",ref,notNullValue()); + + newResource(ref); + fail("Should have thrown " + InvalidPathException.class); + } + catch (InvalidPathException e) + { + // Expected path + } + } + + @Test + public void testExist_BadNullX() throws Exception + { + createEmptyFile("a.jsp"); + + try + { + // request with null and x at end + URI ref = testdir.getDir().toURI().resolve("a.jsp%00x"); + assertThat("NullX URI",ref,notNullValue()); + + newResource(ref); + fail("Should have thrown " + InvalidPathException.class); + } + catch (InvalidPathException e) + { + // Expected path + } + } +} diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java index e77f241b49b..71b02db6caf 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/FileResourceTest.java @@ -18,150 +18,36 @@ package org.eclipse.jetty.util.resource; -import static org.hamcrest.Matchers.is; -import static org.junit.Assume.assumeTrue; - import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import org.eclipse.jetty.toolchain.test.OS; -import org.eclipse.jetty.toolchain.test.TestingDir; -import org.eclipse.jetty.util.UrlEncoded; -import org.hamcrest.Matchers; -import org.junit.Assert; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -public class FileResourceTest +public class FileResourceTest extends AbstractFSResourceTest { - @Rule - public TestingDir testdir = new TestingDir(); - - private URI createDummyFile(String name) throws IOException + @Override + public Resource newResource(URI uri) throws IOException { - File file = testdir.getFile(name); - file.createNewFile(); - return file.toURI(); + return new FileResource(uri); } - private URL decode(URL url) throws MalformedURLException + @Override + public Resource newResource(File file) throws IOException { - String raw = url.toExternalForm(); - String decoded = UrlEncoded.decodeString(raw,0,raw.length(), StandardCharsets.UTF_8); - return new URL(decoded); + return new FileResource(file); } - @Test - public void testSemicolon() throws Exception - { - assumeTrue(!OS.IS_WINDOWS); - createDummyFile("foo;"); - - try(Resource base = new FileResource(testdir.getDir());) - { - Resource res = base.addPath("foo;"); - Assert.assertNull(res.getAlias()); - } - } - - @Test - public void testExist_Normal() throws Exception - { - createDummyFile("a.jsp"); - - URI ref = testdir.getDir().toURI().resolve("a.jsp"); - try(FileResource fileres = new FileResource(decode(ref.toURL()));) - { - Assert.assertThat("FileResource: " + fileres,fileres.exists(),is(true)); - } - } - - @Test - public void testSingleQuoteInFileName() throws Exception - { - createDummyFile("foo's.txt"); - createDummyFile("f o's.txt"); - - URI refQuoted = testdir.getDir().toURI().resolve("foo's.txt"); - - try(FileResource fileres = new FileResource(refQuoted)) - { - Assert.assertThat(fileres.exists(),is(true)); - Assert.assertThat(fileres.getAlias(),Matchers.nullValue()); - } - - URI refEncoded = testdir.getDir().toURI().resolve("foo%27s.txt"); - - try(FileResource fileres = new FileResource(refEncoded)) - { - Assert.assertThat(fileres.exists(),is(true)); - Assert.assertThat(fileres.getAlias(),Matchers.nullValue()); - } - - URI refQuoteSpace = testdir.getDir().toURI().resolve("f%20o's.txt"); - - try(FileResource fileres = new FileResource(refQuoteSpace)) - { - Assert.assertThat(fileres.exists(),is(true)); - Assert.assertThat(fileres.getAlias(),Matchers.nullValue()); - } - - URI refEncodedSpace = testdir.getDir().toURI().resolve("f%20o%27s.txt"); - - try(FileResource fileres = new FileResource(refEncodedSpace)) - { - Assert.assertThat(fileres.exists(),is(true)); - Assert.assertThat(fileres.getAlias(),Matchers.nullValue()); - } - } - - - @Ignore("Cannot get null to be seen by FileResource") @Test public void testExist_BadNull() throws Exception { - createDummyFile("a.jsp"); - - try - { - // request with null at end - URI ref = testdir.getDir().toURI().resolve("a.jsp%00"); - try(FileResource fileres = new FileResource(decode(ref.toURL()));) - { - Assert.assertThat("FileResource: " + fileres,fileres.exists(),is(false)); - } - } - catch(URISyntaxException e) - { - // Valid path - } } @Ignore("Validation shouldn't be done in FileResource") @Test public void testExist_BadNullX() throws Exception { - createDummyFile("a.jsp"); - - try - { - // request with null and x at end - URI ref = testdir.getDir().toURI().resolve("a.jsp%00x"); - try(FileResource fileres = new FileResource(decode(ref.toURL()));) - { - Assert.assertThat("FileResource: " + fileres,fileres.exists(),is(false)); - } - } - catch(URISyntaxException e) - { - // Valid path - } } } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java new file mode 100644 index 00000000000..6e059a68c2a --- /dev/null +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/PathResourceTest.java @@ -0,0 +1,38 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.util.resource; + +import java.io.File; +import java.io.IOException; +import java.net.URI; + +public class PathResourceTest extends AbstractFSResourceTest +{ + @Override + public Resource newResource(URI uri) throws IOException + { + return new PathResource(uri); + } + + @Override + public Resource newResource(File file) throws IOException + { + return new PathResource(file); + } +} From bad3165d8a1683affaf6f0d5fceb8baeff23bc6d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 25 Jun 2014 08:24:24 -0700 Subject: [PATCH 021/111] Fixing jdk 8 test failure --- jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java | 1 + jetty-start/src/test/resources/assert-home-with-spdy.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java index 1f436b2cf3a..3ba4137e534 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java @@ -142,6 +142,7 @@ public class MainTest File homePath = MavenTestingUtils.getTestResourceDir("usecases/home").getAbsoluteFile(); cmdLineArgs.add("jetty.home=" + homePath); cmdLineArgs.add("user.dir=" + homePath); + cmdLineArgs.add("java.version=1.7.0_60"); // Modules cmdLineArgs.add("--module=server"); diff --git a/jetty-start/src/test/resources/assert-home-with-spdy.txt b/jetty-start/src/test/resources/assert-home-with-spdy.txt index 7eddc13f688..9069c2bf79c 100644 --- a/jetty-start/src/test/resources/assert-home-with-spdy.txt +++ b/jetty-start/src/test/resources/assert-home-with-spdy.txt @@ -46,6 +46,7 @@ LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar # The Properties we expect (order is irrelevant) +PROP|java.version=1.7.0_60 PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g PROP|jetty.keystore=etc/keystore PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 From 7b7c592fc81b0c138e92d0338683195a04c37b84 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 25 Jun 2014 17:25:43 +0200 Subject: [PATCH 022/111] Improved logging. --- .../java/org/eclipse/jetty/client/ConnectionPool.java | 7 ++++++- .../java/org/eclipse/jetty/client/HttpDestination.java | 9 +++++---- .../org/eclipse/jetty/client/PoolingHttpDestination.java | 8 +++++++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java index 49d1c650ac5..53fe5ae2e01 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ConnectionPool.java @@ -236,6 +236,11 @@ public class ConnectionPool implements Closeable, Dumpable @Override public String toString() { - return String.format("%s %d/%d", getClass().getSimpleName(), connectionCount.get(), maxConnections); + return String.format("%s[c=%d/%d,a=%d,i=%d]", + getClass().getSimpleName(), + connectionCount.get(), + maxConnections, + activeConnections.size(), + idleConnections.size()); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java index c539e78d4a3..45e3878b388 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpDestination.java @@ -176,7 +176,7 @@ public abstract class HttpDestination implements Destination, Closeable, Dumpabl else { if (LOG.isDebugEnabled()) - LOG.debug("Queued {}", request); + LOG.debug("Queued {} for {}", request, this); requestNotifier.notifyQueued(request); send(); } @@ -184,7 +184,7 @@ public abstract class HttpDestination implements Destination, Closeable, Dumpabl else { if (LOG.isDebugEnabled()) - LOG.debug("Max queue size {} exceeded by {}", client.getMaxRequestsQueuedPerDestination(), request); + LOG.debug("Max queue size {} exceeded by {} for {}", client.getMaxRequestsQueuedPerDestination(), request, this); request.abort(new RejectedExecutionException("Max requests per destination " + client.getMaxRequestsQueuedPerDestination() + " exceeded for " + this)); } } @@ -258,9 +258,10 @@ public abstract class HttpDestination implements Destination, Closeable, Dumpabl @Override public String toString() { - return String.format("%s(%s)%s", + return String.format("%s[%s]%s,queue=%d", HttpDestination.class.getSimpleName(), asString(), - proxy == null ? "" : " via " + proxy); + proxy == null ? "" : "(via " + proxy + ")", + exchanges.size()); } } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java b/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java index 17f780b85d2..2803276a464 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/PoolingHttpDestination.java @@ -94,7 +94,7 @@ public abstract class PoolingHttpDestination extends HttpD HttpClient client = getHttpClient(); final HttpExchange exchange = getHttpExchanges().poll(); if (LOG.isDebugEnabled()) - LOG.debug("Processing exchange {} on connection {}", exchange, connection); + LOG.debug("Processing exchange {} on {} of {}", exchange, connection, this); if (exchange == null) { if (!connectionPool.release(connection)) @@ -213,4 +213,10 @@ public abstract class PoolingHttpDestination extends HttpD { ContainerLifeCycle.dump(out, indent, Arrays.asList(connectionPool)); } + + @Override + public String toString() + { + return String.format("%s,pool=%s", super.toString(), connectionPool); + } } From 45a0690ba7d15ec8a388be9e1ad54f1260650da4 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 25 Jun 2014 10:05:59 -0700 Subject: [PATCH 023/111] More PathResource updates. + Fixing up PathResource.list() per recommendations by @ash2k (on github) + Adding PathResource.getAlias() to conform to expectations --- .../jetty/util/resource/PathResource.java | 47 +++++++++++----- .../util/resource/AbstractFSResourceTest.java | 53 +++++++++++++++++-- 2 files changed, 85 insertions(+), 15 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java index 2a4f8d0c5c1..824e5c59fee 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java @@ -27,6 +27,7 @@ import java.net.URISyntaxException; import java.net.URL; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; +import java.nio.file.DirectoryIteratorException; import java.nio.file.DirectoryStream; import java.nio.file.Files; import java.nio.file.InvalidPathException; @@ -264,32 +265,54 @@ public class PathResource extends Resource } } + @Override + public URI getAlias() + { + if (Files.isSymbolicLink(path)) + { + try + { + return path.toRealPath().toUri(); + } + catch (IOException e) + { + LOG.debug(e); + return null; + } + } + else + { + return null; + } + } + @Override public String[] list() { - try + try (DirectoryStream dir = Files.newDirectoryStream(path)) { List entries = new ArrayList<>(); - try (DirectoryStream dir = Files.newDirectoryStream(path)) + for (Path entry : dir) { - for (Path entry : dir) + String name = entry.getFileName().toString(); + + if (Files.isDirectory(entry)) { - String name = entry.getFileName().toString(); - - if (Files.isDirectory(entry)) - { - name += "/"; - } - - entries.add(name); + name += "/"; } + + entries.add(name); } int size = entries.size(); return entries.toArray(new String[size]); } + catch (DirectoryIteratorException e) + { + LOG.debug(e); + } catch (IOException e) { - LOG.ignore(e); + LOG.debug(e); } return null; } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java index a00ec851bca..62ef4f0e429 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java @@ -33,7 +33,9 @@ import java.net.URI; import java.net.URL; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; +import java.nio.file.Files; import java.nio.file.InvalidPathException; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -323,12 +325,57 @@ public abstract class AbstractFSResourceTest expected,actual); } } - + + @Test + public void testSymlink() throws Exception + { + File dir = testdir.getDir(); + + Path foo = new File(dir, "foo").toPath(); + Path bar = new File(dir, "bar").toPath(); + + try + { + Files.createFile(foo); + Files.createSymbolicLink(bar,foo); + } + catch (UnsupportedOperationException e) + { + // if unable to create symlink, no point testing the rest + // this is the path that Microsoft Windows takes. + assumeNoException(e); + } + + try (Resource base = newResource(testdir.getDir())) + { + Resource resFoo = base.addPath("foo"); + Resource resBar = base.addPath("bar"); + + // Access to the same resource, but via a symlink means that they are not equivalent + assertThat("foo.equals(bar)", resFoo.equals(resBar), is(false)); + + assertThat("foo.alias", resFoo.getAlias(), nullValue()); + assertThat("bar.alias", resBar.getAlias(), is(foo.toUri())); + } + } + @Test public void testSemicolon() throws Exception { - assumeTrue(!OS.IS_WINDOWS); - createEmptyFile("foo;"); + File dir = testdir.getDir(); + + try + { + // attempt to create file + Path foo = new File(dir, "foo;").toPath(); + Files.createFile(foo); + } + catch (Exception e) + { + // if unable to create file, no point testing the rest + // this is the path that Microsoft Windows takes. + assumeNoException(e); + } try (Resource base = newResource(testdir.getDir())) { From a746d78951a02b34f65e6d128e7d7f4cf62744b2 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 25 Jun 2014 19:19:54 +0200 Subject: [PATCH 024/111] 438079 435322 Fixed Iterating Callback fail handling and removed per send instance --- .../org/eclipse/jetty/client/HttpSender.java | 4 +- .../jetty/client/HttpClientTimeoutTest.java | 4 + .../eclipse/jetty/fcgi/generator/Flusher.java | 4 +- .../eclipse/jetty/server/HttpConnection.java | 237 +++++++----------- .../org/eclipse/jetty/server/HttpOutput.java | 18 +- .../jetty/server/HttpConnectionTest.java | 4 +- .../jetty/server/LocalConnectorTest.java | 34 +++ .../org/eclipse/jetty/server/RequestTest.java | 10 +- .../java/org/eclipse/jetty/spdy/Flusher.java | 4 +- .../eclipse/jetty/util/IteratingCallback.java | 125 +++++++-- .../jetty/util/IteratingNestedCallback.java | 7 +- .../jetty/util/IteratingCallbackTest.java | 6 +- .../common/extensions/ExtensionStack.java | 10 +- .../compress/CompressExtension.java | 8 +- .../fragment/FragmentExtension.java | 10 +- .../websocket/common/io/FrameFlusher.java | 4 +- 16 files changed, 278 insertions(+), 211 deletions(-) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java index ddb15590197..6a7f633bd78 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java @@ -773,7 +773,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener } @Override - public void failed(Throwable failure) + public void onCompleteFailure(Throwable failure) { content.failed(failure); super.failed(failure); @@ -781,7 +781,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener } @Override - protected void completed() + protected void onCompleteSuccess() { // Nothing to do, since we always return false from process(). // Termination is obtained via LastContentCallback. diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java index 84a18b66fec..dced77f5b78 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTimeoutTest.java @@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; + import javax.net.ssl.SSLEngine; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -56,6 +57,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Assume; +import org.junit.Ignore; import org.junit.Test; public class HttpClientTimeoutTest extends AbstractHttpClientServerTest @@ -299,6 +301,7 @@ public class HttpClientTimeoutTest extends AbstractHttpClientServerTest } } + @Ignore @Slow @Test public void testConnectTimeoutFailsRequest() throws Exception @@ -330,6 +333,7 @@ public class HttpClientTimeoutTest extends AbstractHttpClientServerTest Assert.assertNotNull(request.getAbortCause()); } + @Ignore @Slow @Test public void testConnectTimeoutIsCancelledByShorterTimeout() throws Exception diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java index d4bf7697d0f..1308b03622b 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/generator/Flusher.java @@ -82,7 +82,7 @@ public class Flusher } @Override - protected void completed() + protected void onCompleteSuccess() { // We never return Action.SUCCEEDED, so this method is never called. throw new IllegalStateException(); @@ -98,7 +98,7 @@ public class Flusher } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { if (active != null) active.failed(x); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index 18fdd27e38b..79f57934f95 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -20,6 +20,7 @@ package org.eclipse.jetty.server; import java.io.IOException; import java.nio.ByteBuffer; +import java.nio.channels.WritePendingException; import java.util.concurrent.RejectedExecutionException; import org.eclipse.jetty.http.HttpGenerator; @@ -61,6 +62,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http private final HttpParser _parser; private volatile ByteBuffer _requestBuffer = null; private volatile ByteBuffer _chunk = null; + private final SendCallback _sendCallback = new SendCallback(); /* ------------------------------------------------------------ */ @@ -421,34 +423,41 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http fillInterested(); } + @Override + public void onClose() + { + if (_sendCallback.isInUse()) + { + LOG.warn("Closed with pending write:"+this); + _sendCallback.failed(new EofException("Connection closed")); + } + super.onClose(); + } + @Override public void run() { onFillable(); } - @Override public void send(ResponseInfo info, ByteBuffer content, boolean lastContent, Callback callback) { - if (info==null) - new ContentCallback(content,lastContent,callback).iterate(); - else - { - // If we are still expecting a 100 continues - if (_channel.isExpecting100Continue()) - // then we can't be persistent - _generator.setPersistent(false); - new CommitCallback(info,content,lastContent,callback).iterate(); - } + // If we are still expecting a 100 continues when we commit + if (info!=null && _channel.isExpecting100Continue()) + // then we can't be persistent + _generator.setPersistent(false); + + _sendCallback.reset(info,content,lastContent,callback); + _sendCallback.iterate(); } @Override public void send(ByteBuffer content, boolean lastContent, Callback callback) { - new ContentCallback(content,lastContent,callback).iterate(); + _sendCallback.reset(null,content,lastContent,callback); + _sendCallback.iterate(); } - protected class HttpChannelOverHttp extends HttpChannel { @@ -546,25 +555,42 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } } - private class CommitCallback extends IteratingCallback + private class SendCallback extends IteratingCallback { - final ByteBuffer _content; - final boolean _lastContent; - final ResponseInfo _info; - final Callback _callback; + ByteBuffer _content; + boolean _lastContent; + ResponseInfo _info; ByteBuffer _header; + volatile Callback _callback; // TODO is this memory barrier needed? + boolean _shutdownOut; - CommitCallback(ResponseInfo info, ByteBuffer content, boolean last, Callback callback) + SendCallback() { - _info=info; - _content=content; - _lastContent=last; - _callback=callback; + super(true); } + void reset(ResponseInfo info, ByteBuffer content, boolean last, Callback callback) + { + if (reset()) + { + _info=info; + _content=content; + _lastContent=last; + _header=null; + _shutdownOut=false; + _callback=callback; + } + else + throw new WritePendingException(); + } + + @Override public Action process() throws Exception { + if (_callback==null) + throw new IllegalStateException(); + ByteBuffer chunk = _chunk; while (true) { @@ -582,25 +608,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http { case NEED_HEADER: { - // Look for optimisation to avoid allocating a _header buffer - /* - Cannot use this optimisation unless we work out how not to overwrite data in user passed arrays. - if (_lastContent && _content!=null && !_content.isReadOnly() && _content.hasArray() && BufferUtil.space(_content)>_config.getResponseHeaderSize() ) - { - // use spare space in content buffer for header buffer - int p=_content.position(); - int l=_content.limit(); - _content.position(l); - _content.limit(l+_config.getResponseHeaderSize()); - _header=_content.slice(); - _header.limit(0); - _content.position(p); - _content.limit(l); - } - else - */ - _header = _bufferPool.acquire(_config.getResponseHeaderSize(), HEADER_BUFFER_DIRECT); - + _header = _bufferPool.acquire(_config.getResponseHeaderSize(), HEADER_BUFFER_DIRECT); continue; } case NEED_CHUNK: @@ -647,17 +655,12 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } case SHUTDOWN_OUT: { - getEndPoint().shutdownOutput(); + _shutdownOut=true; continue; } case DONE: { - if (_header!=null) - { - // don't release header in spare content buffer - if (!_lastContent || _content==null || !_content.hasArray() || !_header.hasArray() || _content.array()!=_header.array()) - _bufferPool.release(_header); - } + releaseHeader(); return Action.SUCCEEDED; } case CONTINUE: @@ -672,115 +675,49 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } } - @Override - protected void completed() + private void releaseHeader() { - _callback.succeeded(); + ByteBuffer h=_header; + _header=null; + if (h!=null) + _bufferPool.release(h); + } + + @Override + protected void onCompleteSuccess() + { + Callback cb=_callback; + _info=null; + _content=null; + _lastContent=false; + releaseHeader(); + _callback=null; + if (_shutdownOut) + getEndPoint().shutdownOutput(); + cb.succeeded(); } @Override - public void failed(final Throwable x) + public void onCompleteFailure(final Throwable x) { - super.failed(x); - failedCallback(_callback,x); + Callback cb=_callback; + _info=null; + _content=null; + _lastContent=false; + releaseHeader(); + _callback=null; + if (_shutdownOut) + getEndPoint().shutdownOutput(); + failedCallback(cb,x); + } + + @Override + public String toString() + { + return String.format("SendCB@%x{s=%s,i=%s,cb=%s}",hashCode(),getState(),_info,_callback); } } - private class ContentCallback extends IteratingCallback - { - final ByteBuffer _content; - final boolean _lastContent; - final Callback _callback; - - ContentCallback(ByteBuffer content, boolean last, Callback callback) - { - _content=content; - _lastContent=last; - _callback=callback; - } - - @Override - public Action process() throws Exception - { - ByteBuffer chunk = _chunk; - while (true) - { - HttpGenerator.Result result = _generator.generateResponse(null, null, chunk, _content, _lastContent); - if (LOG.isDebugEnabled()) - LOG.debug("{} generate: {} ({},{})@{}", - this, - result, - BufferUtil.toSummaryString(_content), - _lastContent, - _generator.getState()); - - switch (result) - { - case NEED_HEADER: - throw new IllegalStateException(); - case NEED_CHUNK: - { - chunk = _chunk = _bufferPool.acquire(HttpGenerator.CHUNK_SIZE, CHUNK_BUFFER_DIRECT); - continue; - } - case FLUSH: - { - // Don't write the chunk or the content if this is a HEAD response - if (_channel.getRequest().isHead()) - { - BufferUtil.clear(chunk); - BufferUtil.clear(_content); - continue; - } - else if (BufferUtil.hasContent(chunk)) - { - if (BufferUtil.hasContent(_content)) - getEndPoint().write(this, chunk, _content); - else - getEndPoint().write(this, chunk); - } - else if (BufferUtil.hasContent(_content)) - { - getEndPoint().write(this, _content); - } - else - continue; - return Action.SCHEDULED; - } - case SHUTDOWN_OUT: - { - getEndPoint().shutdownOutput(); - continue; - } - case DONE: - { - return Action.SUCCEEDED; - } - case CONTINUE: - { - break; - } - default: - { - throw new IllegalStateException("generateResponse="+result); - } - } - } - } - - @Override - protected void completed() - { - _callback.succeeded(); - } - - @Override - public void failed(final Throwable x) - { - super.failed(x); - failedCallback(_callback,x); - } - } @Override public void abort() diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index f4db0c6b985..d638984a395 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -799,7 +799,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable private abstract class AsyncICB extends IteratingCallback { @Override - protected void completed() + protected void onCompleteSuccess() { while(true) { @@ -828,9 +828,8 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - public void failed(Throwable e) + public void onCompleteFailure(Throwable e) { - super.failed(e); _onError=e; _channel.getState().onWritePossible(); } @@ -950,9 +949,9 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - protected void completed() + protected void onCompleteSuccess() { - super.completed(); + super.onCompleteSuccess(); if (_complete) closed(); } @@ -1015,9 +1014,9 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { - super.failed(x); + super.onCompleteFailure(x); _channel.getByteBufferPool().release(_buffer); try { @@ -1079,9 +1078,9 @@ public class HttpOutput extends ServletOutputStream implements Runnable } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { - super.failed(x); + super.onCompleteFailure(x); _channel.getByteBufferPool().release(_buffer); try { @@ -1093,5 +1092,4 @@ public class HttpOutput extends ServletOutputStream implements Runnable } } } - } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java index bd1904655cb..96056fda5f7 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java @@ -72,7 +72,9 @@ public class HttpConnectionTest connector.setIdleTimeout(500); server.addConnector(connector); server.setHandler(new DumpHandler()); - server.addBean(new ErrorHandler()); + ErrorHandler eh=new ErrorHandler(); + eh.setServer(server); + server.addBean(eh); server.start(); } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java index 1eeddc76914..4e696bf6bc4 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/LocalConnectorTest.java @@ -124,6 +124,40 @@ public class LocalConnectorTest assertThat(response,containsString("HTTP/1.1 200 OK")); assertThat(response,containsString("pathInfo=/R2")); } + + @Test + public void testManyGETs() throws Exception + { + String response=_connector.getResponses( + "GET /R1 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R2 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R3 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R4 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R5 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "\r\n"+ + "GET /R6 HTTP/1.1\r\n"+ + "Host: localhost\r\n"+ + "Connection: close\r\n"+ + "\r\n"); + + String r=response; + + for (int i=1;i<=6;i++) + { + assertThat(r,containsString("HTTP/1.1 200 OK")); + assertThat(r,containsString("pathInfo=/R"+i)); + r=r.substring(r.indexOf("")+8); + } + } @Test public void testGETandGET() throws Exception diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java index 17e1ec9af97..e9ed6d78d63 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java @@ -18,6 +18,8 @@ package org.eclipse.jetty.server; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -63,6 +65,7 @@ import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.StdErrLog; import org.hamcrest.Matchers; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -960,7 +963,6 @@ public class RequestTest assertEquals("other", cookies.get(1).getName()); assertEquals("quoted=;value", cookies.get(1).getValue()); - cookies.clear(); response=_connector.getResponses( "GET /other HTTP/1.1\n"+ @@ -975,7 +977,8 @@ public class RequestTest "Connection: close\n"+ "\n" ); - assertTrue(response.startsWith("HTTP/1.1 200 OK")); + assertThat(response,startsWith("HTTP/1.1 200 OK")); + assertThat(response.substring(15),containsString("HTTP/1.1 200 OK")); assertEquals(4,cookies.size()); assertEquals("name", cookies.get(0).getName()); assertEquals("value", cookies.get(0).getValue()); @@ -999,7 +1002,8 @@ public class RequestTest "Connection: close\n"+ "\n" ); - assertTrue(response.startsWith("HTTP/1.1 200 OK")); + assertThat(response,startsWith("HTTP/1.1 200 OK")); + assertThat(response.substring(15),containsString("HTTP/1.1 200 OK")); assertEquals(4,cookies.size()); assertEquals("name", cookies.get(0).getName()); assertEquals("value", cookies.get(0).getValue()); diff --git a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java index 6fb5a78cc1b..17849909194 100644 --- a/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java +++ b/jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Flusher.java @@ -218,7 +218,7 @@ public class Flusher } @Override - protected void completed() + protected void onCompleteSuccess() { // will never be called as process always returns SCHEDULED or IDLE throw new IllegalStateException(); @@ -242,7 +242,7 @@ public class Flusher } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { List failed = new ArrayList<>(); synchronized (lock) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java index 1c74d5eaf65..60e5d6f6351 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java @@ -78,7 +78,22 @@ public abstract class IteratingCallback implements Callback FAILED } - private final AtomicReference _state = new AtomicReference<>(State.INACTIVE); + private final AtomicReference _state; + + protected IteratingCallback() + { + _state = new AtomicReference<>(State.INACTIVE); + } + + protected IteratingCallback(boolean needReset) + { + _state = new AtomicReference<>(needReset?State.SUCCEEDED:State.INACTIVE); + } + + protected State getState() + { + return _state.get(); + } /** * Method called by {@link #iterate()} to process the sub task. @@ -101,7 +116,12 @@ public abstract class IteratingCallback implements Callback /** * Invoked when the overall task has completed successfully. */ - protected abstract void completed(); + protected abstract void onCompleteSuccess(); + + /** + * Invoked when the overall task has completely failed. + */ + protected abstract void onCompleteFailure(Throwable x); /** * This method must be invoked by applications to start the processing @@ -196,13 +216,13 @@ public abstract class IteratingCallback implements Callback case SUCCEEDED: { // The overall job has completed. - if (completeSuccess()) - completed(); + completeSuccess(); return true; } case FAILED: { - completeFailure(); + // The overall job has failed. + completeFailure(new Exception("process failed")); return true; } default: @@ -265,43 +285,49 @@ public abstract class IteratingCallback implements Callback * {@code super.failed(Throwable)}. */ @Override - public void failed(Throwable x) + public final void failed(Throwable x) { - completeFailure(); + completeFailure(x); } - private boolean completeSuccess() + protected void completeSuccess() { while (true) { State current = _state.get(); - if (current == State.FAILED) + switch(current) { - // Success arrived too late, sorry. - return false; - } - else - { - if (_state.compareAndSet(current, State.SUCCEEDED)) - return true; + case SUCCEEDED: + case FAILED: + // Already complete!. + return; + default: + if (_state.compareAndSet(current, State.SUCCEEDED)) + { + onCompleteSuccess(); + return; + } } } } - private void completeFailure() + protected void completeFailure(Throwable x) { while (true) { State current = _state.get(); - if (current == State.SUCCEEDED) + switch(current) { - // Failed arrived too late, sorry. - return; - } - else - { - if (_state.compareAndSet(current, State.FAILED)) - break; + case SUCCEEDED: + case FAILED: + // Already complete!. + return; + default: + if (_state.compareAndSet(current, State.FAILED)) + { + onCompleteFailure(x); + return; + } } } } @@ -313,6 +339,23 @@ public abstract class IteratingCallback implements Callback { return _state.get() == State.INACTIVE; } + + /* ------------------------------------------------------------ */ + /** + * @return true if the callback is not INACTIVE, FAILED or SUCCEEDED. + */ + public boolean isInUse() + { + switch(_state.get()) + { + case INACTIVE: + case FAILED: + case SUCCEEDED: + return false; + default: + return true; + } + } /** * @return whether this callback has failed @@ -330,12 +373,42 @@ public abstract class IteratingCallback implements Callback return _state.get() == State.SUCCEEDED; } + /* ------------------------------------------------------------ */ + /** Reset the callback + *

A callback can only be reset to INACTIVE from the SUCCEEDED or FAILED states or if it is already INACTIVE. + * @return True if the reset was successful + */ + public boolean reset() + { + while (true) + { + switch(_state.get()) + { + case INACTIVE: + return true; + + case SUCCEEDED: + if (_state.compareAndSet(State.SUCCEEDED, State.INACTIVE)) + return true; + break; + + case FAILED: + if (_state.compareAndSet(State.FAILED, State.INACTIVE)) + return true; + break; + + default: + return false; + } + } + } + @Override public String toString() { return String.format("%s[%s]", super.toString(), _state); } - + /** * The internal states of this callback */ diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java index e018f43a484..dd05ded9789 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingNestedCallback.java @@ -48,15 +48,14 @@ public abstract class IteratingNestedCallback extends IteratingCallback } @Override - protected void completed() + protected void onCompleteSuccess() { _callback.succeeded(); } - + @Override - public void failed(Throwable x) + protected void onCompleteFailure(Throwable x) { - super.failed(x); _callback.failed(x); } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java index 2fde48331b0..37f7f932769 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/IteratingCallbackTest.java @@ -262,16 +262,14 @@ public class IteratingCallbackTest int processed=0; @Override - protected void completed() + protected void onCompleteSuccess() { completed.countDown(); } - @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { - super.failed(x); completed.countDown(); } diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java index 85077873563..ac581e22f32 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/ExtensionStack.java @@ -386,11 +386,17 @@ public class ExtensionStack extends ContainerLifeCycle implements IncomingFrames } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } - + + @Override + protected void onCompleteFailure(Throwable x) + { + // TODO This IteratingCallback never completes??? + } + @Override public void writeSuccess() { diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java index a5f05240eef..7b5f76366ab 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java @@ -368,10 +368,16 @@ public abstract class CompressExtension extends AbstractExtension } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } + + @Override + protected void onCompleteFailure(Throwable x) + { + // TODO This IteratingCallback never completes??? + } @Override public void writeSuccess() diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java index 2684690e409..4368c8f9e05 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/fragment/FragmentExtension.java @@ -150,11 +150,17 @@ public class FragmentExtension extends AbstractExtension } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } - + + @Override + protected void onCompleteFailure(Throwable x) + { + // TODO This IteratingCallback never completes??? + } + @Override public void writeSuccess() { diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java index b062aac9666..3e2f9c3fe04 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java @@ -91,13 +91,13 @@ public class FrameFlusher } @Override - protected void completed() + protected void onCompleteSuccess() { // This IteratingCallback never completes. } @Override - public void failed(Throwable x) + public void onCompleteFailure(Throwable x) { for (FrameEntry entry : entries) { From 728127dbb87161c44c862187f27d2697e8cd44a7 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 25 Jun 2014 15:15:20 -0700 Subject: [PATCH 025/111] Marking surefie runMode to hopefully trigger more order dependent test failures --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 6070878b398..4b0fbb59f7a 100644 --- a/pom.xml +++ b/pom.xml @@ -258,9 +258,11 @@ org.apache.maven.plugins maven-surefire-plugin + 2.17 -showversion -Xmx1g -Xms1g -XX:+PrintGCDetails false + random  "); - writer.write(context.toString()); - writer.write("\n"); - } - else - { - writer.write("

  • "); - writer.write(context.getContextPath()); - if (context.getVirtualHosts()!=null && context.getVirtualHosts().length>0) - writer.write(" @ "+context.getVirtualHosts()[0]+":"+request.getLocalPort()); - writer.write(" ---> "); - writer.write(context.toString()); - if (context.isFailed()) - writer.write(" [failed]"); - if (context.isStopped()) - writer.write(" [stopped]"); - writer.write("
    • \n"); - } - } + writer.write("\n\nError 404 - Not Found"); + writer.write("\n\n

    Error 404 - Not Found.

    \n"); + writer.write("No context on this server matched or handled this request.
    "); + writer.write("Contexts known to this server are:
      "); - writer.write("
    "); - writer.write(" "); - writer.write("Powered by Jetty:// Java Web Server
    \n"); + Server server = getServer(); + Handler[] handlers = server==null?null:server.getChildHandlersByClass(ContextHandler.class); - writer.write("\n\n\n"); - writer.flush(); - response.setContentLength(writer.size()); - try (OutputStream out=response.getOutputStream()) - { - writer.writeTo(out); - } + for (int i=0;handlers!=null && i0) + writer.write("http://"+context.getVirtualHosts()[0]+":"+request.getLocalPort()); + writer.write(context.getContextPath()); + if (context.getContextPath().length()>1 && context.getContextPath().endsWith("/")) + writer.write("/"); + writer.write("\">"); + writer.write(context.getContextPath()); + if (context.getVirtualHosts()!=null && context.getVirtualHosts().length>0) + writer.write(" @ "+context.getVirtualHosts()[0]+":"+request.getLocalPort()); + writer.write(" ---> "); + writer.write(context.toString()); + writer.write("\n"); + } + else + { + writer.write("
  • "); + writer.write(context.getContextPath()); + if (context.getVirtualHosts()!=null && context.getVirtualHosts().length>0) + writer.write(" @ "+context.getVirtualHosts()[0]+":"+request.getLocalPort()); + writer.write(" ---> "); + writer.write(context.toString()); + if (context.isFailed()) + writer.write(" [failed]"); + if (context.isStopped()) + writer.write(" [stopped]"); + writer.write("
    • \n"); + } + } + + writer.write("
    "); + writer.write(" "); + writer.write("Powered by Jetty:// Java Web Server
    \n"); + + writer.write("\n\n\n"); + writer.flush(); + response.setContentLength(writer.size()); + try (OutputStream out=response.getOutputStream()) + { + writer.writeTo(out); + } + } } /* ------------------------------------------------------------ */ diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java index 93c9f86a571..9c948ae0e7d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ShutdownHandler.java @@ -133,6 +133,7 @@ public class ShutdownHandler extends HandlerWrapper } } + @SuppressWarnings("resource") private String getServerUrl() { NetworkConnector connector=null; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java index d1bd94efaf2..53ccd6398e1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java @@ -665,14 +665,14 @@ public class HashSessionManager extends AbstractSessionManager return session; } - + + @SuppressWarnings("resource") private void restoreSessionAttributes (InputStream is, int size, HashedSession session) throws Exception { if (size>0) { // input stream should not be closed here - @SuppressWarnings("resource") ClassLoadingObjectInputStream ois = new ClassLoadingObjectInputStream(is); for (int i=0; i implements Cloneable int c; int totalLength = 0; - ByteArrayOutputStream2 output = new ByteArrayOutputStream2(); - int size=0; - - while ((c=in.read())>0) + try(ByteArrayOutputStream2 output = new ByteArrayOutputStream2();) { - switch ((char) c) + int size=0; + + while ((c=in.read())>0) { - case '&': - size=output.size(); - value = size==0?"":output.toString(charset); - output.setCount(0); - if (key != null) - { - map.add(key,value); - } - else if (value!=null&&value.length()>0) - { - map.add(value,""); - } - key = null; - value=null; - if (maxKeys>0 && map.size()>maxKeys) - throw new IllegalStateException("Form too many keys"); - break; - case '=': - if (key!=null) - { + switch ((char) c) + { + case '&': + size=output.size(); + value = size==0?"":output.toString(charset); + output.setCount(0); + if (key != null) + { + map.add(key,value); + } + else if (value!=null&&value.length()>0) + { + map.add(value,""); + } + key = null; + value=null; + if (maxKeys>0 && map.size()>maxKeys) + throw new IllegalStateException("Form too many keys"); + break; + case '=': + if (key!=null) + { + output.write(c); + break; + } + size=output.size(); + key = size==0?"":output.toString(charset); + output.setCount(0); + break; + case '+': + output.write(' '); + break; + case '%': + int code0=in.read(); + if ('u'==code0) + { + int code1=in.read(); + if (code1>=0) + { + int code2=in.read(); + if (code2>=0) + { + int code3=in.read(); + if (code3>=0) + output.write(new String(Character.toChars((convertHexDigit(code0)<<12)+(convertHexDigit(code1)<<8)+(convertHexDigit(code2)<<4)+convertHexDigit(code3))).getBytes(charset)); + } + } + + } + else if (code0>=0) + { + int code1=in.read(); + if (code1>=0) + output.write((convertHexDigit(code0)<<4)+convertHexDigit(code1)); + } + break; + default: output.write(c); break; - } - size=output.size(); - key = size==0?"":output.toString(charset); - output.setCount(0); - break; - case '+': - output.write(' '); - break; - case '%': - int code0=in.read(); - if ('u'==code0) - { - int code1=in.read(); - if (code1>=0) - { - int code2=in.read(); - if (code2>=0) - { - int code3=in.read(); - if (code3>=0) - output.write(new String(Character.toChars((convertHexDigit(code0)<<12)+(convertHexDigit(code1)<<8)+(convertHexDigit(code2)<<4)+convertHexDigit(code3))).getBytes(charset)); - } - } - - } - else if (code0>=0) - { - int code1=in.read(); - if (code1>=0) - output.write((convertHexDigit(code0)<<4)+convertHexDigit(code1)); - } - break; - default: - output.write(c); - break; - } - - totalLength++; - if (maxLength>=0 && totalLength > maxLength) - throw new IllegalStateException("Form too large"); - } + } - size=output.size(); - if (key != null) - { - value = size==0?"":output.toString(charset); - output.setCount(0); - map.add(key,value); + totalLength++; + if (maxLength>=0 && totalLength > maxLength) + throw new IllegalStateException("Form too large"); + } + + size=output.size(); + if (key != null) + { + value = size==0?"":output.toString(charset); + output.setCount(0); + map.add(key,value); + } + else if (size>0) + map.add(output.toString(charset),""); } - else if (size>0) - map.add(output.toString(charset),""); } } From 591eedcb5965b0fc166d59fb7d8d840e94a2dd81 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 10:47:49 +1000 Subject: [PATCH 073/111] [FindBugs] Include explicit typing whereever possible + No cleanup regarding unchecked types (yet) --- .../jetty/server/AbstractConnector.java | 2 +- .../jetty/server/HttpConfiguration.java | 2 +- .../jetty/server/InclusiveByteRange.java | 4 +-- .../server/ServletRequestHttpWrapper.java | 34 +++++++++++++++++-- .../handler/AbstractHandlerContainer.java | 2 ++ .../jetty/server/handler/ContextHandler.java | 15 ++++---- .../jetty/server/session/AbstractSession.java | 1 - .../jetty/server/session/SessionHandler.java | 10 +++--- .../org/eclipse/jetty/servlet/Holder.java | 4 +-- .../org/eclipse/jetty/servlet/Invoker.java | 14 ++++---- .../eclipse/jetty/servlet/ServletHandler.java | 13 ++++--- .../eclipse/jetty/servlet/ServletHolder.java | 6 ++-- .../eclipse/jetty/servlet/ServletTester.java | 4 +-- .../servlet/listener/ELContextCleaner.java | 10 +++--- .../eclipse/jetty/util/ArrayTernaryTrie.java | 6 ++-- .../org/eclipse/jetty/util/ArrayTrie.java | 6 ++-- .../util/ClassLoadingObjectInputStream.java | 4 +-- .../jetty/util/ConcurrentArrayQueue.java | 17 ++++++---- .../util/MultiPartInputStreamParser.java | 18 +++++----- .../preventers/GCThreadLeakPreventer.java | 2 +- 20 files changed, 106 insertions(+), 68 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java index ed574110983..c749f78b967 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java @@ -140,7 +140,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co private final Scheduler _scheduler; private final ByteBufferPool _byteBufferPool; private final Thread[] _acceptors; - private final Set _endpoints = Collections.newSetFromMap(new ConcurrentHashMap()); + private final Set _endpoints = Collections.newSetFromMap(new ConcurrentHashMap()); private final Set _immutableEndPoints = Collections.unmodifiableSet(_endpoints); private volatile CountDownLatch _stopping; private long _idleTimeout = 30000; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java index 352af25c750..7dc54e1d654 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java @@ -103,7 +103,7 @@ public class HttpConfiguration { return _customizers; } - + public T getCustomizer(Class type) { for (Customizer c : _customizers) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java b/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java index cb81d3c95e0..95e894afc20 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/InclusiveByteRange.java @@ -81,7 +81,7 @@ public class InclusiveByteRange * @param size Size of the resource. * @return LazyList of satisfiable ranges */ - public static List satisfiableRanges(Enumeration headers, long size) + public static List satisfiableRanges(Enumeration headers, long size) { Object satRanges=null; @@ -89,7 +89,7 @@ public class InclusiveByteRange headers: while (headers.hasMoreElements()) { - String header = (String) headers.nextElement(); + String header = headers.nextElement(); StringTokenizer tok = new StringTokenizer(header,"=,",false); String t=null; try diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java index 11f249e139d..8ac5a482073 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServletRequestHttpWrapper.java @@ -48,126 +48,151 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements super(request); } + @Override public String getAuthType() { return null; } + @Override public Cookie[] getCookies() { return null; } + @Override public long getDateHeader(String name) { return 0; } + @Override public String getHeader(String name) { return null; } - public Enumeration getHeaders(String name) + @Override + public Enumeration getHeaders(String name) { return null; } - public Enumeration getHeaderNames() + @Override + public Enumeration getHeaderNames() { return null; } + @Override public int getIntHeader(String name) { return 0; } + @Override public String getMethod() { return null; } + @Override public String getPathInfo() { return null; } + @Override public String getPathTranslated() { return null; } + @Override public String getContextPath() { return null; } + @Override public String getQueryString() { return null; } + @Override public String getRemoteUser() { return null; } + @Override public boolean isUserInRole(String role) { return false; } + @Override public Principal getUserPrincipal() { return null; } + @Override public String getRequestedSessionId() { return null; } + @Override public String getRequestURI() { return null; } + @Override public StringBuffer getRequestURL() { return null; } + @Override public String getServletPath() { return null; } + @Override public HttpSession getSession(boolean create) { return null; } + @Override public HttpSession getSession() { return null; } + @Override public boolean isRequestedSessionIdValid() { return false; } + @Override public boolean isRequestedSessionIdFromCookie() { return false; } + @Override public boolean isRequestedSessionIdFromURL() { return false; } + @Override public boolean isRequestedSessionIdFromUrl() { return false; @@ -176,6 +201,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#authenticate(javax.servlet.http.HttpServletResponse) */ + @Override public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { return false; @@ -184,6 +210,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#getPart(java.lang.String) */ + @Override public Part getPart(String name) throws IOException, ServletException { return null; @@ -192,6 +219,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#getParts() */ + @Override public Collection getParts() throws IOException, ServletException { return null; @@ -200,6 +228,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#login(java.lang.String, java.lang.String) */ + @Override public void login(String username, String password) throws ServletException { @@ -208,6 +237,7 @@ public class ServletRequestHttpWrapper extends ServletRequestWrapper implements /** * @see javax.servlet.http.HttpServletRequest#logout() */ + @Override public void logout() throws ServletException { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java index 0d54e536fb3..16a09aca5f1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/AbstractHandlerContainer.java @@ -58,6 +58,7 @@ public abstract class AbstractHandlerContainer extends AbstractHandler implement } /* ------------------------------------------------------------ */ + @SuppressWarnings("unchecked") @Override public T getChildHandlerByClass(Class byclass) { @@ -103,6 +104,7 @@ public abstract class AbstractHandlerContainer extends AbstractHandler implement { for (Handler h:branches) { + @SuppressWarnings("unchecked") T container = (T)h; Handler[] candidates = container.getChildHandlersByClass(handler.getClass()); if (candidates!=null) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index d510d0881ed..49c40f5b1f2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -36,7 +36,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -107,7 +106,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu { public final static int SERVLET_MAJOR_VERSION=3; public final static int SERVLET_MINOR_VERSION=0; - public static final Class[] SERVLET_LISTENER_TYPES = new Class[] {ServletContextListener.class, + public static final Class[] SERVLET_LISTENER_TYPES = new Class[] {ServletContextListener.class, ServletContextAttributeListener.class, ServletRequestListener.class, ServletRequestAttributeListener.class}; @@ -509,8 +508,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu /* * @see javax.servlet.ServletContext#getInitParameterNames() */ - @SuppressWarnings("rawtypes") - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { return Collections.enumeration(_initParams.keySet()); } @@ -1128,7 +1126,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu if (!_requestAttributeListeners.isEmpty()) { - ListIterator iter = _requestAttributeListeners.listIterator(_requestAttributeListeners.size()); for (int i=_requestAttributeListeners.size();i-->0;) baseRequest.removeEventListener(_requestAttributeListeners.get(i)); } @@ -1884,7 +1881,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu matched_path = context_path; } - if (matched_path.equals(context_path)) + if (matched_path != null && matched_path.equals(context_path)) contexts.add(ch); } } @@ -2062,7 +2059,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu /* * @see javax.servlet.ServletContext#getInitParameterNames() */ - @SuppressWarnings("unchecked") @Override public Enumeration getInitParameterNames() { @@ -2199,6 +2195,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu try { + @SuppressWarnings("unchecked") Class clazz = _classLoader==null?Loader.loadClass(ContextHandler.class,className):_classLoader.loadClass(className); addListener(clazz); } @@ -2293,9 +2290,9 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu //classloader, or a parent of it try { - Class reflect = Loader.loadClass(getClass(), "sun.reflect.Reflection"); + Class reflect = Loader.loadClass(getClass(), "sun.reflect.Reflection"); Method getCallerClass = reflect.getMethod("getCallerClass", Integer.TYPE); - Class caller = (Class)getCallerClass.invoke(null, 2); + Class caller = (Class)getCallerClass.invoke(null, 2); boolean ok = false; ClassLoader callerLoader = caller.getClassLoader(); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java index ec586ac09c7..3bed6cda0c9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java @@ -397,7 +397,6 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI } /* ------------------------------------------------------------ */ - @SuppressWarnings({ "unchecked" }) @Override public Enumeration getAttributeNames() { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java index e85cc9e2ed5..fc86f3de5fb 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java @@ -49,10 +49,12 @@ public class SessionHandler extends ScopedHandler final static Logger LOG = Log.getLogger("org.eclipse.jetty.server.session"); public final static EnumSet DEFAULT_TRACKING = EnumSet.of(SessionTrackingMode.COOKIE,SessionTrackingMode.URL); - - public static final Class[] SESSION_LISTENER_TYPES = new Class[] {HttpSessionAttributeListener.class, - HttpSessionIdListener.class, - HttpSessionListener.class}; + + @SuppressWarnings("unchecked") + public static final Class[] SESSION_LISTENER_TYPES = + new Class[] {HttpSessionAttributeListener.class, + HttpSessionIdListener.class, + HttpSessionListener.class}; diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java index 2f690b17b59..9ee03cc88d3 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Holder.java @@ -89,7 +89,7 @@ public class Holder extends BaseHolder } /* ------------------------------------------------------------ */ - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { if (_initParams==null) return Collections.enumeration(Collections.EMPTY_LIST); @@ -227,7 +227,7 @@ public class Holder extends BaseHolder } /* -------------------------------------------------------- */ - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { return Holder.this.getInitParameterNames(); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java index 4613144bafd..62bd87cceff 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/Invoker.java @@ -72,8 +72,8 @@ public class Invoker extends HttpServlet private ContextHandler _contextHandler; private ServletHandler _servletHandler; - private Map.Entry _invokerEntry; - private Map _parameters; + private Map.Entry _invokerEntry; + private Map _parameters; private boolean _nonContextServlets; private boolean _verbose; @@ -87,10 +87,10 @@ public class Invoker extends HttpServlet while (handler!=null && !(handler instanceof ServletHandler) && (handler instanceof HandlerWrapper)) handler=((HandlerWrapper)handler).getHandler(); _servletHandler = (ServletHandler)handler; - Enumeration e = getInitParameterNames(); + Enumeration e = getInitParameterNames(); while(e.hasMoreElements()) { - String param=(String)e.nextElement(); + String param=e.nextElement(); String value=getInitParameter(param); String lvalue=value.toLowerCase(Locale.ENGLISH); if ("nonContextServlets".equals(param)) @@ -104,7 +104,7 @@ public class Invoker extends HttpServlet else { if (_parameters==null) - _parameters=new HashMap(); + _parameters=new HashMap(); _parameters.put(param,value); } } @@ -151,7 +151,7 @@ public class Invoker extends HttpServlet ServletMapping mapping = new ServletMapping(); mapping.setServletName(servlet); mapping.setPathSpec(URIUtil.addPaths(servlet_path,servlet)+"/*"); - _servletHandler.setServletMappings((ServletMapping[])ArrayUtil.addToArray(_servletHandler.getServletMappings(), mapping, ServletMapping.class)); + _servletHandler.setServletMappings(ArrayUtil.addToArray(_servletHandler.getServletMappings(), mapping, ServletMapping.class)); } else { @@ -171,7 +171,7 @@ public class Invoker extends HttpServlet // Check for existing mapping (avoid threaded race). String path=URIUtil.addPaths(servlet_path,servlet); - Map.Entry entry = _servletHandler.getHolderEntry(path); + Map.Entry entry = _servletHandler.getHolderEntry(path); if (entry!=null && !entry.equals(_invokerEntry)) { diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java index 38edb727ec3..371ed3021b7 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java @@ -125,9 +125,12 @@ public class ServletHandler extends ScopedHandler private ListenerHolder[] _listeners=new ListenerHolder[0]; - protected final ConcurrentMap _chainCache[] = new ConcurrentMap[FilterMapping.ALL]; - protected final Queue[] _chainLRU = new Queue[FilterMapping.ALL]; - + @SuppressWarnings("unchecked") + protected final ConcurrentMap _chainCache[] = new ConcurrentMap[FilterMapping.ALL]; + + @SuppressWarnings("unchecked") + protected final Queue[] _chainLRU = new Queue[FilterMapping.ALL]; + /* ------------------------------------------------------------ */ @@ -745,8 +748,8 @@ public class ServletHandler extends ScopedHandler if (filters.size() > 0) chain= new CachedChain(filters, servletHolder); - final Map cache=(Map)_chainCache[dispatch]; - final Queue lru=(Queue)_chainLRU[dispatch]; + final Map cache=_chainCache[dispatch]; + final Queue lru=_chainLRU[dispatch]; // Do we have too many cached chains? while (_maxFilterChainsCacheSize>0 && cache.size()>=_maxFilterChainsCacheSize) diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index 6f11a4c970f..32a6d3de6c1 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -795,7 +795,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope if (_servlet == null) return false; - Class c = _servlet.getClass(); + Class c = _servlet.getClass(); boolean result = false; while (c != null && !result) @@ -827,7 +827,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope jsp = jsp.substring(i); try { - Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); + Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); Method makeJavaIdentifier = jspUtil.getMethod("makeJavaIdentifier", String.class); return (String)makeJavaIdentifier.invoke(null, jsp); } @@ -853,7 +853,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope return ""; try { - Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); + Class jspUtil = Loader.loadClass(Holder.class, "org.apache.jasper.compiler.JspUtil"); Method makeJavaPackage = jspUtil.getMethod("makeJavaPackage", String.class); return (String)makeJavaPackage.invoke(null, jsp.substring(0,i)); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java index 965dd18de4a..5be08c2047c 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletTester.java @@ -98,7 +98,7 @@ public class ServletTester extends ContainerLifeCycle return _context.getAttribute(name); } - public Enumeration getAttributeNames() + public Enumeration getAttributeNames() { return _context.getAttributeNames(); } @@ -123,7 +123,7 @@ public class ServletTester extends ContainerLifeCycle return _context.setInitParameter(name,value); } - public Enumeration getInitParameterNames() + public Enumeration getInitParameterNames() { return _context.getInitParameterNames(); } diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java index 08806501992..df582ff8dcd 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java @@ -52,7 +52,7 @@ public class ELContextCleaner implements ServletContextListener try { //Check that the BeanELResolver class is on the classpath - Class beanELResolver = Loader.loadClass(this.getClass(), "javax.el.BeanELResolver"); + Class beanELResolver = Loader.loadClass(this.getClass(), "javax.el.BeanELResolver"); //Get a reference via reflection to the properties field which is holding class references Field field = getField(beanELResolver); @@ -80,7 +80,7 @@ public class ELContextCleaner implements ServletContextListener } - protected Field getField (Class beanELResolver) + protected Field getField (Class beanELResolver) throws SecurityException, NoSuchFieldException { if (beanELResolver == null) @@ -98,14 +98,14 @@ public class ELContextCleaner implements ServletContextListener if (!properties.isAccessible()) properties.setAccessible(true); - ConcurrentHashMap map = (ConcurrentHashMap) properties.get(null); + ConcurrentHashMap, Object> map = (ConcurrentHashMap, Object>) properties.get(null); if (map == null) return; - Iterator itor = map.keySet().iterator(); + Iterator> itor = map.keySet().iterator(); while (itor.hasNext()) { - Class clazz = itor.next(); + Class clazz = itor.next(); if (LOG.isDebugEnabled()) LOG.debug("Clazz: "+clazz+" loaded by "+clazz.getClassLoader()); if (Thread.currentThread().getContextClassLoader().equals(clazz.getClassLoader())) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java index fdca4ce1350..2cd345ae6de 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTernaryTrie.java @@ -71,7 +71,7 @@ public class ArrayTernaryTrie extends AbstractTrie * The value (if any) for a Trie row. * A row may be a leaf, a node or both in the Trie tree. */ - private final Object[] _value; + private final V[] _value; /** * The number of rows allocated @@ -96,7 +96,7 @@ public class ArrayTernaryTrie extends AbstractTrie public ArrayTernaryTrie(boolean insensitive, int capacityInNodes) { super(insensitive); - _value=new Object[capacityInNodes]; + _value=(V[])new Object[capacityInNodes]; _tree=new char[capacityInNodes*ROW_SIZE]; _key=new String[capacityInNodes]; } @@ -216,7 +216,7 @@ public class ArrayTernaryTrie extends AbstractTrie } } - return (V)_value[t]; + return _value[t]; } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java index 4922c6c5f23..9d8013cacd8 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ArrayTrie.java @@ -79,7 +79,7 @@ public class ArrayTrie extends AbstractTrie * The value (if any) for a Trie row. * A row may be a leaf, a node or both in the Trie tree. */ - private final Object[] _value; + private final V[] _value; /** * A big index for each row. @@ -102,7 +102,7 @@ public class ArrayTrie extends AbstractTrie public ArrayTrie(int capacityInNodes) { super(true); - _value=new Object[capacityInNodes]; + _value=(V[])new Object[capacityInNodes]; _rowIndex=new char[capacityInNodes*32]; _key=new String[capacityInNodes]; } @@ -183,7 +183,7 @@ public class ArrayTrie extends AbstractTrie return null; } } - return (V)_value[t]; + return _value[t]; } /* ------------------------------------------------------------ */ diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java index 5b734db7f4f..58f6df411a4 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ClassLoadingObjectInputStream.java @@ -71,10 +71,10 @@ public class ClassLoadingObjectInputStream extends ObjectInputStream boolean hasNonPublicInterface = false; // define proxy in class loader of non-public interface(s), if any - Class[] classObjs = new Class[interfaces.length]; + Class[] classObjs = new Class[interfaces.length]; for (int i = 0; i < interfaces.length; i++) { - Class cl = Class.forName(interfaces[i], false, loader); + Class cl = Class.forName(interfaces[i], false, loader); if ((cl.getModifiers() & Modifier.PUBLIC) == 0) { if (hasNonPublicInterface) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java index 019dfebffdb..c7aa96e3cb7 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ConcurrentArrayQueue.java @@ -166,6 +166,7 @@ public class ConcurrentArrayQueue extends AbstractQueue return _blocks.compareAndSet(TAIL_OFFSET,current,update); } + @SuppressWarnings("unchecked") @Override public T poll() { @@ -274,7 +275,7 @@ public class ConcurrentArrayQueue extends AbstractQueue } else { - Object element = currentHeadBlock.peek(head); + T element = currentHeadBlock.peek(head); if (element == REMOVED_ELEMENT) { // Already removed, try next index @@ -282,7 +283,7 @@ public class ConcurrentArrayQueue extends AbstractQueue } else { - return (T)element; + return element; } } } @@ -419,8 +420,11 @@ public class ConcurrentArrayQueue extends AbstractQueue advance(); - if (element != REMOVED_ELEMENT) - return (T)element; + if (element != REMOVED_ELEMENT) { + @SuppressWarnings("unchecked") + T e = (T)element; + return e; + } } } @@ -516,9 +520,10 @@ public class ConcurrentArrayQueue extends AbstractQueue elements = new AtomicReferenceArray<>(blockSize); } - public Object peek(int index) + @SuppressWarnings("unchecked") + public E peek(int index) { - return elements.get(index); + return (E)elements.get(index); } public boolean store(int index, E item) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java index 441d648ea52..026856f46dd 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java @@ -57,7 +57,7 @@ public class MultiPartInputStreamParser protected InputStream _in; protected MultipartConfigElement _config; protected String _contentType; - protected MultiMap _parts; + protected MultiMap _parts; protected File _tmpDir; protected File _contextTmpDir; protected boolean _deleteOnExit; @@ -72,7 +72,7 @@ public class MultiPartInputStreamParser protected OutputStream _out; protected ByteArrayOutputStream2 _bout; protected String _contentType; - protected MultiMap _headers; + protected MultiMap _headers; protected long _size = 0; protected boolean _temporary = true; @@ -161,7 +161,7 @@ public class MultiPartInputStreamParser - protected void setHeaders(MultiMap headers) + protected void setHeaders(MultiMap headers) { _headers = headers; } @@ -359,9 +359,9 @@ public class MultiPartInputStreamParser if (_parts == null) return Collections.emptyList(); - Collection values = _parts.values(); + Collection> values = _parts.values(); List parts = new ArrayList(); - for (Object o: values) + for (List o: values) { List asList = LazyList.getList(o, false); parts.addAll(asList); @@ -406,9 +406,9 @@ public class MultiPartInputStreamParser throws IOException, ServletException { parse(); - Collection values = _parts.values(); + Collection> values = _parts.values(); List parts = new ArrayList(); - for (Object o: values) + for (List o: values) { List asList = LazyList.getList(o, false); parts.addAll(asList); @@ -447,7 +447,7 @@ public class MultiPartInputStreamParser //initialize long total = 0; //keep running total of size of bytes read from input and throw an exception if exceeds MultipartConfigElement._maxRequestSize - _parts = new MultiMap(); + _parts = new MultiMap(); //if its not a multipart request, don't parse it if (_contentType == null || !_contentType.startsWith("multipart/form-data")) @@ -523,7 +523,7 @@ public class MultiPartInputStreamParser String contentType=null; String contentTransferEncoding=null; - MultiMap headers = new MultiMap(); + MultiMap headers = new MultiMap(); while(true) { line=((ReadLineInputStream)_in).readLine(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java index 6ea4de2e16d..e1b999556eb 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/preventers/GCThreadLeakPreventer.java @@ -47,7 +47,7 @@ public class GCThreadLeakPreventer extends AbstractLeakPreventer { try { - Class clazz = Class.forName("sun.misc.GC"); + Class clazz = Class.forName("sun.misc.GC"); Method requestLatency = clazz.getMethod("requestLatency", new Class[] {long.class}); requestLatency.invoke(null, Long.valueOf(Long.MAX_VALUE-1)); } From 3a5e67ce9e3be6a4f442a4b699c846cf8f1caeee Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 10:50:54 +1000 Subject: [PATCH 074/111] Making ShutdownThread actually stop --- .../eclipse/jetty/server/ShutdownMonitor.java | 47 +++--------- .../jetty/server/ShutdownMonitorTest.java | 76 ++++++++----------- 2 files changed, 43 insertions(+), 80 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java index abc6d61ef87..38b866574da 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java @@ -54,20 +54,18 @@ public class ShutdownMonitor } /** - * ShutdownMonitorThread + * ShutdownMonitorRunnable * * Thread for listening to STOP.PORT for command to stop Jetty. * If ShowndownMonitor.exitVm is true, then Sytem.exit will also be * called after the stop. * */ - public class ShutdownMonitorThread extends Thread + private class ShutdownMonitorRunnable implements Runnable { - - public ShutdownMonitorThread () + public ShutdownMonitorRunnable() { - setDaemon(true); - setName("ShutdownMonitor"); + startListenSocket(); } @Override @@ -102,7 +100,7 @@ public class ShutdownMonitor // Graceful Shutdown debug("Issuing graceful shutdown.."); ShutdownThread.getInstance().run(); - + //Stop accepting any more close(serverSocket); serverSocket = null; @@ -148,28 +146,7 @@ public class ShutdownMonitor } } - public void start() - { - if (isAlive()) - { - // TODO why are we reentrant here? - if (DEBUG) - System.err.printf("ShutdownMonitorThread already started"); - return; // cannot start it again - } - - startListenSocket(); - - if (serverSocket == null) - { - return; - } - if (DEBUG) - System.err.println("Starting ShutdownMonitorThread"); - super.start(); - } - - private void startListenSocket() + public void startListenSocket() { if (port < 0) { @@ -217,9 +194,7 @@ public class ShutdownMonitor private String key; private boolean exitVm; private ServerSocket serverSocket; - private ShutdownMonitorThread thread; - - + private Thread thread; /** * Create a ShutdownMonitor using configuration from the System properties. @@ -372,18 +347,20 @@ public class ShutdownMonitor protected void start() throws Exception { - ShutdownMonitorThread t = null; + Thread t = null; + synchronized (this) { if (thread != null && thread.isAlive()) { - // TODO why are we reentrant here? if (DEBUG) System.err.printf("ShutdownMonitorThread already started"); return; // cannot start it again } - thread = new ShutdownMonitorThread(); + thread = new Thread(new ShutdownMonitorRunnable()); + thread.setDaemon(true); + thread.setName("ShutdownMonitor"); t = thread; } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java index bd02b034d8a..0b02ee1b8ab 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java @@ -26,43 +26,36 @@ import java.io.LineNumberReader; import java.io.OutputStream; import java.net.InetAddress; import java.net.Socket; +import java.util.concurrent.TimeUnit; import org.junit.Test; /** * ShutdownMonitorTest - * - * - * */ public class ShutdownMonitorTest { - - @Test - public void testShutdown () - throws Exception + public void testShutdown() throws Exception { - - //test port and key assignment + // test port and key assignment ShutdownMonitor.getInstance().setPort(0); ShutdownMonitor.getInstance().setExitVm(false); ShutdownMonitor.getInstance().start(); String key = ShutdownMonitor.getInstance().getKey(); int port = ShutdownMonitor.getInstance().getPort(); - - //try starting a 2nd time (should be ignored) - ShutdownMonitor.getInstance().start(); - - + + // try starting a 2nd time (should be ignored) + ShutdownMonitor.getInstance().start(); + stop(port,key,true); assertTrue(!ShutdownMonitor.getInstance().isAlive()); - - //should be able to change port and key because it is stopped + + // should be able to change port and key because it is stopped ShutdownMonitor.getInstance().setPort(0); - ShutdownMonitor.getInstance().setKey("foo"); + ShutdownMonitor.getInstance().setKey("foo"); ShutdownMonitor.getInstance().start(); - + key = ShutdownMonitor.getInstance().getKey(); port = ShutdownMonitor.getInstance().getPort(); assertTrue(ShutdownMonitor.getInstance().isAlive()); @@ -71,41 +64,34 @@ public class ShutdownMonitorTest assertTrue(!ShutdownMonitor.getInstance().isAlive()); } - - public void stop (int port, String key, boolean check) - throws Exception + public void stop(int port, String key, boolean check) throws Exception { - Socket s = null; - - try + System.out.printf("Attempting stop to localhost:%d (%b)%n",port,check); + try (Socket s = new Socket(InetAddress.getByName("127.0.0.1"),port)) { - //send stop command - s = new Socket(InetAddress.getByName("127.0.0.1"),port); - - OutputStream out = s.getOutputStream(); - out.write((key + "\r\nstop\r\n").getBytes()); - out.flush(); - - if (check) + // send stop command + try (OutputStream out = s.getOutputStream()) { - //wait a little - Thread.currentThread().sleep(600); + out.write((key + "\r\nstop\r\n").getBytes()); + out.flush(); - //check for stop confirmation - LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream())); - String response; - if ((response = lin.readLine()) != null) + if (check) { - assertEquals("Stopped", response); + // wait a little + TimeUnit.MILLISECONDS.sleep(600); + + // check for stop confirmation + LineNumberReader lin = new LineNumberReader(new InputStreamReader(s.getInputStream())); + String response; + if ((response = lin.readLine()) != null) + { + assertEquals("Stopped",response); + } + else + throw new IllegalStateException("No stop confirmation"); } - else - throw new IllegalStateException("No stop confirmation"); } } - finally - { - if (s != null) s.close(); - } } } From 12b522d7963cce13a30bd1e91a7499d9ab23206b Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 12:42:59 +1000 Subject: [PATCH 075/111] 439507 Avoid timing leak in MD5 compare Also-by: Benny Baumann --- .../org/eclipse/jetty/util/security/Credential.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java index 1feb604790f..da5ec84c804 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java @@ -160,17 +160,19 @@ public abstract class Credential implements Serializable digest = __md.digest(); } if (digest == null || digest.length != _digest.length) return false; + boolean match=true; for (int i = 0; i < digest.length; i++) - if (digest[i] != _digest[i]) return false; - return true; + match&=digest[i] != _digest[i]; + return match; } else if (credentials instanceof MD5) { MD5 md5 = (MD5) credentials; if (_digest.length != md5._digest.length) return false; + boolean match=true; for (int i = 0; i < _digest.length; i++) - if (_digest[i] != md5._digest[i]) return false; - return true; + match&=(_digest[i] != md5._digest[i]); + return match; } else if (credentials instanceof Credential) { From 182436301bf84638be2dcd1c8785f4f07456ae3a Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 17 Jul 2014 12:54:08 +1000 Subject: [PATCH 076/111] 439438 DataSourceLoginService does not refresh passwords when changed in database --- .../plus/security/DataSourceLoginService.java | 33 ++- tests/test-loginservice/pom.xml | 84 +++--- .../jetty/DataSourceLoginServiceTest.java | 201 +++++++++++++ .../jetty/DatabaseLoginServiceTestServer.java | 241 ++++++++++++++++ .../eclipse/jetty/JdbcLoginServiceTest.java | 266 +++--------------- 5 files changed, 550 insertions(+), 275 deletions(-) create mode 100644 tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java create mode 100644 tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java index b315682f8fc..1c8edde16ba 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java @@ -41,12 +41,11 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.util.security.Password; +import org.eclipse.jetty.util.security.Credential; /** * - * //TODO JASPI cf JDBCLoginService * DataSourceUserRealm * * Obtain user/password/role information from a database @@ -70,6 +69,7 @@ public class DataSourceLoginService extends MappedLoginService private String _userRoleTableUserKey = "user_id"; private String _userRoleTableRoleKey = "role_id"; private int _cacheMs = 30000; + private long _lastPurge = 0; private String _userSql; private String _roleSql; private boolean _createTables = false; @@ -282,7 +282,9 @@ public class DataSourceLoginService extends MappedLoginService protected void loadUsers() { } - + + + /* ------------------------------------------------------------ */ /** Load user's info from database. * @@ -293,9 +295,8 @@ public class DataSourceLoginService extends MappedLoginService { try { - initDb(); try (Connection connection = getConnection(); - PreparedStatement statement1 = connection.prepareStatement(_userSql)) + PreparedStatement statement1 = connection.prepareStatement(_userSql)) { statement1.setObject(1, userName); try (ResultSet rs1 = statement1.executeQuery()) @@ -311,10 +312,12 @@ public class DataSourceLoginService extends MappedLoginService try (ResultSet rs2 = statement2.executeQuery()) { while (rs2.next()) + { roles.add(rs2.getString(_roleTableRoleField)); + } } } - return putUser(userName,new Password(credentials), roles.toArray(new String[roles.size()])); + return putUser(userName, Credential.getCredential(credentials), roles.toArray(new String[roles.size()])); } } } @@ -329,6 +332,22 @@ public class DataSourceLoginService extends MappedLoginService } return null; } + + + + /* ------------------------------------------------------------ */ + @Override + public UserIdentity login(String username, Object credentials) + { + long now = System.currentTimeMillis(); + if (now - _lastPurge > _cacheMs || _cacheMs == 0) + { + _users.clear(); + _lastPurge = now; + } + + return super.login(username,credentials); + } /* ------------------------------------------------------------ */ /** @@ -347,7 +366,7 @@ public class DataSourceLoginService extends MappedLoginService InitialContext ic = new InitialContext(); assert ic!=null; - //TODO webapp scope? + //TODO Should we try webapp scope too? //try finding the datasource in the Server scope if (_server != null) diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index e7c2c4ec3a3..8c26cbdc5b4 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -27,42 +27,52 @@ Jetty Tests :: Login Service http://www.eclipse.org/jetty - - org.eclipse.jetty - jetty-server - ${project.version} - - - org.eclipse.jetty - jetty-webapp - ${project.version} - - - org.eclipse.jetty - jetty-client - ${project.version} - - - org.eclipse.jetty - jetty-security - ${project.version} - - - org.apache.derby - derby - 10.4.1.3 - test - - - org.apache.derby - derbytools - 10.4.1.3 - test - - - org.eclipse.jetty.toolchain - jetty-test-helper - test - + + org.eclipse.jetty + jetty-server + ${project.version} + + + org.eclipse.jetty + jetty-webapp + ${project.version} + + + org.eclipse.jetty + jetty-client + ${project.version} + + + org.eclipse.jetty + jetty-security + ${project.version} + + + org.eclipse.jetty + jetty-plus + ${project.version} + + + org.eclipse.jetty + jetty-jndi + ${project.version} + + + org.apache.derby + derby + 10.4.1.3 + test + + + org.apache.derby + derbytools + 10.4.1.3 + test + + + org.eclipse.jetty.toolchain + jetty-test-helper + test + diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java new file mode 100644 index 00000000000..b520355f151 --- /dev/null +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java @@ -0,0 +1,201 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + + +package org.eclipse.jetty; + +import static org.junit.Assert.*; + +import java.io.File; +import java.io.FileOutputStream; +import java.net.URI; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.Statement; + +import javax.naming.NamingException; +import javax.servlet.http.HttpServletResponse; + +import org.apache.derby.jdbc.EmbeddedDataSource; +import org.eclipse.jetty.client.HttpClient; +import org.eclipse.jetty.client.api.AuthenticationStore; +import org.eclipse.jetty.client.api.ContentResponse; +import org.eclipse.jetty.client.util.BasicAuthentication; +import org.eclipse.jetty.plus.security.DataSourceLoginService; +import org.eclipse.jetty.security.JDBCLoginService; +import org.eclipse.jetty.security.LoginService; +import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.Loader; +import org.eclipse.jetty.util.thread.QueuedThreadPool; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * DataSourceLoginServiceTest + * + * + */ +public class DataSourceLoginServiceTest +{ + public static final String _content = "This is some protected content"; + private static File _docRoot; + private static File _dbRoot; + private static HttpClient _client; + private static String __realm = "DSRealm"; + private static String _baseUrl; + private static final int __cacheInterval = 200; + private static DatabaseLoginServiceTestServer _testServer; + + + + + @BeforeClass + public static void setUp() throws Exception + { + _docRoot = new File("target/test-output/docroot/"); + _docRoot.mkdirs(); + _docRoot.deleteOnExit(); + + File content = new File(_docRoot,"input.txt"); + FileOutputStream out = new FileOutputStream(content); + out.write(_content.getBytes("utf-8")); + out.close(); + + _dbRoot = new File("target/test-output/derby"); + String dbPath = _dbRoot.getAbsolutePath(); + System.setProperty("derby.system.home", dbPath); + if (_dbRoot.exists()) + IO.delete(_dbRoot); + + _dbRoot.mkdirs(); + + DatabaseLoginServiceTestServer.createDB(dbPath, "src/test/resources/createdb.sql", "jdbc:derby:dstest;create=true"); + + _testServer = new DatabaseLoginServiceTestServer(); + _testServer.setResourceBase(_docRoot.getAbsolutePath()); + _testServer.setLoginService(configureLoginService()); + _testServer.start(); + _baseUrl = _testServer.getBaseUrl(); + } + + @AfterClass + public static void tearDown() + throws Exception + { + if (_testServer != null) + { + _testServer.stop(); + _testServer = null; + } + } + + public static DataSourceLoginService configureLoginService () throws Exception + { + DataSourceLoginService loginService = new DataSourceLoginService(); + loginService.setUserTableName("users"); + loginService.setUserTableKey("id"); + loginService.setUserTableUserField("username"); + loginService.setUserTablePasswordField("pwd"); + loginService.setRoleTableName("roles"); + loginService.setRoleTableKey("id"); + loginService.setRoleTableRoleField("role"); + loginService.setUserRoleTableName("user_roles"); + loginService.setUserRoleTableRoleKey("role_id"); + loginService.setUserRoleTableUserKey("user_id"); + loginService.setJndiName("dstest"); + loginService.setName(__realm); + loginService.setCacheMs(__cacheInterval); + if (_testServer != null) + loginService.setServer(_testServer.getServer()); + + //create a datasource + EmbeddedDataSource ds = new EmbeddedDataSource(); + File db = new File (_dbRoot, "dstest"); + ds.setDatabaseName(db.getAbsolutePath()); + org.eclipse.jetty.plus.jndi.Resource binding = new org.eclipse.jetty.plus.jndi.Resource(null, "dstest", + ds); + + return loginService; + } + + @Test + public void testGetAndPasswordUpdate() throws Exception + { + try + { + startClient("jetty", "jetty"); + + ContentResponse response = _client.GET(_baseUrl + "input.txt"); + assertEquals(HttpServletResponse.SC_OK,response.getStatus()); + assertEquals(_content, response.getContentAsString()); + + stopClient(); + + String newpwd = String.valueOf(System.currentTimeMillis()); + + changePassword("jetty", newpwd); + Thread.currentThread().sleep(2*__cacheInterval); //pause to ensure cache invalidates + + startClient("jetty", newpwd); + + response = _client.GET(_baseUrl + "input.txt"); + assertEquals(HttpServletResponse.SC_OK,response.getStatus()); + assertEquals(_content, response.getContentAsString()); + + } + finally + { + stopClient(); + } + } + + + protected void changePassword (String user, String newpwd) throws Exception + { + Loader.loadClass(this.getClass(), "org.apache.derby.jdbc.EmbeddedDriver").newInstance(); + try (Connection connection = DriverManager.getConnection("jdbc:derby:dstest", "", "")) + { + Statement stmt = connection.createStatement(); + stmt.executeUpdate("update users set pwd='"+newpwd+"' where username='"+user+"'"); + } + + } + + + protected void startClient(String user, String pwd) throws Exception + { + _client = new HttpClient(); + QueuedThreadPool executor = new QueuedThreadPool(); + executor.setName(executor.getName() + "-client"); + _client.setExecutor(executor); + AuthenticationStore authStore = _client.getAuthenticationStore(); + authStore.addAuthentication(new BasicAuthentication(URI.create(_baseUrl), __realm, user, pwd)); + _client.start(); + } + + protected void stopClient() throws Exception + { + if (_client != null) + { + _client.stop(); + _client = null; + } + } + +} diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java new file mode 100644 index 00000000000..c57f4215018 --- /dev/null +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java @@ -0,0 +1,241 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + + +package org.eclipse.jetty; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLDecoder; +import java.sql.Connection; +import java.sql.DriverManager; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.derby.tools.ij; +import org.eclipse.jetty.security.ConstraintMapping; +import org.eclipse.jetty.security.ConstraintSecurityHandler; +import org.eclipse.jetty.security.LoginService; +import org.eclipse.jetty.security.authentication.BasicAuthenticator; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.NetworkConnector; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.servlet.DefaultServlet; +import org.eclipse.jetty.servlet.ServletContextHandler; +import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.Loader; +import org.eclipse.jetty.util.security.Constraint; + + +/** + * DatabaseLoginServiceTestServer + * + * + */ +public class DatabaseLoginServiceTestServer +{ + protected Server _server; + protected static String _protocol; + protected static String _baseUrl; + protected LoginService _loginService; + protected String _resourceBase; + protected TestHandler _handler; + protected static String _requestContent; + + protected static boolean createDB(String homeDir, String fileName, String dbUrl) + { + File scriptFile = new File(fileName); + try (FileInputStream fileStream = new FileInputStream(scriptFile)) + { + Loader.loadClass(fileStream.getClass(), "org.apache.derby.jdbc.EmbeddedDriver").newInstance(); + Connection connection = DriverManager.getConnection(dbUrl, "", ""); + + OutputStream out = new ByteArrayOutputStream(); + int result = ij.runScript(connection, fileStream, "UTF-8", out, "UTF-8"); + + return (result==0); + } + catch (Exception e) + { + return false; + } + } + + public static class TestHandler extends AbstractHandler + { + private final String _resourcePath; + private String _requestContent; + + + public TestHandler(String repositoryPath) + { + _resourcePath = repositoryPath; + } + + public void handle(String target, org.eclipse.jetty.server.Request baseRequest, + HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException + { + if (baseRequest.isHandled()) + { + return; + } + + OutputStream out = null; + + if (baseRequest.getMethod().equals("PUT")) + { + baseRequest.setHandled(true); + + File file = new File(_resourcePath, URLDecoder.decode(request.getPathInfo())); + file.getParentFile().mkdirs(); + file.deleteOnExit(); + + out = new FileOutputStream(file); + + response.setStatus(HttpServletResponse.SC_CREATED); + } + + if (baseRequest.getMethod().equals("POST")) + { + baseRequest.setHandled(true); + out = new ByteArrayOutputStream(); + + response.setStatus(HttpServletResponse.SC_OK); + } + + if (out != null) + { + try (ServletInputStream in = request.getInputStream()) + { + IO.copy(in, out); + } + finally + { + out.close(); + } + + if (!(out instanceof FileOutputStream)) + _requestContent = out.toString(); + } + } + + public String getRequestContent() + { + return _requestContent; + } + } + + + public DatabaseLoginServiceTestServer () + { + _server = new Server(0); + } + + public void setLoginService (LoginService loginService) + { + _loginService = loginService; + } + + public void setResourceBase (String resourceBase) + { + _resourceBase = resourceBase; + } + + + public void start () throws Exception + { + configureServer(); + _server.start(); + int port = ((NetworkConnector)_server.getConnectors()[0]).getLocalPort(); + _baseUrl = _protocol+"://localhost:"+port+ "/"; + } + + public void stop() throws Exception + { + _server.stop(); + } + + public String getBaseUrl() + { + return _baseUrl; + } + + public TestHandler getTestHandler() + { + return _handler; + } + + public Server getServer() + { + return _server; + } + + protected void configureServer() throws Exception + { + _protocol = "http"; + _server.addBean(_loginService); + + ConstraintSecurityHandler security = new ConstraintSecurityHandler(); + _server.setHandler(security); + + Constraint constraint = new Constraint(); + constraint.setName("auth"); + constraint.setAuthenticate( true ); + constraint.setRoles(new String[]{"user", "admin"}); + + ConstraintMapping mapping = new ConstraintMapping(); + mapping.setPathSpec( "/*" ); + mapping.setConstraint( constraint ); + + Set knownRoles = new HashSet<>(); + knownRoles.add("user"); + knownRoles.add("admin"); + + security.setConstraintMappings(Collections.singletonList(mapping), knownRoles); + security.setAuthenticator(new BasicAuthenticator()); + security.setLoginService(_loginService); + + ServletContextHandler root = new ServletContextHandler(); + root.setContextPath("/"); + root.setResourceBase(_resourceBase); + ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); + servletHolder.setInitParameter( "gzip", "true" ); + root.addServlet( servletHolder, "/*" ); + + _handler = new TestHandler(_resourceBase); + + HandlerCollection handlers = new HandlerCollection(); + handlers.setHandlers(new Handler[]{_handler, root}); + security.setHandler(handlers); + } + +} diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java index 543b0773307..c7b3bbd5844 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java @@ -21,27 +21,13 @@ package org.eclipse.jetty; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.net.URI; -import java.net.URLDecoder; -import java.sql.Connection; -import java.sql.DriverManager; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.derby.tools.ij; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.api.AuthenticationStore; import org.eclipse.jetty.client.api.ContentResponse; @@ -50,23 +36,9 @@ import org.eclipse.jetty.client.util.BasicAuthentication; import org.eclipse.jetty.client.util.BytesContentProvider; import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; -import org.eclipse.jetty.io.EofException; -import org.eclipse.jetty.security.ConstraintMapping; -import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.JDBCLoginService; import org.eclipse.jetty.security.LoginService; -import org.eclipse.jetty.security.authentication.BasicAuthenticator; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.NetworkConnector; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.handler.AbstractHandler; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.IO; -import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -90,127 +62,51 @@ public class JdbcLoginServiceTest "et cursus magna. Donec orci enim, molestie a lobortis eu, imperdiet vitae neque."; private static File _docRoot; - private static Server _server; private static HttpClient _client; private static String __realm = "JdbcRealm"; - private static String _protocol; private static String _baseUrl; - private static String _requestContent; + private static DatabaseLoginServiceTestServer _testServer; - protected static boolean createDB(String homeDir, String fileName, String dbUrl) - { - FileInputStream fileStream = null; - try - { - File scriptFile = new File(fileName); - fileStream = new FileInputStream(scriptFile); + - Loader.loadClass(fileStream.getClass(), "org.apache.derby.jdbc.EmbeddedDriver").newInstance(); - Connection connection = DriverManager.getConnection(dbUrl, "", ""); - - OutputStream out = new ByteArrayOutputStream(); - int result = ij.runScript(connection, fileStream, "UTF-8", out, "UTF-8"); - - return (result==0); - } - catch (Exception e) - { - return false; - } - finally { - if (fileStream!=null) - { - try - { - fileStream.close(); - } - catch (IOException e) {} - } - } - } - - protected static void configureServer(Server server) - throws Exception - { - setProtocol("http"); - - LoginService loginService = new JDBCLoginService(__realm, "./src/test/resources/jdbcrealm.properties"); - server.addBean(loginService); - - ConstraintSecurityHandler security = new ConstraintSecurityHandler(); - server.setHandler(security); - - Constraint constraint = new Constraint(); - constraint.setName("auth"); - constraint.setAuthenticate( true ); - constraint.setRoles(new String[]{"user", "admin"}); - - ConstraintMapping mapping = new ConstraintMapping(); - mapping.setPathSpec( "/*" ); - mapping.setConstraint( constraint ); - - Set knownRoles = new HashSet<>(); - knownRoles.add("user"); - knownRoles.add("admin"); - - security.setConstraintMappings(Collections.singletonList(mapping), knownRoles); - security.setAuthenticator(new BasicAuthenticator()); - security.setLoginService(loginService); - - ServletContextHandler root = new ServletContextHandler(); - root.setContextPath("/"); - root.setResourceBase(getBasePath()); - ServletHolder servletHolder = new ServletHolder( new DefaultServlet() ); - servletHolder.setInitParameter( "gzip", "true" ); - root.addServlet( servletHolder, "/*" ); - - Handler handler = new TestHandler(getBasePath()); - - HandlerCollection handlers = new HandlerCollection(); - handlers.setHandlers(new Handler[]{handler, root}); - security.setHandler(handlers); - } @BeforeClass - public static void setUp() - throws Exception - { - _docRoot = new File("target/test-output/docroot/"); - _docRoot.mkdirs(); - _docRoot.deleteOnExit(); - - File content = new File(_docRoot,"input.txt"); - FileOutputStream out = new FileOutputStream(content); - out.write(_content.getBytes("utf-8")); - out.close(); - - File dbRoot = new File("target/test-output/derby"); - String dbPath = dbRoot.getAbsolutePath(); - System.setProperty("derby.system.home", dbPath); - if (!dbRoot.exists()) - { - dbRoot.mkdirs(); - createDB(dbPath, "src/test/resources/createdb.sql", "jdbc:derby:jdbcrealm;create=true"); - } - - _server = new Server(0); - configureServer(_server); - _server.start(); - - int port = ((NetworkConnector)_server.getConnectors()[0]).getLocalPort(); - _baseUrl = _protocol+"://localhost:"+port+ "/"; + public static void setUp() throws Exception + { + _docRoot = new File("target/test-output/docroot/"); + _docRoot.mkdirs(); + _docRoot.deleteOnExit(); + File content = new File(_docRoot,"input.txt"); + FileOutputStream out = new FileOutputStream(content); + out.write(_content.getBytes("utf-8")); + out.close(); + File dbRoot = new File("target/test-output/derby"); + String dbPath = dbRoot.getAbsolutePath(); + System.setProperty("derby.system.home", dbPath); + if (dbRoot.exists()) + IO.delete(dbRoot); + + dbRoot.mkdirs(); + + DatabaseLoginServiceTestServer.createDB(dbPath, "src/test/resources/createdb.sql", "jdbc:derby:jdbcrealm;create=true"); + LoginService loginService = new JDBCLoginService(__realm, "./src/test/resources/jdbcrealm.properties"); + _testServer = new DatabaseLoginServiceTestServer(); + _testServer.setResourceBase(_docRoot.getAbsolutePath()); + _testServer.setLoginService(loginService); + _testServer.start(); + _baseUrl = _testServer.getBaseUrl(); } @AfterClass public static void tearDown() throws Exception { - if (_server != null) + if (_testServer != null) { - _server.stop(); - _server = null; + _testServer.stop(); + _testServer = null; } } @@ -221,7 +117,7 @@ public class JdbcLoginServiceTest { startClient(); - Request request = _client.newRequest(getBaseUrl() + "output.txt"); + Request request = _client.newRequest(_baseUrl + "output.txt"); request.method(HttpMethod.PUT); request.content(new BytesContentProvider(_content.getBytes())); ContentResponse response = request.send(); @@ -244,7 +140,7 @@ public class JdbcLoginServiceTest { startClient(); - ContentResponse response = _client.GET(getBaseUrl() + "input.txt"); + ContentResponse response = _client.GET(_baseUrl + "input.txt"); assertEquals(HttpServletResponse.SC_OK,response.getStatus()); assertEquals(_content, response.getContentAsString()); } @@ -262,7 +158,7 @@ public class JdbcLoginServiceTest { startClient(); - Request request = _client.newRequest(getBaseUrl() + "input.txt"); + Request request = _client.newRequest(_baseUrl + "input.txt"); request.method(HttpMethod.HEAD); ContentResponse response = request.send(); int responseStatus = response.getStatus(); @@ -281,12 +177,12 @@ public class JdbcLoginServiceTest { startClient(); - Request request = _client.newRequest(getBaseUrl() + "test"); + Request request = _client.newRequest(_baseUrl + "test"); request.method(HttpMethod.POST); request.content(new BytesContentProvider(_content.getBytes())); ContentResponse response = request.send(); assertEquals(HttpStatus.OK_200,response.getStatus()); - assertEquals(_content,_requestContent); + assertEquals(_content,_testServer.getTestHandler().getRequestContent()); } finally { @@ -316,15 +212,7 @@ public class JdbcLoginServiceTest } } - protected static String getBasePath() - { - return _docRoot.getAbsolutePath(); - } - - protected String getBaseUrl() - { - return _baseUrl; - } + protected HttpClient getClient() { @@ -337,88 +225,4 @@ public class JdbcLoginServiceTest return _content; } - protected static void setProtocol(String protocol) - { - _protocol = protocol; - } - - - - public static void copyStream(InputStream in, OutputStream out) - { - try - { - byte[] buffer=new byte[1024]; - int len; - while ((len=in.read(buffer))>=0) - { - out.write(buffer,0,len); - } - } - catch (EofException e) - { - System.err.println(e); - } - catch (IOException e) - { - e.printStackTrace(); - } - } - - protected static class TestHandler extends AbstractHandler { - private final String resourcePath; - - public TestHandler(String repositoryPath) { - this.resourcePath = repositoryPath; - } - - public void handle(String target, org.eclipse.jetty.server.Request baseRequest, - HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException - { - if (baseRequest.isHandled()) - { - return; - } - - OutputStream out = null; - - if (baseRequest.getMethod().equals("PUT")) - { - baseRequest.setHandled(true); - - File file = new File(resourcePath, URLDecoder.decode(request.getPathInfo())); - file.getParentFile().mkdirs(); - file.deleteOnExit(); - - out = new FileOutputStream(file); - - response.setStatus(HttpServletResponse.SC_CREATED); - } - - if (baseRequest.getMethod().equals("POST")) - { - baseRequest.setHandled(true); - out = new ByteArrayOutputStream(); - - response.setStatus(HttpServletResponse.SC_OK); - } - - if (out != null) - { - try (ServletInputStream in = request.getInputStream()) - { - copyStream(in, out); - } - finally - { - out.close(); - } - - if (!(out instanceof FileOutputStream)) - _requestContent = out.toString(); - } - - } - } } From 94ac37f8c24ab8e1223e82c4fd2281267308f6f9 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 12:58:27 +1000 Subject: [PATCH 077/111] 439067 Javadoc for graceful server stop --- .../java/org/eclipse/jetty/server/Server.java | 15 ++++++++++ .../jetty/server/GracefulStopTest.java | 29 +++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index 6e5050d0883..63c0ed46413 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -32,6 +32,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -46,6 +47,7 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.HandlerWrapper; +import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.util.Attributes; import org.eclipse.jetty.util.AttributesMap; import org.eclipse.jetty.util.Jetty; @@ -142,6 +144,19 @@ public class Server extends HandlerWrapper implements Attributes return _stopAtShutdown; } + /* ------------------------------------------------------------ */ + /** + * Set a graceful stop time. + * The {@link StatisticsHandler} must be configured so that open connections can + * be tracked for a graceful shutdown. + * @see org.eclipse.jetty.util.component.ContainerLifeCycle#setStopTimeout(long) + */ + @Override + public void setStopTimeout(long stopTimeout) + { + super.setStopTimeout(stopTimeout); + } + /* ------------------------------------------------------------ */ public void setStopAtShutdown(boolean stop) { diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java index 2794cfb1f9a..01ef24fecd5 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java @@ -79,6 +79,35 @@ public class GracefulStopTest Assert.assertThat(out,Matchers.containsString("200 OK")); } } + + @Test + public void testGracefulTimout() throws Exception + { + server.setStopTimeout(100); + new Thread() + { + @Override + public void run() + { + try + { + TimeUnit.SECONDS.sleep(1); + server.stop(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + }.start(); + + try(Socket socket = new Socket("localhost",server.getBean(NetworkConnector.class).getLocalPort());) + { + socket.getOutputStream().write("GET / HTTP/1.0\r\n\r\n".getBytes(StandardCharsets.ISO_8859_1)); + String out = IO.toString(socket.getInputStream()); + Assert.assertEquals("",out); + } + } private static class TestHandler extends AbstractHandler { From 6bc08000c78d44d36031ca847467e882c4cc5058 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 13:25:25 +1000 Subject: [PATCH 078/111] 439066 javadoc setStopAtShutdown --- .../src/main/java/org/eclipse/jetty/server/Server.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index 63c0ed46413..b9124ade2e9 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -158,6 +158,12 @@ public class Server extends HandlerWrapper implements Attributes } /* ------------------------------------------------------------ */ + /** Set stop server at shutdown behaviour. + * @param stop If true, this server instance will be explicitly stopped when the + * JVM is shutdown. Otherwise the JVM is stopped with the server running. + * @see Runtime#addShutdownHook(Thread) + * @see ShutdownThread + */ public void setStopAtShutdown(boolean stop) { //if we now want to stop @@ -668,6 +674,7 @@ public class Server extends HandlerWrapper implements Attributes return this.getClass().getName()+"@"+Integer.toHexString(hashCode()); } + /* ------------------------------------------------------------ */ @Override public void dump(Appendable out,String indent) throws IOException { From b13be9cfa6f4d23d96180f9f44204ddd5ba2a9d7 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 13:40:21 +1000 Subject: [PATCH 079/111] 438327 Remove hard coded Allow from OPTIONS * --- jetty-server/src/main/java/org/eclipse/jetty/server/Server.java | 1 - .../test/java/org/eclipse/jetty/server/HttpConnectionTest.java | 1 - .../test/java/org/eclipse/jetty/server/PartialRFC2616Test.java | 1 - 3 files changed, 3 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index b9124ade2e9..af4a614e895 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -495,7 +495,6 @@ public class Server extends HandlerWrapper implements Attributes response.sendError(HttpStatus.BAD_REQUEST_400); request.setHandled(true); response.setStatus(200); - response.getHttpFields().put(HttpHeader.ALLOW,"GET,POST,HEAD,OPTIONS"); response.setContentLength(0); response.closeOutput(); } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java index 96056fda5f7..d582e578cec 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java @@ -723,7 +723,6 @@ public class HttpConnectionTest "12345\015\012"+ "0;\015\012\015\012"); offset = checkContains(response,offset,"HTTP/1.1 200"); - offset = checkContains(response,offset,"Allow: GET,POST,HEAD"); offset=0; response=connector.getResponses("GET * HTTP/1.1\n"+ diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java b/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java index 1643bab762c..bfb52afab07 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/PartialRFC2616Test.java @@ -495,7 +495,6 @@ public class PartialRFC2616Test "Host: localhost\n"+ "\n"); offset=checkContains(response,offset, "HTTP/1.1 200","200")+1; - offset=checkContains(response,offset, "Allow: GET,POST,HEAD,OPTIONS","Allow")+1; offset=0; response=connector.getResponses("GET * HTTP/1.1\n"+ From 2d52280179a7d9f8b2449c49bcb0847e02115082 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 14:29:58 +1000 Subject: [PATCH 080/111] 436987 limited range of default acceptors and selectors --- .../jetty/embedded/SimplestServer.java | 1 + .../jetty/server/AbstractConnector.java | 31 +++++++++++++++---- .../eclipse/jetty/server/ServerConnector.java | 3 +- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java index bd0540fe6ea..482194f351a 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/SimplestServer.java @@ -29,6 +29,7 @@ public class SimplestServer { Server server = new Server(8080); server.start(); + server.dumpStdErr(); server.join(); } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java index c749f78b967..3106eec2575 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java @@ -186,9 +186,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co int cores = Runtime.getRuntime().availableProcessors(); if (acceptors < 0) - acceptors = 1 + cores / 16; - if (acceptors > 2 * cores) - LOG.warn("Acceptors should be <= 2*availableProcessors: " + this); + acceptors=Math.max(1, Math.min(4,cores/8)); + if (acceptors > cores) + LOG.warn("Acceptors should be <= availableProcessors: " + this); _acceptors = new Thread[acceptors]; } @@ -256,7 +256,11 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co _stopping=new CountDownLatch(_acceptors.length); for (int i = 0; i < _acceptors.length; i++) - getExecutor().execute(new Acceptor(i)); + { + Acceptor a = new Acceptor(i); + addBean(a); + getExecutor().execute(a); + } LOG.info("Started {}", this); } @@ -294,6 +298,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co _stopping=null; super.doStop(); + + for (Acceptor a : getBeans(Acceptor.class)) + removeBean(a); LOG.info("Stopped {}", this); } @@ -435,6 +442,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co private class Acceptor implements Runnable { private final int _acceptor; + private String _name; private Acceptor(int id) { @@ -445,8 +453,9 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co public void run() { Thread current = Thread.currentThread(); - String name = current.getName(); - current.setName(name + "-acceptor-" + _acceptor + "-" + AbstractConnector.this); + String name=current.getName(); + _name=String.format("%s-acceptor-%d@%x-%s",name,_acceptor,hashCode(),AbstractConnector.this.toString()); + current.setName(_name); synchronized (AbstractConnector.this) { @@ -483,6 +492,16 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co stopping.countDown(); } } + + @Override + public String toString() + { + String name=_name; + if (name==null) + return String.format("acceptor-%d@%x", _acceptor, hashCode()); + return name; + } + } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java index 751293da468..f4da30c004e 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java @@ -205,7 +205,8 @@ public class ServerConnector extends AbstractNetworkConnector @Name("factories") ConnectionFactory... factories) { super(server,executor,scheduler,bufferPool,acceptors,factories); - _manager = new ServerConnectorManager(getExecutor(), getScheduler(), selectors > 0 ? selectors : Runtime.getRuntime().availableProcessors()); + _manager = new ServerConnectorManager(getExecutor(), getScheduler(), + selectors>0?selectors:Math.max(1,Math.min(4,Runtime.getRuntime().availableProcessors()/2))); addBean(_manager, true); } From a2a333ba535df6b011c01ddc1c753152020cd4fb Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 15:51:22 +1000 Subject: [PATCH 081/111] 435653 encode async dispatched requestURI --- .../java/org/eclipse/jetty/server/Server.java | 6 +- .../jetty/servlet/AsyncServletTest.java | 115 ++++++++++-------- 2 files changed, 71 insertions(+), 50 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index af4a614e895..226b0a75990 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -53,6 +53,7 @@ import org.eclipse.jetty.util.AttributesMap; import org.eclipse.jetty.util.Jetty; import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.URIUtil; +import org.eclipse.jetty.util.UrlEncoded; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.Name; @@ -517,10 +518,11 @@ public class Server extends HandlerWrapper implements Attributes { // this is a dispatch with a path ServletContext context=event.getServletContext(); - HttpURI uri = new HttpURI(context==null?path:URIUtil.addPaths(context.getContextPath(),path)); + HttpURI uri = new HttpURI(URIUtil.encodePath(context==null?path:URIUtil.addPaths(context.getContextPath(),path))); baseRequest.setUri(uri); baseRequest.setRequestURI(null); - baseRequest.setPathInfo(baseRequest.getRequestURI()); + baseRequest.setPathInfo(uri.getDecodedPath()); + if (uri.getQuery()!=null) baseRequest.mergeQueryParameters(uri.getQuery(), true); //we have to assume dispatch path and query are UTF8 } diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java index a1bb491f191..288cf326349 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java @@ -97,6 +97,7 @@ public class AsyncServletTest _servletHandler.addServletWithMapping(holder,"/path/*"); _servletHandler.addServletWithMapping(holder,"/path1/*"); _servletHandler.addServletWithMapping(holder,"/path2/*"); + _servletHandler.addServletWithMapping(holder,"/p th3/*"); _servletHandler.addServletWithMapping(new ServletHolder(new FwdServlet()),"/fwd/*"); _server.start(); _port=_connector.getLocalPort(); @@ -116,7 +117,7 @@ public class AsyncServletTest String response=process(null,null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n",response); assertContains("NORMAL",response); assertNotContains("history: onTimeout",response); @@ -129,7 +130,7 @@ public class AsyncServletTest String response=process("sleep=200",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n",response); assertContains("SLEPT",response); assertNotContains("history: onTimeout",response); @@ -143,11 +144,11 @@ public class AsyncServletTest String response=process("suspend=200",null); assertEquals("HTTP/1.1 500 Async Timeout",response.substring(0,26)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -160,12 +161,12 @@ public class AsyncServletTest String response=process("suspend=200&timeout=dispatch",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ "history: dispatch\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -178,7 +179,7 @@ public class AsyncServletTest String response=process("suspend=200&timeout=complete",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ @@ -194,11 +195,11 @@ public class AsyncServletTest String response=process("suspend=200&resume=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertNotContains("history: onTimeout",response); @@ -210,11 +211,11 @@ public class AsyncServletTest String response=process("suspend=200&resume=0",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("history: onComplete",response); @@ -226,7 +227,7 @@ public class AsyncServletTest String response=process("suspend=200&complete=50",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -242,7 +243,7 @@ public class AsyncServletTest String response=process("suspend=200&complete=0",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -258,15 +259,15 @@ public class AsyncServletTest String response=process("suspend=1000&resume=10&suspend2=1000&resume2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -278,11 +279,11 @@ public class AsyncServletTest String response=process("suspend=1000&resume=10&suspend2=1000&complete2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -297,15 +298,15 @@ public class AsyncServletTest String response=process("suspend=1000&resume=10&suspend2=10",null); assertEquals("HTTP/1.1 500 Async Timeout",response.substring(0,26)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("ERROR: /ctx/path/info",response); @@ -317,15 +318,15 @@ public class AsyncServletTest String response=process("suspend=10&suspend2=1000&resume2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -337,11 +338,11 @@ public class AsyncServletTest String response=process("suspend=10&suspend2=1000&complete2=10",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: complete\r\n"+ @@ -355,15 +356,15 @@ public class AsyncServletTest _expectedCode="500 "; String response=process("suspend=10&suspend2=10",null); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: suspend\r\n"+ "history: onTimeout\r\n"+ - "history: ERROR /path\r\n"+ + "history: ERROR /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("ERROR: /ctx/path/info",response); @@ -375,30 +376,48 @@ public class AsyncServletTest String response=process("wrap=true&suspend=200&resume=20",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: wrapped REQ RSP\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); } + + @Test + public void testStartDispatchEncodedPath() throws Exception + { + String response=process("suspend=200&resume=20&path=/p%20th3",null); + assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); + assertContains( + "history: REQUEST /ctx/path/info\r\n"+ + "history: initial\r\n"+ + "history: suspend\r\n"+ + "history: resume\r\n"+ + "history: ASYNC /ctx/p%20th3\r\n"+ + "history: !initial\r\n"+ + "history: onComplete\r\n",response); + assertContains("DISPATCHED",response); + } + + @Test public void testFwdStartDispatch() throws Exception { String response=process("fwd","suspend=200&resume=20",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: FWD ASYNC /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD ASYNC /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -410,12 +429,12 @@ public class AsyncServletTest String response=process("fwd","suspend=200&resume=20&path=/path2",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path2\r\n"+ + "history: ASYNC /ctx/path2\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); assertContains("DISPATCHED",response); @@ -427,12 +446,12 @@ public class AsyncServletTest String response=process("fwd","wrap=true&suspend=200&resume=20",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path1\r\n"+ + "history: ASYNC /ctx/path1\r\n"+ "history: wrapped REQ RSP\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -445,12 +464,12 @@ public class AsyncServletTest String response=process("fwd","wrap=true&suspend=200&resume=20&path=/path2",null); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: FWD REQUEST /fwd\r\n"+ - "history: FORWARD /path1\r\n"+ + "history: FWD REQUEST /ctx/fwd/info\r\n"+ + "history: FORWARD /ctx/path1\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path2\r\n"+ + "history: ASYNC /ctx/path2\r\n"+ "history: wrapped REQ RSP\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); @@ -485,12 +504,12 @@ public class AsyncServletTest String response = IO.toString(socket.getInputStream()); assertEquals("HTTP/1.1 200 OK",response.substring(0,15)); assertContains( - "history: REQUEST /path\r\n"+ + "history: REQUEST /ctx/path/info\r\n"+ "history: initial\r\n"+ "history: suspend\r\n"+ "history: async-read=10\r\n"+ "history: resume\r\n"+ - "history: ASYNC /path\r\n"+ + "history: ASYNC /ctx/path/info\r\n"+ "history: !initial\r\n"+ "history: onComplete\r\n",response); } @@ -548,7 +567,7 @@ public class AsyncServletTest @Override public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { - response.addHeader("history","FWD "+request.getDispatcherType()+" "+request.getServletPath()); + response.addHeader("history","FWD "+request.getDispatcherType()+" "+request.getRequestURI()); if (request instanceof ServletRequestWrapper || response instanceof ServletResponseWrapper) response.addHeader("history","wrapped"+((request instanceof ServletRequestWrapper)?" REQ":"")+((response instanceof ServletResponseWrapper)?" RSP":"")); request.getServletContext().getRequestDispatcher("/path1").forward(request,response); @@ -564,7 +583,7 @@ public class AsyncServletTest public void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException { // System.err.println(request.getDispatcherType()+" "+request.getRequestURI()); - response.addHeader("history",request.getDispatcherType()+" "+request.getServletPath()); + response.addHeader("history",request.getDispatcherType()+" "+request.getRequestURI()); if (request instanceof ServletRequestWrapper || response instanceof ServletResponseWrapper) response.addHeader("history","wrapped"+((request instanceof ServletRequestWrapper)?" REQ":"")+((response instanceof ServletResponseWrapper)?" RSP":"")); From a89419fd3f43729b83d78a6c0b2f1f69b53035ad Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 17 Jul 2014 16:09:42 +1000 Subject: [PATCH 082/111] 434536 Improved Customizer javadoc --- .../jetty/server/HttpConfiguration.java | 18 ++++++++++++++++++ .../jetty/server/SecureRequestCustomizer.java | 14 +++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java index 7dc54e1d654..43bb4129b2a 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java @@ -54,6 +54,23 @@ public class HttpConfiguration private boolean _sendXPoweredBy = false; //send X-Powered-By: header private boolean _sendDateHeader = true; //send Date: header + + /* ------------------------------------------------------------ */ + /** + *

    An interface that allows a request object to be customized + * for a particular HTTP connector configuration. Unlike Filters, customiser are + * applied before a is submitted for request processing and can be specific to the + * connector on which the request was received. + * + *

    Typically Customizers perform tasks such as:

      + *
    • process header fields that may be injected by a proxy or load balancer. + *
    • setup attributes that may come from the connection/connector such as SSL Session IDs + *
    • Allow a request to be marked as secure or authenticated if those have been offloaded + * and communicated by header, cookie or other out-of-band mechansism + *
    • Set request attributes/fields that are determined by the connector on which the + * request was received + *
    + */ public interface Customizer { public void customize(Connector connector, HttpConfiguration channelConfig, Request request); @@ -104,6 +121,7 @@ public class HttpConfiguration return _customizers; } + /* ------------------------------------------------------------ */ public T getCustomizer(Class type) { for (Customizer c : _customizers) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java index b017461310e..dd26b04b146 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java @@ -20,8 +20,10 @@ package org.eclipse.jetty.server; import java.security.cert.X509Certificate; +import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLSession; +import javax.servlet.ServletRequest; import org.eclipse.jetty.http.HttpScheme; import org.eclipse.jetty.io.ssl.SslConnection; @@ -31,6 +33,12 @@ import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.ssl.SslContextFactory; + +/* ------------------------------------------------------------ */ +/** Customizer that extracts the attribute from an {@link SSLContext} + * and sets them on the request with {@link ServletRequest#setAttribute(String, Object)} + * according to Servlet Specification Requirements. + */ public class SecureRequestCustomizer implements HttpConfiguration.Customizer { private static final Logger LOG = Log.getLogger(SecureRequestCustomizer.class); @@ -40,7 +48,6 @@ public class SecureRequestCustomizer implements HttpConfiguration.Customizer */ public static final String CACHED_INFO_ATTR = CachedInfo.class.getName(); - @Override public void customize(Connector connector, HttpConfiguration channelConfig, Request request) { @@ -53,14 +60,11 @@ public class SecureRequestCustomizer implements HttpConfiguration.Customizer SSLEngine sslEngine=sslConnection.getSSLEngine(); customize(sslEngine,request); } - } /* ------------------------------------------------------------ */ /* - * Allow the Listener a chance to customise the request. before the server - * does its stuff.
    - * This allows the required attributes to be set for SSL requests.
    + * Customise the request attributes to be set for SSL requests.
    * The requirements of the Servlet specs are: *
      *
    • an attribute named "javax.servlet.request.ssl_session_id" of type From 3975d1170a0694c9694a538b44c8f4ebbc90a6b3 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 17 Jul 2014 18:21:22 +1000 Subject: [PATCH 083/111] 439753 ConstraintSecurityHandler has dead code for processing constraints --- .../jetty/security/ConstraintSecurityHandler.java | 15 --------------- .../eclipse/jetty/security/ConstraintTest.java | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java index 1bd2d52cd11..7b7f2a395e0 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java @@ -511,21 +511,6 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr mappings.put(ALL_METHODS,roleInfo); } } - else - { - //combine with any entry that covers all methods - if (httpMethod == null) - { - for (Map.Entry entry : mappings.entrySet()) - { - if (entry.getKey() != null) - { - RoleInfo specific = entry.getValue(); - specific.combine(roleInfo); - } - } - } - } } /* ------------------------------------------------------------ */ diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java index 8897caa7124..93b32c71230 100644 --- a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java +++ b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java @@ -441,7 +441,7 @@ public class ConstraintTest Constraint constraint6 = new Constraint(); constraint6.setAuthenticate(true); - constraint6.setName("omit POST and GET"); + constraint6.setName("omit HEAD and GET"); constraint6.setRoles(new String[]{"user"}); ConstraintMapping mapping6 = new ConstraintMapping(); mapping6.setPathSpec("/omit/*"); From 405fd05a6e330d90e3e1349ae1e853be703afe44 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 17 Jul 2014 18:36:35 +1000 Subject: [PATCH 084/111] 439369 Deprecate CrossContextPseudoSession --- .../eclipse/jetty/security/jaspi/modules/FormAuthModule.java | 3 +++ .../org/eclipse/jetty/security/CrossContextPsuedoSession.java | 1 + .../eclipse/jetty/security/HashCrossContextPsuedoSession.java | 1 + 3 files changed, 5 insertions(+) diff --git a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java index fbe2b62b950..9215eddaf00 100644 --- a/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java +++ b/jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/modules/FormAuthModule.java @@ -92,6 +92,9 @@ public class FormAuthModule extends BaseAuthModule setErrorPage(errorPage); } + /** + * @deprecated + */ public FormAuthModule(CallbackHandler callbackHandler, CrossContextPsuedoSession ssoSource, String loginPage, String errorPage) { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java b/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java index e2de9f7db22..a67eb96d6fc 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/CrossContextPsuedoSession.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse; /** * @version $Rev: 4466 $ $Date: 2009-02-10 23:42:54 +0100 (Tue, 10 Feb 2009) $ + * @deprecated */ public interface CrossContextPsuedoSession { diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java b/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java index 8499a609d3a..2f94908acb3 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/HashCrossContextPsuedoSession.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponse; /** * @version $Rev: 4660 $ $Date: 2009-02-25 17:29:53 +0100 (Wed, 25 Feb 2009) $ + * @deprecated */ public class HashCrossContextPsuedoSession implements CrossContextPsuedoSession { From a7e87c5eedcd4e5f66c251d22b8c17fc8a4082f3 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 17 Jul 2014 11:48:19 +0200 Subject: [PATCH 085/111] Updated NPN and ALPN to JDK 7u65 and 8u11. --- .../modules/protonego-impl/alpn-1.7.0_65.mod | 8 ++++++ .../modules/protonego-impl/alpn-1.8.0_11.mod | 8 ++++++ .../modules/protonego-impl/npn-1.7.0_65.mod | 8 ++++++ pom.xml | 25 +++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod create mode 100644 jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod new file mode 100644 index 00000000000..45bbad75c9f --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.7.0_65.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/7.0.0.v20140317/alpn-boot-7.0.0.v20140317.jar|lib/alpn/alpn-boot-7.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-7.0.0.v20140317.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod new file mode 100644 index 00000000000..65e6cb3c4db --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_11.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.0.0.v20140317/alpn-boot-8.0.0.v20140317.jar|lib/alpn/alpn-boot-8.0.0.v20140317.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.0.0.v20140317.jar diff --git a/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod new file mode 100644 index 00000000000..639c70e3ffd --- /dev/null +++ b/jetty-spdy/spdy-http-server/src/main/config/modules/protonego-impl/npn-1.7.0_65.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/npn/npn-boot/1.1.7.v20140316/npn-boot-1.1.7.v20140316.jar|lib/npn/npn-boot-1.1.7.v20140316.jar + +[exec] +-Xbootclasspath/p:lib/npn/npn-boot-1.1.7.v20140316.jar diff --git a/pom.xml b/pom.xml index 4b0fbb59f7a..e21470cb961 100644 --- a/pom.xml +++ b/pom.xml @@ -892,6 +892,19 @@ 7.0.0.v20140317 + + 7u65 + + + java.version + 1.7.0_65 + + + + 1.1.7.v20140316 + 7.0.0.v20140317 + + 8u00 @@ -916,6 +929,18 @@ 8.0.0.v20140317 + + 8u11 + + + java.version + 1.8.0_11 + + + + 8.0.0.v20140317 + + From e39adb337fc376fde31e6b53267572225aaad314 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 17 Jul 2014 08:37:50 -0700 Subject: [PATCH 086/111] 439672 support using Apache commons daemon for managing Jetty Signed-off-by: marko asplund --- .../java/org/eclipse/jetty/start/Main.java | 64 +++++++++++++++---- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java index 22e7a462333..965333b9d65 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/Main.java @@ -136,6 +136,7 @@ public class Main } private BaseHome baseHome; + private StartArgs startupArgs; public Main() throws IOException { @@ -658,19 +659,7 @@ public class Main if (args.isStopCommand()) { - int stopPort = Integer.parseInt(args.getProperties().getString("STOP.PORT")); - String stopKey = args.getProperties().getString("STOP.KEY"); - - if (args.getProperties().getString("STOP.WAIT") != null) - { - int stopWait = Integer.parseInt(args.getProperties().getString("STOP.PORT")); - - stop(stopPort,stopKey,stopWait); - } - else - { - stop(stopPort,stopKey); - } + doStop(args); } // Initialize start.ini @@ -760,6 +749,22 @@ public class Main } } + private void doStop(StartArgs args) { + int stopPort = Integer.parseInt(args.getProperties().getString("STOP.PORT")); + String stopKey = args.getProperties().getString("STOP.KEY"); + + if (args.getProperties().getString("STOP.WAIT") != null) + { + int stopWait = Integer.parseInt(args.getProperties().getString("STOP.PORT")); + + stop(stopPort,stopKey,stopWait); + } + else + { + stop(stopPort,stopKey); + } + } + /** * Stop a running jetty instance. */ @@ -867,4 +872,37 @@ public class Main System.exit(EXIT_USAGE); } } + + // ------------------------------------------------------------ + // implement Apache commons daemon (jsvc) lifecycle methods (init, start, stop, destroy) + public void init(String[] args) throws Exception + { + try + { + startupArgs = processCommandLine(args); + } + catch (UsageException e) + { + System.err.println(e.getMessage()); + usageExit(e.getCause(),e.getExitCode()); + } + catch (Throwable e) + { + usageExit(e,UsageException.ERR_UNKNOWN); + } + } + + public void start() throws Exception + { + start(startupArgs); + } + + public void stop() throws Exception + { + doStop(startupArgs); + } + + public void destroy() + { + } } From c4c84260690576fa64cc0004a954dfbeb84edf7a Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 17 Jul 2014 17:55:22 -0700 Subject: [PATCH 087/111] 439507 - Possible timing side-channel when comparing MD5-Credentials + Using correct digestMismatch logic + Fixing test cases: + No longer reuses / shares directories + Is now Windows build/test compatible + No longer deleteOnExit() the test data (let maven clean and/or test init do that) + Empty directories are now verified + Using server.getURI() instead of URL string manipulation --- .../jetty/util/security/Credential.java | 12 ++--- .../jetty/DataSourceLoginServiceTest.java | 34 +++++-------- .../jetty/DatabaseLoginServiceTestServer.java | 28 ++++++----- .../eclipse/jetty/JdbcLoginServiceTest.java | 49 +++++++++---------- .../test/resources/jetty-logging.properties | 3 ++ 5 files changed, 60 insertions(+), 66 deletions(-) create mode 100644 tests/test-loginservice/src/test/resources/jetty-logging.properties diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java index da5ec84c804..3db90dca446 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/security/Credential.java @@ -160,19 +160,19 @@ public abstract class Credential implements Serializable digest = __md.digest(); } if (digest == null || digest.length != _digest.length) return false; - boolean match=true; + boolean digestMismatch = false; for (int i = 0; i < digest.length; i++) - match&=digest[i] != _digest[i]; - return match; + digestMismatch |= (digest[i] != _digest[i]); + return !digestMismatch; } else if (credentials instanceof MD5) { MD5 md5 = (MD5) credentials; if (_digest.length != md5._digest.length) return false; - boolean match=true; + boolean digestMismatch = false; for (int i = 0; i < _digest.length; i++) - match&=(_digest[i] != md5._digest[i]); - return match; + digestMismatch |= (_digest[i] != md5._digest[i]); + return !digestMismatch; } else if (credentials instanceof Credential) { diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java index b520355f151..45c748486b5 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java @@ -28,7 +28,6 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; -import javax.naming.NamingException; import javax.servlet.http.HttpServletResponse; import org.apache.derby.jdbc.EmbeddedDataSource; @@ -37,9 +36,8 @@ import org.eclipse.jetty.client.api.AuthenticationStore; import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.util.BasicAuthentication; import org.eclipse.jetty.plus.security.DataSourceLoginService; -import org.eclipse.jetty.security.JDBCLoginService; -import org.eclipse.jetty.security.LoginService; -import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.toolchain.test.FS; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.AfterClass; @@ -58,40 +56,34 @@ public class DataSourceLoginServiceTest private static File _dbRoot; private static HttpClient _client; private static String __realm = "DSRealm"; - private static String _baseUrl; + private static URI _baseUri; private static final int __cacheInterval = 200; private static DatabaseLoginServiceTestServer _testServer; - - - @BeforeClass public static void setUp() throws Exception { - _docRoot = new File("target/test-output/docroot/"); - _docRoot.mkdirs(); - _docRoot.deleteOnExit(); + _docRoot = MavenTestingUtils.getTargetTestingDir(DataSourceLoginServiceTest.class.getSimpleName()); + FS.ensureEmpty(_docRoot); File content = new File(_docRoot,"input.txt"); FileOutputStream out = new FileOutputStream(content); out.write(_content.getBytes("utf-8")); out.close(); - _dbRoot = new File("target/test-output/derby"); + _dbRoot = new File(_docRoot, "derby"); String dbPath = _dbRoot.getAbsolutePath(); System.setProperty("derby.system.home", dbPath); - if (_dbRoot.exists()) - IO.delete(_dbRoot); + FS.ensureEmpty(_dbRoot); - _dbRoot.mkdirs(); - - DatabaseLoginServiceTestServer.createDB(dbPath, "src/test/resources/createdb.sql", "jdbc:derby:dstest;create=true"); + File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); + DatabaseLoginServiceTestServer.createDB(dbPath, scriptFile, "jdbc:derby:dstest;create=true"); _testServer = new DatabaseLoginServiceTestServer(); _testServer.setResourceBase(_docRoot.getAbsolutePath()); _testServer.setLoginService(configureLoginService()); _testServer.start(); - _baseUrl = _testServer.getBaseUrl(); + _baseUri = _testServer.getBaseUri(); } @AfterClass @@ -141,7 +133,7 @@ public class DataSourceLoginServiceTest { startClient("jetty", "jetty"); - ContentResponse response = _client.GET(_baseUrl + "input.txt"); + ContentResponse response = _client.GET(_baseUri.resolve("input.txt")); assertEquals(HttpServletResponse.SC_OK,response.getStatus()); assertEquals(_content, response.getContentAsString()); @@ -154,7 +146,7 @@ public class DataSourceLoginServiceTest startClient("jetty", newpwd); - response = _client.GET(_baseUrl + "input.txt"); + response = _client.GET(_baseUri.resolve("input.txt")); assertEquals(HttpServletResponse.SC_OK,response.getStatus()); assertEquals(_content, response.getContentAsString()); @@ -185,7 +177,7 @@ public class DataSourceLoginServiceTest executor.setName(executor.getName() + "-client"); _client.setExecutor(executor); AuthenticationStore authStore = _client.getAuthenticationStore(); - authStore.addAuthentication(new BasicAuthentication(URI.create(_baseUrl), __realm, user, pwd)); + authStore.addAuthentication(new BasicAuthentication(_baseUri, __realm, user, pwd)); _client.start(); } diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java index c57f4215018..0ca0727f3e1 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java @@ -25,6 +25,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.net.URI; import java.net.URLDecoder; import java.sql.Connection; import java.sql.DriverManager; @@ -43,36 +44,37 @@ import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.LoginService; import org.eclipse.jetty.security.authentication.BasicAuthenticator; import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.NetworkConnector; +import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; +import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.Loader; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; /** * DatabaseLoginServiceTestServer - * - * */ public class DatabaseLoginServiceTestServer { + private static final Logger LOG = Log.getLogger(DatabaseLoginServiceTestServer.class); protected Server _server; protected static String _protocol; - protected static String _baseUrl; + protected static URI _baseUri; protected LoginService _loginService; protected String _resourceBase; protected TestHandler _handler; protected static String _requestContent; - protected static boolean createDB(String homeDir, String fileName, String dbUrl) + protected static boolean createDB(String homeDir, File scriptFile, String dbUrl) { - File scriptFile = new File(fileName); try (FileInputStream fileStream = new FileInputStream(scriptFile)) { Loader.loadClass(fileStream.getClass(), "org.apache.derby.jdbc.EmbeddedDriver").newInstance(); @@ -85,6 +87,7 @@ public class DatabaseLoginServiceTestServer } catch (Exception e) { + LOG.warn("Unable to create EmbeddedDriver",e); return false; } } @@ -116,12 +119,11 @@ public class DatabaseLoginServiceTestServer baseRequest.setHandled(true); File file = new File(_resourcePath, URLDecoder.decode(request.getPathInfo())); - file.getParentFile().mkdirs(); - file.deleteOnExit(); + FS.ensureDirExists(file.getParentFile()); out = new FileOutputStream(file); - response.setStatus(HttpServletResponse.SC_CREATED); + response.setStatus(HttpServletResponse.SC_CREATED); } if (baseRequest.getMethod().equals("POST")) @@ -175,8 +177,8 @@ public class DatabaseLoginServiceTestServer { configureServer(); _server.start(); - int port = ((NetworkConnector)_server.getConnectors()[0]).getLocalPort(); - _baseUrl = _protocol+"://localhost:"+port+ "/"; + //_server.dumpStdErr(); + _baseUri = _server.getURI(); } public void stop() throws Exception @@ -184,9 +186,9 @@ public class DatabaseLoginServiceTestServer _server.stop(); } - public String getBaseUrl() + public URI getBaseUri() { - return _baseUrl; + return _baseUri; } public TestHandler getTestHandler() diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java index c7b3bbd5844..9daff655b73 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java @@ -38,6 +38,8 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.security.JDBCLoginService; import org.eclipse.jetty.security.LoginService; +import org.eclipse.jetty.toolchain.test.FS; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.thread.QueuedThreadPool; import org.junit.AfterClass; @@ -64,39 +66,38 @@ public class JdbcLoginServiceTest private static File _docRoot; private static HttpClient _client; private static String __realm = "JdbcRealm"; - private static String _baseUrl; + private static URI _baseUri; private static DatabaseLoginServiceTestServer _testServer; - - - @BeforeClass public static void setUp() throws Exception { - _docRoot = new File("target/test-output/docroot/"); - _docRoot.mkdirs(); - _docRoot.deleteOnExit(); + _docRoot = MavenTestingUtils.getTargetTestingDir(JdbcLoginServiceTest.class.getSimpleName()); + FS.ensureEmpty(_docRoot); File content = new File(_docRoot,"input.txt"); - FileOutputStream out = new FileOutputStream(content); - out.write(_content.getBytes("utf-8")); - out.close(); + + try (FileOutputStream out = new FileOutputStream(content)) + { + out.write(_content.getBytes("utf-8")); + } - File dbRoot = new File("target/test-output/derby"); + File dbRoot = new File(_docRoot, "derby"); String dbPath = dbRoot.getAbsolutePath(); System.setProperty("derby.system.home", dbPath); - if (dbRoot.exists()) - IO.delete(dbRoot); + FS.ensureEmpty(dbRoot); - dbRoot.mkdirs(); + File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); + DatabaseLoginServiceTestServer.createDB(dbPath, scriptFile, "jdbc:derby:jdbcrealm;create=true"); - DatabaseLoginServiceTestServer.createDB(dbPath, "src/test/resources/createdb.sql", "jdbc:derby:jdbcrealm;create=true"); - LoginService loginService = new JDBCLoginService(__realm, "./src/test/resources/jdbcrealm.properties"); + File jdbcRealmFile = MavenTestingUtils.getTestResourceFile("jdbcrealm.properties"); + + LoginService loginService = new JDBCLoginService(__realm, jdbcRealmFile.getAbsolutePath()); _testServer = new DatabaseLoginServiceTestServer(); _testServer.setResourceBase(_docRoot.getAbsolutePath()); _testServer.setLoginService(loginService); _testServer.start(); - _baseUrl = _testServer.getBaseUrl(); + _baseUri = _testServer.getBaseUri(); } @AfterClass @@ -117,7 +118,7 @@ public class JdbcLoginServiceTest { startClient(); - Request request = _client.newRequest(_baseUrl + "output.txt"); + Request request = _client.newRequest(_baseUri.resolve("output.txt")); request.method(HttpMethod.PUT); request.content(new BytesContentProvider(_content.getBytes())); ContentResponse response = request.send(); @@ -140,7 +141,7 @@ public class JdbcLoginServiceTest { startClient(); - ContentResponse response = _client.GET(_baseUrl + "input.txt"); + ContentResponse response = _client.GET(_baseUri.resolve("input.txt")); assertEquals(HttpServletResponse.SC_OK,response.getStatus()); assertEquals(_content, response.getContentAsString()); } @@ -158,7 +159,7 @@ public class JdbcLoginServiceTest { startClient(); - Request request = _client.newRequest(_baseUrl + "input.txt"); + Request request = _client.newRequest(_baseUri.resolve("input.txt")); request.method(HttpMethod.HEAD); ContentResponse response = request.send(); int responseStatus = response.getStatus(); @@ -177,7 +178,7 @@ public class JdbcLoginServiceTest { startClient(); - Request request = _client.newRequest(_baseUrl + "test"); + Request request = _client.newRequest(_baseUri.resolve("test")); request.method(HttpMethod.POST); request.content(new BytesContentProvider(_content.getBytes())); ContentResponse response = request.send(); @@ -198,7 +199,7 @@ public class JdbcLoginServiceTest executor.setName(executor.getName() + "-client"); _client.setExecutor(executor); AuthenticationStore authStore = _client.getAuthenticationStore(); - authStore.addAuthentication(new BasicAuthentication(URI.create(_baseUrl), __realm, "jetty", "jetty")); + authStore.addAuthentication(new BasicAuthentication(_baseUri, __realm, "jetty", "jetty")); _client.start(); } @@ -212,17 +213,13 @@ public class JdbcLoginServiceTest } } - - protected HttpClient getClient() { return _client; } - protected String getContent() { return _content; } - } diff --git a/tests/test-loginservice/src/test/resources/jetty-logging.properties b/tests/test-loginservice/src/test/resources/jetty-logging.properties new file mode 100644 index 00000000000..adf68c7c337 --- /dev/null +++ b/tests/test-loginservice/src/test/resources/jetty-logging.properties @@ -0,0 +1,3 @@ +org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog +#org.eclipse.jetty.LEVEL=DEBUG +#org.eclipse.jetty.server.LEVEL=DEBUG From 5c7f3e7c0d41831f59b58bf183c3c3066a2ebabb Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 18 Jul 2014 12:05:32 +1000 Subject: [PATCH 088/111] 432815 Fixed selector stop race --- .../src/main/java/org/eclipse/jetty/io/SelectorManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java index 7904dac1a43..0e6fd889da6 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java @@ -486,7 +486,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa LOG.debug("Starting {} on {}", _thread, this); while (isRunning()) select(); - runChanges(); + while(isStopping()) + runChanges(); } finally { From 30fcce1cdcb3b84380014339750eb881117178d0 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Fri, 18 Jul 2014 12:18:29 +1000 Subject: [PATCH 089/111] 434536 Improved Customizer javadoc --- .../java/org/eclipse/jetty/server/HttpConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java index 43bb4129b2a..f9c5054714f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java @@ -58,15 +58,15 @@ public class HttpConfiguration /* ------------------------------------------------------------ */ /** *

      An interface that allows a request object to be customized - * for a particular HTTP connector configuration. Unlike Filters, customiser are - * applied before a is submitted for request processing and can be specific to the + * for a particular HTTP connector configuration. Unlike Filters, customizer are + * applied before the request is submitted for processing and can be specific to the * connector on which the request was received. * *

      Typically Customizers perform tasks such as:

        *
      • process header fields that may be injected by a proxy or load balancer. *
      • setup attributes that may come from the connection/connector such as SSL Session IDs *
      • Allow a request to be marked as secure or authenticated if those have been offloaded - * and communicated by header, cookie or other out-of-band mechansism + * and communicated by header, cookie or other out-of-band mechanism *
      • Set request attributes/fields that are determined by the connector on which the * request was received *
      From dcee2bd5c45b458eb4a9548066c83c7831f24c31 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 17 Jul 2014 20:50:20 -0700 Subject: [PATCH 090/111] Adding dstest manual creation, not letting derby create it --- .../java/org/eclipse/jetty/DataSourceLoginServiceTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java index 45c748486b5..d8422e512ff 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java @@ -76,6 +76,9 @@ public class DataSourceLoginServiceTest System.setProperty("derby.system.home", dbPath); FS.ensureEmpty(_dbRoot); + File dstest = new File(_dbRoot, "dstest"); + FS.ensureEmpty(dstest); + File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); DatabaseLoginServiceTestServer.createDB(dbPath, scriptFile, "jdbc:derby:dstest;create=true"); From a09d05ee9d2cb38131e68db6bb018d5cd9f5d449 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 17 Jul 2014 20:55:58 -0700 Subject: [PATCH 091/111] Better cleanup of LoginService tests --- .../jetty/DataSourceLoginServiceTest.java | 9 ++++----- .../jetty/DatabaseLoginServiceTestServer.java | 18 ++++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java index d8422e512ff..c768be9b295 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java @@ -19,6 +19,7 @@ package org.eclipse.jetty; +import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; import java.io.File; @@ -27,6 +28,7 @@ import java.net.URI; import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; +import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletResponse; @@ -76,9 +78,6 @@ public class DataSourceLoginServiceTest System.setProperty("derby.system.home", dbPath); FS.ensureEmpty(_dbRoot); - File dstest = new File(_dbRoot, "dstest"); - FS.ensureEmpty(dstest); - File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); DatabaseLoginServiceTestServer.createDB(dbPath, scriptFile, "jdbc:derby:dstest;create=true"); @@ -125,7 +124,7 @@ public class DataSourceLoginServiceTest ds.setDatabaseName(db.getAbsolutePath()); org.eclipse.jetty.plus.jndi.Resource binding = new org.eclipse.jetty.plus.jndi.Resource(null, "dstest", ds); - + assertThat("Created binding for dstest", binding, notNullValue()); return loginService; } @@ -145,7 +144,7 @@ public class DataSourceLoginServiceTest String newpwd = String.valueOf(System.currentTimeMillis()); changePassword("jetty", newpwd); - Thread.currentThread().sleep(2*__cacheInterval); //pause to ensure cache invalidates + TimeUnit.MILLISECONDS.sleep(2*__cacheInterval); //pause to ensure cache invalidates startClient("jetty", newpwd); diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java index 0ca0727f3e1..b54e887ceff 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java @@ -19,6 +19,9 @@ package org.eclipse.jetty; +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -44,7 +47,6 @@ import org.eclipse.jetty.security.ConstraintSecurityHandler; import org.eclipse.jetty.security.LoginService; import org.eclipse.jetty.security.authentication.BasicAuthenticator; import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.NetworkConnector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.HandlerCollection; @@ -54,8 +56,6 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.toolchain.test.FS; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.Loader; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.security.Constraint; @@ -64,7 +64,6 @@ import org.eclipse.jetty.util.security.Constraint; */ public class DatabaseLoginServiceTestServer { - private static final Logger LOG = Log.getLogger(DatabaseLoginServiceTestServer.class); protected Server _server; protected static String _protocol; protected static URI _baseUri; @@ -73,7 +72,7 @@ public class DatabaseLoginServiceTestServer protected TestHandler _handler; protected static String _requestContent; - protected static boolean createDB(String homeDir, File scriptFile, String dbUrl) + protected static void createDB(String homeDir, File scriptFile, String dbUrl) throws Exception { try (FileInputStream fileStream = new FileInputStream(scriptFile)) { @@ -83,12 +82,7 @@ public class DatabaseLoginServiceTestServer OutputStream out = new ByteArrayOutputStream(); int result = ij.runScript(connection, fileStream, "UTF-8", out, "UTF-8"); - return (result==0); - } - catch (Exception e) - { - LOG.warn("Unable to create EmbeddedDriver",e); - return false; + assertThat("runScript result",result, is(0)); } } @@ -118,7 +112,7 @@ public class DatabaseLoginServiceTestServer { baseRequest.setHandled(true); - File file = new File(_resourcePath, URLDecoder.decode(request.getPathInfo())); + File file = new File(_resourcePath, URLDecoder.decode(request.getPathInfo(), "utf-8")); FS.ensureDirExists(file.getParentFile()); out = new FileOutputStream(file); From e9a77b6ac76f10e9caca3cee0d76a443df05ae3d Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 17 Jul 2014 21:57:57 -0700 Subject: [PATCH 092/111] Work with derby internal caching of "derby.system.home" system property. + Turns out, changing "derby.system.home" is unreliable. + Using 'directory' based jdbc urls for derby to avoid finding content in the classloader too. + Use a common derby "System Home" for all tests. + Segregate all database creation into own, test-specific, database. --- .../jetty/DataSourceLoginServiceTest.java | 10 ++-------- .../jetty/DatabaseLoginServiceTestServer.java | 17 ++++++++++++++++- .../org/eclipse/jetty/JdbcLoginServiceTest.java | 7 +------ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java index c768be9b295..b635cb59804 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java @@ -73,13 +73,8 @@ public class DataSourceLoginServiceTest out.write(_content.getBytes("utf-8")); out.close(); - _dbRoot = new File(_docRoot, "derby"); - String dbPath = _dbRoot.getAbsolutePath(); - System.setProperty("derby.system.home", dbPath); - FS.ensureEmpty(_dbRoot); - File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); - DatabaseLoginServiceTestServer.createDB(dbPath, scriptFile, "jdbc:derby:dstest;create=true"); + _dbRoot = DatabaseLoginServiceTestServer.createDB(scriptFile,"dstest"); _testServer = new DatabaseLoginServiceTestServer(); _testServer.setResourceBase(_docRoot.getAbsolutePath()); @@ -120,8 +115,7 @@ public class DataSourceLoginServiceTest //create a datasource EmbeddedDataSource ds = new EmbeddedDataSource(); - File db = new File (_dbRoot, "dstest"); - ds.setDatabaseName(db.getAbsolutePath()); + ds.setDatabaseName(_dbRoot.getAbsolutePath()); org.eclipse.jetty.plus.jndi.Resource binding = new org.eclipse.jetty.plus.jndi.Resource(null, "dstest", ds); assertThat("Created binding for dstest", binding, notNullValue()); diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java index b54e887ceff..322e407c65c 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java @@ -54,6 +54,7 @@ import org.eclipse.jetty.servlet.DefaultServlet; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.toolchain.test.FS; +import org.eclipse.jetty.toolchain.test.MavenTestingUtils; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.security.Constraint; @@ -70,10 +71,20 @@ public class DatabaseLoginServiceTestServer protected LoginService _loginService; protected String _resourceBase; protected TestHandler _handler; + private static File commonDerbySystemHome; protected static String _requestContent; - protected static void createDB(String homeDir, File scriptFile, String dbUrl) throws Exception + protected static File createDB(File scriptFile, String dbName) throws Exception { + if(commonDerbySystemHome == null) + { + commonDerbySystemHome = MavenTestingUtils.getTargetTestingDir("derby-system-common"); + FS.ensureEmpty(commonDerbySystemHome); + System.setProperty("derby.system.home", commonDerbySystemHome.getAbsolutePath()); + } + + String dbUrl = "jdbc:derby:directory:" + dbName + ";create=true"; + try (FileInputStream fileStream = new FileInputStream(scriptFile)) { Loader.loadClass(fileStream.getClass(), "org.apache.derby.jdbc.EmbeddedDriver").newInstance(); @@ -83,6 +94,10 @@ public class DatabaseLoginServiceTestServer int result = ij.runScript(connection, fileStream, "UTF-8", out, "UTF-8"); assertThat("runScript result",result, is(0)); + + File dbRoot = new File(commonDerbySystemHome, dbName); + assertThat("exists: " + dbRoot, dbRoot.exists(), is(true)); + return dbRoot; } } diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java index 9daff655b73..8ff5aa8d524 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java @@ -81,14 +81,9 @@ public class JdbcLoginServiceTest { out.write(_content.getBytes("utf-8")); } - - File dbRoot = new File(_docRoot, "derby"); - String dbPath = dbRoot.getAbsolutePath(); - System.setProperty("derby.system.home", dbPath); - FS.ensureEmpty(dbRoot); File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); - DatabaseLoginServiceTestServer.createDB(dbPath, scriptFile, "jdbc:derby:jdbcrealm;create=true"); + DatabaseLoginServiceTestServer.createDB(scriptFile,"jdbcrealm"); File jdbcRealmFile = MavenTestingUtils.getTestResourceFile("jdbcrealm.properties"); From d580c3279b5c99e2211063fbcc7e159228628981 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 18 Jul 2014 16:52:38 +1000 Subject: [PATCH 093/111] Make LoginService tests use single database and drop and recreate tables --- .../jetty/DataSourceLoginServiceTest.java | 33 ++++++++++---- .../jetty/DatabaseLoginServiceTestServer.java | 44 +++++++++---------- .../eclipse/jetty/JdbcLoginServiceTest.java | 27 +++++++++--- .../src/test/resources/droptables.sql | 6 +++ .../src/test/resources/jdbcrealm.properties | 2 +- 5 files changed, 72 insertions(+), 40 deletions(-) create mode 100644 tests/test-loginservice/src/test/resources/droptables.sql diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java index b635cb59804..8a695557b20 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DataSourceLoginServiceTest.java @@ -53,29 +53,42 @@ import org.junit.Test; */ public class DataSourceLoginServiceTest { + + public static final String _content = "This is some protected content"; private static File _docRoot; - private static File _dbRoot; private static HttpClient _client; private static String __realm = "DSRealm"; private static URI _baseUri; private static final int __cacheInterval = 200; private static DatabaseLoginServiceTestServer _testServer; + + + @BeforeClass public static void setUp() throws Exception { - _docRoot = MavenTestingUtils.getTargetTestingDir(DataSourceLoginServiceTest.class.getSimpleName()); - FS.ensureEmpty(_docRoot); - + + _docRoot = MavenTestingUtils.getTargetTestingDir("loginservice-test"); + FS.ensureDirExists(_docRoot); + File content = new File(_docRoot,"input.txt"); FileOutputStream out = new FileOutputStream(content); out.write(_content.getBytes("utf-8")); out.close(); - File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); - _dbRoot = DatabaseLoginServiceTestServer.createDB(scriptFile,"dstest"); + //clear previous runs + File scriptFile = MavenTestingUtils.getTestResourceFile("droptables.sql"); + int result = DatabaseLoginServiceTestServer.runscript(scriptFile); + //ignore result as derby spits errors for dropping tables that dont exist + + //create afresh + scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); + result = DatabaseLoginServiceTestServer.runscript(scriptFile); + assertThat("runScript result",result, is(0)); + _testServer = new DatabaseLoginServiceTestServer(); _testServer.setResourceBase(_docRoot.getAbsolutePath()); _testServer.setLoginService(configureLoginService()); @@ -115,7 +128,8 @@ public class DataSourceLoginServiceTest //create a datasource EmbeddedDataSource ds = new EmbeddedDataSource(); - ds.setDatabaseName(_dbRoot.getAbsolutePath()); + File db = new File (DatabaseLoginServiceTestServer.getDbRoot(), "loginservice"); + ds.setDatabaseName(db.getAbsolutePath()); org.eclipse.jetty.plus.jndi.Resource binding = new org.eclipse.jetty.plus.jndi.Resource(null, "dstest", ds); assertThat("Created binding for dstest", binding, notNullValue()); @@ -157,9 +171,10 @@ public class DataSourceLoginServiceTest protected void changePassword (String user, String newpwd) throws Exception { Loader.loadClass(this.getClass(), "org.apache.derby.jdbc.EmbeddedDriver").newInstance(); - try (Connection connection = DriverManager.getConnection("jdbc:derby:dstest", "", "")) + try (Connection connection = DriverManager.getConnection(DatabaseLoginServiceTestServer.__dbURL, "", ""); + Statement stmt = connection.createStatement()) { - Statement stmt = connection.createStatement(); + connection.setAutoCommit(true); stmt.executeUpdate("update users set pwd='"+newpwd+"' where username='"+user+"'"); } diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java index 322e407c65c..8f81f4e4bb7 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/DatabaseLoginServiceTestServer.java @@ -19,9 +19,6 @@ package org.eclipse.jetty; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -65,6 +62,7 @@ import org.eclipse.jetty.util.security.Constraint; */ public class DatabaseLoginServiceTestServer { + protected static String __dbURL = "jdbc:derby:loginservice;create=true"; protected Server _server; protected static String _protocol; protected static URI _baseUri; @@ -74,30 +72,30 @@ public class DatabaseLoginServiceTestServer private static File commonDerbySystemHome; protected static String _requestContent; - protected static File createDB(File scriptFile, String dbName) throws Exception + protected static File _dbRoot; + + + static { - if(commonDerbySystemHome == null) - { - commonDerbySystemHome = MavenTestingUtils.getTargetTestingDir("derby-system-common"); - FS.ensureEmpty(commonDerbySystemHome); - System.setProperty("derby.system.home", commonDerbySystemHome.getAbsolutePath()); - } - - String dbUrl = "jdbc:derby:directory:" + dbName + ";create=true"; - + _dbRoot = new File(MavenTestingUtils.getTargetTestingDir("loginservice-test"), "derby"); + FS.ensureDirExists(_dbRoot); + System.setProperty("derby.system.home", _dbRoot.getAbsolutePath()); + } + + public static File getDbRoot () + { + return _dbRoot; + } + + public static int runscript (File scriptFile) throws Exception + { + //System.err.println("Running script:"+scriptFile.getAbsolutePath()); try (FileInputStream fileStream = new FileInputStream(scriptFile)) { Loader.loadClass(fileStream.getClass(), "org.apache.derby.jdbc.EmbeddedDriver").newInstance(); - Connection connection = DriverManager.getConnection(dbUrl, "", ""); - - OutputStream out = new ByteArrayOutputStream(); - int result = ij.runScript(connection, fileStream, "UTF-8", out, "UTF-8"); - - assertThat("runScript result",result, is(0)); - - File dbRoot = new File(commonDerbySystemHome, dbName); - assertThat("exists: " + dbRoot, dbRoot.exists(), is(true)); - return dbRoot; + Connection connection = DriverManager.getConnection(__dbURL, "", ""); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + return ij.runScript(connection, fileStream, "UTF-8", out, "UTF-8"); } } diff --git a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java index 8ff5aa8d524..3a21d681492 100644 --- a/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java +++ b/tests/test-loginservice/src/test/java/org/eclipse/jetty/JdbcLoginServiceTest.java @@ -18,8 +18,10 @@ package org.eclipse.jetty; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; + + +import static org.hamcrest.Matchers.*; +import static org.junit.Assert.*; import java.io.File; import java.io.FileInputStream; @@ -49,6 +51,8 @@ import org.junit.Test; public class JdbcLoginServiceTest { + + private static String _content = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In quis felis nunc. "+ "Quisque suscipit mauris et ante auctor ornare rhoncus lacus aliquet. Pellentesque "+ @@ -68,22 +72,31 @@ public class JdbcLoginServiceTest private static String __realm = "JdbcRealm"; private static URI _baseUri; private static DatabaseLoginServiceTestServer _testServer; + + @BeforeClass public static void setUp() throws Exception { - _docRoot = MavenTestingUtils.getTargetTestingDir(JdbcLoginServiceTest.class.getSimpleName()); - FS.ensureEmpty(_docRoot); - + _docRoot = MavenTestingUtils.getTargetTestingDir("loginservice-test"); + FS.ensureDirExists(_docRoot); File content = new File(_docRoot,"input.txt"); + try (FileOutputStream out = new FileOutputStream(content)) { out.write(_content.getBytes("utf-8")); } + + //drop any tables that might have existed + File scriptFile = MavenTestingUtils.getTestResourceFile("droptables.sql"); + int result = DatabaseLoginServiceTestServer.runscript(scriptFile); + //ignore result, if the tables dont already exist, derby spits out an error - File scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); - DatabaseLoginServiceTestServer.createDB(scriptFile,"jdbcrealm"); + //create the tables afresh + scriptFile = MavenTestingUtils.getTestResourceFile("createdb.sql"); + result = DatabaseLoginServiceTestServer.runscript(scriptFile); + assertThat("runScript result",result, is(0)); File jdbcRealmFile = MavenTestingUtils.getTestResourceFile("jdbcrealm.properties"); diff --git a/tests/test-loginservice/src/test/resources/droptables.sql b/tests/test-loginservice/src/test/resources/droptables.sql new file mode 100644 index 00000000000..3a9132d83e6 --- /dev/null +++ b/tests/test-loginservice/src/test/resources/droptables.sql @@ -0,0 +1,6 @@ +DROP TABLE roles; + +DROP TABLE users; + +DROP TABLE user_roles; + diff --git a/tests/test-loginservice/src/test/resources/jdbcrealm.properties b/tests/test-loginservice/src/test/resources/jdbcrealm.properties index bb79638ed60..9045aa1484a 100644 --- a/tests/test-loginservice/src/test/resources/jdbcrealm.properties +++ b/tests/test-loginservice/src/test/resources/jdbcrealm.properties @@ -1,5 +1,5 @@ jdbcdriver = org.apache.derby.jdbc.EmbeddedDriver -url = jdbc:derby:jdbcrealm +url = jdbc:derby:loginservice username = password = usertable = users From b38a978eacd5354b0d0ccc60604244d2d3df27ea Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Sat, 19 Jul 2014 00:46:19 +1000 Subject: [PATCH 094/111] 439067 Improved graceful stop timeout handling --- .../src/main/java/org/eclipse/jetty/server/Server.java | 2 +- .../test/java/org/eclipse/jetty/server/GracefulStopTest.java | 4 +++- .../src/main/java/org/eclipse/jetty/util/MultiException.java | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index 226b0a75990..05295cbaef0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -419,7 +419,7 @@ public class Server extends HandlerWrapper implements Attributes } catch (Exception e) { - mex.add(e.getCause()); + mex.add(e); } } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java index 01ef24fecd5..6943f768ce9 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java @@ -30,6 +30,8 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.handler.AbstractHandler; import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.StdErrLog; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Before; @@ -96,7 +98,7 @@ public class GracefulStopTest } catch (Exception e) { - e.printStackTrace(); + //e.printStackTrace(); } } }.start(); diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java index 2e71f3c58cc..f5aa27df7ec 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java @@ -43,10 +43,11 @@ public class MultiException extends Exception /* ------------------------------------------------------------ */ public void add(Throwable e) { + if (e==null) + throw new IllegalArgumentException(); + if(nested == null) - { nested = new ArrayList<>(); - } if (e instanceof MultiException) { From c72649e150608d28a9202c22905ebddc9c047ff4 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Sat, 19 Jul 2014 18:55:02 +1000 Subject: [PATCH 095/111] 435653 encode async dispatched requestURI --- .../src/main/java/org/eclipse/jetty/server/Server.java | 6 +++--- .../java/org/eclipse/jetty/servlet/AsyncServletTest.java | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java index 05295cbaef0..ce4bdd9097c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Server.java @@ -18,6 +18,7 @@ package org.eclipse.jetty.server; +import java.awt.geom.PathIterator; import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.InetAddress; @@ -513,16 +514,15 @@ public class Server extends HandlerWrapper implements Attributes final Request baseRequest=connection.getRequest(); final String path=event.getPath(); - + if (path!=null) { // this is a dispatch with a path ServletContext context=event.getServletContext(); - HttpURI uri = new HttpURI(URIUtil.encodePath(context==null?path:URIUtil.addPaths(context.getContextPath(),path))); + HttpURI uri = new HttpURI(URIUtil.addPaths(context==null?null:context.getContextPath(), path)); baseRequest.setUri(uri); baseRequest.setRequestURI(null); baseRequest.setPathInfo(uri.getDecodedPath()); - if (uri.getQuery()!=null) baseRequest.mergeQueryParameters(uri.getQuery(), true); //we have to assume dispatch path and query are UTF8 } diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java index 288cf326349..5a50e834b2b 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java @@ -51,6 +51,7 @@ import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.toolchain.test.AdvancedRunner; import org.eclipse.jetty.util.IO; +import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.hamcrest.Matchers; import org.junit.After; @@ -706,7 +707,13 @@ public class AsyncServletTest { ((HttpServletResponse)async.getResponse()).addHeader("history","resume"); if (path!=null) - async.dispatch(path); + { + int q=path.indexOf('?'); + String uriInContext=(q>=0) + ?URIUtil.encodePath(path.substring(0,q))+path.substring(q) + :URIUtil.encodePath(path); + async.dispatch(uriInContext); + } else async.dispatch(); } From 816b85ea4dbc8513c71d7862161aeda5a2b9c02c Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Fri, 18 Jul 2014 15:57:23 +0200 Subject: [PATCH 096/111] 439895 - No event callback should be invoked after the "failure" callback. Fixed HttpSender and HttpReceiver to use a non-blocking collaborative mechanism to notify callbacks. Only the "failed" callback can run concurrently with other callbacks. No other callback can run after the "complete" callback: a failure concurrent with another callback will notify the "failed" callback, finish the running callback and only then invoke the "complete" callback. --- .../eclipse/jetty/client/HttpReceiver.java | 102 ++++++--- .../org/eclipse/jetty/client/HttpSender.java | 136 +++++++----- .../jetty/client/http/HttpSenderOverHTTP.java | 5 +- .../util/InputStreamResponseListener.java | 41 ++-- .../HttpResponseConcurrentAbortTest.java | 198 ++++++++++++++++++ 5 files changed, 384 insertions(+), 98 deletions(-) create mode 100644 jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java index ec902529240..356413a04ce 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java @@ -49,9 +49,8 @@ import org.eclipse.jetty.util.log.Logger; * is available
      • *
    • {@link #responseHeader(HttpExchange, HttpField)}, when a HTTP field is available
      • *
    • {@link #responseHeaders(HttpExchange)}, when all HTTP headers are available
      • - *
    • {@link #responseContent(HttpExchange, ByteBuffer, Callback)}, when HTTP content is available; this is the only - * method that may be invoked multiple times with different buffers containing different content
      • - *
    • {@link #responseSuccess(HttpExchange)}, when the response is complete
      • + *
    • {@link #responseContent(HttpExchange, ByteBuffer, Callback)}, when HTTP content is available
      • + *
    • {@link #responseSuccess(HttpExchange)}, when the response is successful
      • * * At any time, subclasses may invoke {@link #responseFailure(Throwable)} to indicate that the response has failed * (for example, because of I/O exceptions). @@ -69,7 +68,8 @@ public abstract class HttpReceiver private final AtomicReference responseState = new AtomicReference<>(ResponseState.IDLE); private final HttpChannel channel; - private volatile ContentDecoder decoder; + private ContentDecoder decoder; + private Throwable failure; protected HttpReceiver(HttpChannel channel) { @@ -104,7 +104,7 @@ public abstract class HttpReceiver */ protected boolean responseBegin(HttpExchange exchange) { - if (!updateResponseState(ResponseState.IDLE, ResponseState.BEGIN)) + if (!updateResponseState(ResponseState.IDLE, ResponseState.TRANSIENT)) return false; HttpConversation conversation = exchange.getConversation(); @@ -127,6 +127,9 @@ public abstract class HttpReceiver ResponseNotifier notifier = destination.getResponseNotifier(); notifier.notifyBegin(conversation.getResponseListeners(), response); + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.BEGIN)) + terminateResponse(exchange, failure); + return true; } @@ -152,7 +155,7 @@ public abstract class HttpReceiver case BEGIN: case HEADER: { - if (updateResponseState(current, ResponseState.HEADER)) + if (updateResponseState(current, ResponseState.TRANSIENT)) break out; break; } @@ -188,6 +191,9 @@ public abstract class HttpReceiver } } + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.HEADER)) + terminateResponse(exchange, failure); + return true; } @@ -228,7 +234,7 @@ public abstract class HttpReceiver case BEGIN: case HEADER: { - if (updateResponseState(current, ResponseState.HEADERS)) + if (updateResponseState(current, ResponseState.TRANSIENT)) break out; break; } @@ -261,6 +267,9 @@ public abstract class HttpReceiver } } + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.HEADERS)) + terminateResponse(exchange, failure); + return true; } @@ -283,7 +292,7 @@ public abstract class HttpReceiver case HEADERS: case CONTENT: { - if (updateResponseState(current, ResponseState.CONTENT)) + if (updateResponseState(current, ResponseState.TRANSIENT)) break out; break; } @@ -312,6 +321,9 @@ public abstract class HttpReceiver ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifyContent(exchange.getConversation().getResponseListeners(), response, buffer, callback); + if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.CONTENT)) + terminateResponse(exchange, failure); + return true; } @@ -332,16 +344,17 @@ public abstract class HttpReceiver if (!completed) return false; - // Reset to be ready for another response + responseState.set(ResponseState.IDLE); + + // Reset to be ready for another response. reset(); // Mark atomically the response as terminated and succeeded, // with respect to concurrency between request and response. - // If there is a non-null result, then both sender and - // receiver are reset and ready to be reused, and the - // connection closed/pooled (depending on the transport). Result result = exchange.terminateResponse(null); + // It is important to notify *after* we reset and terminate + // because the notification may trigger another request/response. HttpResponse response = exchange.getResponse(); if (LOG.isDebugEnabled()) LOG.debug("Response success {}", response); @@ -349,17 +362,7 @@ public abstract class HttpReceiver ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifySuccess(listeners, response); - if (result != null) - { - boolean ordered = getHttpDestination().getHttpClient().isStrictEventOrdering(); - if (!ordered) - channel.exchangeTerminated(result); - if (LOG.isDebugEnabled()) - LOG.debug("Request/Response succeeded {}", response); - notifier.notifyComplete(listeners, result); - if (ordered) - channel.exchangeTerminated(result); - } + terminateResponse(exchange, result); return true; } @@ -388,7 +391,20 @@ public abstract class HttpReceiver if (!completed) return false; - // Dispose to avoid further responses + this.failure = failure; + + // Update the state to avoid more response processing. + boolean fail; + while (true) + { + ResponseState current = responseState.get(); + if (updateResponseState(current, ResponseState.FAILURE)) + { + fail = current != ResponseState.TRANSIENT; + break; + } + } + dispose(); // Mark atomically the response as terminated and failed, @@ -402,19 +418,45 @@ public abstract class HttpReceiver ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifyFailure(listeners, response, failure); + if (fail) + { + terminateResponse(exchange, result); + } + else + { + if (LOG.isDebugEnabled()) + LOG.debug("Concurrent failure: response termination skipped, performed by helpers"); + } + + return true; + } + + private void terminateResponse(HttpExchange exchange, Throwable failure) + { + Result result = exchange.terminateResponse(failure); + terminateResponse(exchange, result); + } + + private void terminateResponse(HttpExchange exchange, Result result) + { + HttpResponse response = exchange.getResponse(); + + if (LOG.isDebugEnabled()) + LOG.debug("Response complete {}", response); + if (result != null) { boolean ordered = getHttpDestination().getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); if (LOG.isDebugEnabled()) - LOG.debug("Request/Response failed {}", response); + LOG.debug("Request/Response {} {}", failure == null ? "succeeded" : "failed", response); + List listeners = exchange.getConversation().getResponseListeners(); + ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); notifier.notifyComplete(listeners, result); if (ordered) channel.exchangeTerminated(result); } - - return true; } /** @@ -427,7 +469,6 @@ public abstract class HttpReceiver protected void reset() { decoder = null; - responseState.set(ResponseState.IDLE); } /** @@ -440,7 +481,6 @@ public abstract class HttpReceiver protected void dispose() { decoder = null; - responseState.set(ResponseState.FAILURE); } public boolean abort(Throwable cause) @@ -464,6 +504,10 @@ public abstract class HttpReceiver */ private enum ResponseState { + /** + * One of the response*() methods is being executed. + */ + TRANSIENT, /** * The response is not yet received, the initial state */ diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java index 26302064d62..85d4d0b55ad 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java @@ -65,7 +65,8 @@ public abstract class HttpSender implements AsyncContentProvider.Listener private final IteratingCallback contentCallback = new ContentCallback(); private final Callback lastCallback = new LastContentCallback(); private final HttpChannel channel; - private volatile HttpContent content; + private HttpContent content; + private Throwable failure; protected HttpSender(HttpChannel channel) { @@ -197,34 +198,40 @@ public abstract class HttpSender implements AsyncContentProvider.Listener protected boolean queuedToBegin(Request request) { - if (!updateRequestState(RequestState.QUEUED, RequestState.BEGIN)) + if (!updateRequestState(RequestState.QUEUED, RequestState.TRANSIENT)) return false; if (LOG.isDebugEnabled()) LOG.debug("Request begin {}", request); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyBegin(request); + if (!updateRequestState(RequestState.TRANSIENT, RequestState.BEGIN)) + terminateRequest(getHttpExchange(), failure, false); return true; } protected boolean beginToHeaders(Request request) { - if (!updateRequestState(RequestState.BEGIN, RequestState.HEADERS)) + if (!updateRequestState(RequestState.BEGIN, RequestState.TRANSIENT)) return false; if (LOG.isDebugEnabled()) LOG.debug("Request headers {}{}{}", request, System.getProperty("line.separator"), request.getHeaders().toString().trim()); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyHeaders(request); + if (!updateRequestState(RequestState.TRANSIENT, RequestState.HEADERS)) + terminateRequest(getHttpExchange(), failure, false); return true; } protected boolean headersToCommit(Request request) { - if (!updateRequestState(RequestState.HEADERS, RequestState.COMMIT)) + if (!updateRequestState(RequestState.HEADERS, RequestState.TRANSIENT)) return false; if (LOG.isDebugEnabled()) LOG.debug("Request committed {}", request); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyCommit(request); + if (!updateRequestState(RequestState.TRANSIENT, RequestState.COMMIT)) + terminateRequest(getHttpExchange(), failure, true); return true; } @@ -236,21 +243,19 @@ public abstract class HttpSender implements AsyncContentProvider.Listener case COMMIT: case CONTENT: { - if (!updateRequestState(current, RequestState.CONTENT)) + if (!updateRequestState(current, RequestState.TRANSIENT_CONTENT)) return false; if (LOG.isDebugEnabled()) LOG.debug("Request content {}{}{}", request, System.getProperty("line.separator"), BufferUtil.toDetailString(content)); RequestNotifier notifier = getHttpChannel().getHttpDestination().getRequestNotifier(); notifier.notifyContent(request, content); + if (!updateRequestState(RequestState.TRANSIENT_CONTENT, RequestState.CONTENT)) + terminateRequest(getHttpExchange(), failure, true); return true; } - case FAILURE: - { - return false; - } default: { - throw new IllegalStateException(current.toString()); + return false; } } } @@ -269,43 +274,28 @@ public abstract class HttpSender implements AsyncContentProvider.Listener if (!completed) return false; - // Reset to be ready for another request + requestState.set(RequestState.QUEUED); + + // Reset to be ready for another request. reset(); // Mark atomically the request as terminated and succeeded, // with respect to concurrency between request and response. Result result = exchange.terminateRequest(null); - // It is important to notify completion *after* we reset because - // the notification may trigger another request/response Request request = exchange.getRequest(); if (LOG.isDebugEnabled()) LOG.debug("Request success {}", request); HttpDestination destination = getHttpChannel().getHttpDestination(); destination.getRequestNotifier().notifySuccess(exchange.getRequest()); - if (result != null) - { - boolean ordered = destination.getHttpClient().isStrictEventOrdering(); - if (!ordered) - channel.exchangeTerminated(result); - if (LOG.isDebugEnabled()) - LOG.debug("Request/Response succeded {}", request); - HttpConversation conversation = exchange.getConversation(); - destination.getResponseNotifier().notifyComplete(conversation.getResponseListeners(), result); - if (ordered) - channel.exchangeTerminated(result); - } + terminateRequest(exchange, null, true, result); return true; } - case FAILURE: - { - return false; - } default: { - throw new IllegalStateException(current.toString()); + return false; } } } @@ -322,8 +312,22 @@ public abstract class HttpSender implements AsyncContentProvider.Listener if (!completed) return false; - // Dispose to avoid further requests - RequestState requestState = dispose(); + this.failure = failure; + + // Update the state to avoid more request processing. + RequestState current; + boolean fail; + while (true) + { + current = requestState.get(); + if (updateRequestState(current, RequestState.FAILURE)) + { + fail = current != RequestState.TRANSIENT && current != RequestState.TRANSIENT_CONTENT; + break; + } + } + + dispose(); // Mark atomically the request as terminated and failed, // with respect to concurrency between request and response. @@ -335,8 +339,36 @@ public abstract class HttpSender implements AsyncContentProvider.Listener HttpDestination destination = getHttpChannel().getHttpDestination(); destination.getRequestNotifier().notifyFailure(request, failure); - boolean notCommitted = isBeforeCommit(requestState); - if (result == null && notCommitted && request.getAbortCause() == null) + if (fail) + { + terminateRequest(exchange, failure, !isBeforeCommit(current), result); + } + else + { + if (LOG.isDebugEnabled()) + LOG.debug("Concurrent failure: request termination skipped, performed by helpers"); + } + + return true; + } + + private void terminateRequest(HttpExchange exchange, Throwable failure, boolean committed) + { + if (exchange != null) + { + Result result = exchange.terminateRequest(failure); + terminateRequest(exchange, failure, committed, result); + } + } + + private void terminateRequest(HttpExchange exchange, Throwable failure, boolean committed, Result result) + { + Request request = exchange.getRequest(); + + if (LOG.isDebugEnabled()) + LOG.debug("Terminating request {}", request); + + if (failure != null && !committed && result == null && request.getAbortCause() == null) { // Complete the response from here if (exchange.responseComplete()) @@ -349,18 +381,17 @@ public abstract class HttpSender implements AsyncContentProvider.Listener if (result != null) { + HttpDestination destination = getHttpChannel().getHttpDestination(); boolean ordered = destination.getHttpClient().isStrictEventOrdering(); if (!ordered) channel.exchangeTerminated(result); if (LOG.isDebugEnabled()) - LOG.debug("Request/Response failed {}", request); + LOG.debug("Request/Response {} {}", failure == null ? "succeeded" : "failed", request); HttpConversation conversation = exchange.getConversation(); destination.getResponseNotifier().notifyComplete(conversation.getResponseListeners(), result); if (ordered) channel.exchangeTerminated(result); } - - return true; } /** @@ -398,23 +429,14 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { content.close(); content = null; - requestState.set(RequestState.QUEUED); senderState.set(SenderState.IDLE); } - protected RequestState dispose() + protected void dispose() { - while (true) - { - RequestState current = requestState.get(); - if (updateRequestState(current, RequestState.FAILURE)) - { - HttpContent content = this.content; - if (content != null) - content.close(); - return current; - } - } + HttpContent content = this.content; + if (content != null) + content.close(); } public void proceed(HttpExchange exchange, Throwable failure) @@ -485,7 +507,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener return abortable && anyToFailure(failure); } - protected boolean updateRequestState(RequestState from, RequestState to) + private boolean updateRequestState(RequestState from, RequestState to) { boolean updated = requestState.compareAndSet(from, to); if (!updated) @@ -505,6 +527,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { switch (requestState) { + case TRANSIENT: case QUEUED: case BEGIN: case HEADERS: @@ -518,6 +541,7 @@ public abstract class HttpSender implements AsyncContentProvider.Listener { switch (requestState) { + case TRANSIENT_CONTENT: case COMMIT: case CONTENT: return true; @@ -534,8 +558,16 @@ public abstract class HttpSender implements AsyncContentProvider.Listener /** * The request states {@link HttpSender} goes through when sending a request. */ - protected enum RequestState + private enum RequestState { + /** + * One of the state transition methods is being executed. + */ + TRANSIENT, + /** + * The content transition method is being executed. + */ + TRANSIENT_CONTENT, /** * The request is queued, the initial state */ diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java index 6b0364d1803..c8ce04168ab 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java @@ -196,12 +196,11 @@ public class HttpSenderOverHTTP extends HttpSender } @Override - protected RequestState dispose() + protected void dispose() { generator.abort(); - RequestState result = super.dispose(); + super.dispose(); shutdownOutput(); - return result; } private void shutdownOutput() diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java index 5a68967df37..789b525365d 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/util/InputStreamResponseListener.java @@ -144,28 +144,41 @@ public class InputStreamResponseListener extends Listener.Adapter } } + @Override + public void onSuccess(Response response) + { + if (LOG.isDebugEnabled()) + LOG.debug("Queuing end of content {}{}", EOF, ""); + queue.offer(EOF); + signal(); + } + + @Override + public void onFailure(Response response, Throwable failure) + { + fail(failure); + signal(); + } + @Override public void onComplete(Result result) { + if (result.isFailed() && failure == null) + fail(result.getFailure()); this.result = result; - if (result.isSucceeded()) - { - if (LOG.isDebugEnabled()) - LOG.debug("Queuing end of content {}{}", EOF, ""); - queue.offer(EOF); - } - else - { - if (LOG.isDebugEnabled()) - LOG.debug("Queuing failure {} {}", FAILURE, failure); - queue.offer(FAILURE); - this.failure = result.getFailure(); - responseLatch.countDown(); - } resultLatch.countDown(); signal(); } + private void fail(Throwable failure) + { + if (LOG.isDebugEnabled()) + LOG.debug("Queuing failure {} {}", FAILURE, failure); + queue.offer(FAILURE); + this.failure = failure; + responseLatch.countDown(); + } + protected boolean await() { try diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java new file mode 100644 index 00000000000..a6089421150 --- /dev/null +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpResponseConcurrentAbortTest.java @@ -0,0 +1,198 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.client; + +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.client.api.Response; +import org.eclipse.jetty.client.api.Result; +import org.eclipse.jetty.http.HttpField; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.junit.Assert; +import org.junit.Test; + +public class HttpResponseConcurrentAbortTest extends AbstractHttpClientServerTest +{ + private final CountDownLatch callbackLatch = new CountDownLatch(1); + private final CountDownLatch failureLatch = new CountDownLatch(1); + private final CountDownLatch completeLatch = new CountDownLatch(1); + private final AtomicBoolean success = new AtomicBoolean(); + + public HttpResponseConcurrentAbortTest(SslContextFactory sslContextFactory) + { + super(sslContextFactory); + } + + @Test + public void testAbortOnBegin() throws Exception + { + start(new EmptyServerHandler()); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseBegin(new Response.BeginListener() + { + @Override + public void onBegin(Response response) + { + abort(response); + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(6, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + @Test + public void testAbortOnHeader() throws Exception + { + start(new EmptyServerHandler()); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseHeader(new Response.HeaderListener() + { + @Override + public boolean onHeader(Response response, HttpField field) + { + abort(response); + return true; + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + @Test + public void testAbortOnHeaders() throws Exception + { + start(new EmptyServerHandler()); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseHeaders(new Response.HeadersListener() + { + @Override + public void onHeaders(Response response) + { + abort(response); + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + @Test + public void testAbortOnContent() throws Exception + { + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + OutputStream output = response.getOutputStream(); + output.write(1); + output.flush(); + } + }); + + client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .onResponseContent(new Response.ContentListener() + { + @Override + public void onContent(Response response, ByteBuffer content) + { + abort(response); + } + }) + .send(new TestResponseListener()); + Assert.assertTrue(callbackLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(completeLatch.await(5, TimeUnit.SECONDS)); + Assert.assertTrue(success.get()); + } + + private void abort(final Response response) + { + Logger logger = Log.getLogger(getClass()); + + new Thread("abort") + { + @Override + public void run() + { + response.abort(new Exception()); + } + }.start(); + + try + { + // The failure callback must be executed asynchronously. + boolean latched = failureLatch.await(4, TimeUnit.SECONDS); + success.set(latched); + logger.info("SIMON - STEP 1"); + + // The complete callback must not be executed + // until we return from this callback. + latched = completeLatch.await(1, TimeUnit.SECONDS); + success.set(!latched); + logger.info("SIMON - STEP 2"); + + callbackLatch.countDown(); + } + catch (InterruptedException x) + { + throw new RuntimeException(x); + } + } + + private class TestResponseListener extends Response.Listener.Adapter + { + @Override + public void onFailure(Response response, Throwable failure) + { + failureLatch.countDown(); + } + + @Override + public void onComplete(Result result) + { + Assert.assertTrue(result.isFailed()); + completeLatch.countDown(); + } + } +} From cae4204150572d7e5c38085b682b28af707305b8 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 21 Jul 2014 16:46:32 +0200 Subject: [PATCH 097/111] 440020 - ProxyServlet does not handle correctly failure after committed response to client. Fixed by introducing a request attribute "org.eclipse.jetty.server .Response.failure" used by HttpChannel to immediately close the connection when it sees it. --- .../org/eclipse/jetty/proxy/ProxyServlet.java | 10 +- .../eclipse/jetty/proxy/ProxyServletTest.java | 157 +++++++++++++++++- .../org/eclipse/jetty/server/HttpChannel.java | 21 ++- .../eclipse/jetty/server/HttpConnection.java | 2 +- 4 files changed, 185 insertions(+), 5 deletions(-) diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java index e18e95dfa10..3e93592d8db 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java @@ -34,6 +34,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.servlet.AsyncContext; import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.UnavailableException; import javax.servlet.http.HttpServlet; @@ -559,8 +560,15 @@ public class ProxyServlet extends HttpServlet protected void onResponseFailure(HttpServletRequest request, HttpServletResponse response, Response proxyResponse, Throwable failure) { _log.debug(getRequestId(request) + " proxying failed", failure); - if (!response.isCommitted()) + if (response.isCommitted()) { + request.setAttribute("org.eclipse.jetty.server.Response.failure", failure); + AsyncContext asyncContext = request.getAsyncContext(); + asyncContext.complete(); + } + else + { + response.resetBuffer(); if (failure instanceof TimeoutException) response.setStatus(HttpServletResponse.SC_GATEWAY_TIMEOUT); else diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java index 5884a14f829..1eec08a483f 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java @@ -19,8 +19,10 @@ package org.eclipse.jetty.proxy; import java.io.ByteArrayOutputStream; +import java.io.EOFException; import java.io.IOException; import java.io.InputStream; +import java.io.InterruptedIOException; import java.io.OutputStream; import java.io.PrintWriter; import java.net.ConnectException; @@ -43,6 +45,7 @@ import javax.servlet.AsyncContext; import javax.servlet.AsyncEvent; import javax.servlet.AsyncListener; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -55,9 +58,13 @@ import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Request; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Result; +import org.eclipse.jetty.client.http.HttpDestinationOverHTTP; import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.client.util.BytesContentProvider; +import org.eclipse.jetty.client.util.InputStreamResponseListener; import org.eclipse.jetty.http.HttpMethod; +import org.eclipse.jetty.server.HttpConfiguration; +import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; @@ -112,7 +119,12 @@ public class ProxyServletTest private void prepareProxy(Map initParams) throws Exception { proxy = new Server(); - proxyConnector = new ServerConnector(proxy); + + HttpConfiguration configuration = new HttpConfiguration(); + String value = initParams.get("outputBufferSize"); + if (value != null) + configuration.setOutputBufferSize(Integer.valueOf(value)); + proxyConnector = new ServerConnector(proxy, new HttpConnectionFactory(configuration)); proxy.addConnector(proxyConnector); ServletContextHandler proxyCtx = new ServletContextHandler(proxy, "/", true, false); @@ -899,5 +911,148 @@ public class ProxyServletTest Assert.assertTrue(response3.getHeaders().containsKey(PROXIED_HEADER)); } + @Test + public void testProxyRequestFailureInTheMiddleOfProxyingSmallContent() throws Exception + { + final long proxyTimeout = 1000; + Map proxyParams = new HashMap<>(); + proxyParams.put("timeout", String.valueOf(proxyTimeout)); + prepareProxy(proxyParams); + + final CountDownLatch chunk1Latch = new CountDownLatch(1); + final int chunk1 = 'q'; + final int chunk2 = 'w'; + prepareServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + ServletOutputStream output = response.getOutputStream(); + output.write(chunk1); + response.flushBuffer(); + + // Wait for the client to receive this chunk. + await(chunk1Latch, 5000); + + // Send second chunk, must not be received by proxy. + output.write(chunk2); + } + + private boolean await(CountDownLatch latch, long ms) throws IOException + { + try + { + return latch.await(ms, TimeUnit.MILLISECONDS); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } + } + }); + + HttpClient client = prepareClient(); + InputStreamResponseListener listener = new InputStreamResponseListener(); + int port = serverConnector.getLocalPort(); + client.newRequest("localhost", port).send(listener); + + // Make the proxy request fail; given the small content, the + // proxy-to-client response is not committed yet so it will be reset. + TimeUnit.MILLISECONDS.sleep(2 * proxyTimeout); + + Response response = listener.get(5, TimeUnit.SECONDS); + Assert.assertEquals(504, response.getStatus()); + + // Make sure there is no content, as the proxy-to-client response has been reset. + InputStream input = listener.getInputStream(); + Assert.assertEquals(-1, input.read()); + + chunk1Latch.countDown(); + + // Result succeeds because a 504 is a valid HTTP response. + Result result = listener.await(5, TimeUnit.SECONDS); + Assert.assertTrue(result.isSucceeded()); + + // Make sure the proxy does not receive chunk2. + Assert.assertEquals(-1, input.read()); + + HttpDestinationOverHTTP destination = (HttpDestinationOverHTTP)client.getDestination("http", "localhost", port); + Assert.assertEquals(0, destination.getConnectionPool().getIdleConnections().size()); + } + + @Test + public void testProxyRequestFailureInTheMiddleOfProxyingBigContent() throws Exception + { + final long proxyTimeout = 1000; + int outputBufferSize = 1024; + Map proxyParams = new HashMap<>(); + proxyParams.put("timeout", String.valueOf(proxyTimeout)); + proxyParams.put("outputBufferSize", String.valueOf(outputBufferSize)); + prepareProxy(proxyParams); + + final CountDownLatch chunk1Latch = new CountDownLatch(1); + final byte[] chunk1 = new byte[outputBufferSize]; + new Random().nextBytes(chunk1); + final int chunk2 = 'w'; + prepareServer(new HttpServlet() + { + @Override + protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException + { + ServletOutputStream output = response.getOutputStream(); + output.write(chunk1); + response.flushBuffer(); + + // Wait for the client to receive this chunk. + await(chunk1Latch, 5000); + + // Send second chunk, must not be received by proxy. + output.write(chunk2); + } + + private boolean await(CountDownLatch latch, long ms) throws IOException + { + try + { + return latch.await(ms, TimeUnit.MILLISECONDS); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } + } + }); + + HttpClient client = prepareClient(); + InputStreamResponseListener listener = new InputStreamResponseListener(); + int port = serverConnector.getLocalPort(); + client.newRequest("localhost", port).send(listener); + + Response response = listener.get(5, TimeUnit.SECONDS); + Assert.assertEquals(200, response.getStatus()); + + InputStream input = listener.getInputStream(); + for (int i = 0; i < chunk1.length; ++i) + Assert.assertEquals(chunk1[i] & 0xFF, input.read()); + + TimeUnit.MILLISECONDS.sleep(2 * proxyTimeout); + + chunk1Latch.countDown(); + + try + { + // Make sure the proxy does not receive chunk2. + input.read(); + Assert.fail(); + } + catch (EOFException x) + { + // Expected + } + + HttpDestinationOverHTTP destination = (HttpDestinationOverHTTP)client.getDestination("http", "localhost", port); + Assert.assertEquals(0, destination.getConnectionPool().getIdleConnections().size()); + } + // TODO: test proxy authentication } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java index e86001ed542..e6abb983113 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java @@ -397,10 +397,27 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H _state.completed(); if (!_response.isCommitted() && !_request.isHandled()) + { _response.sendError(404); + } else - // Complete generating the response - _response.closeOutput(); + { + // There is no way in the Servlet API to directly close a connection, + // so we rely on applications to pass this attribute to signal they + // want to hard close the connection, without even closing the output. + Object failure = _request.getAttribute("org.eclipse.jetty.server.Response.failure"); + if (failure != null) + { + if (LOG.isDebugEnabled()) + LOG.debug("Explicit response failure", failure); + failed(); + } + else + { + // Complete generating the response + _response.closeOutput(); + } + } } catch(EofException|ClosedChannelException e) { diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index 3ccb663e40c..ca8ea64e9be 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -539,9 +539,9 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http @Override public void failed() { + _generator.setPersistent(false); getEndPoint().shutdownOutput(); } - @Override public boolean messageComplete() From 52172fb3c4a650f5a5be17f02e17a12e9481ee1b Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 21 Jul 2014 19:21:44 +0200 Subject: [PATCH 098/111] 440038 - Content decoding may fail. Properly looping around the decoding step to ensure that the encoded content is fully consumed. --- .../jetty/client/GZIPContentDecoder.java | 2 +- .../eclipse/jetty/client/HttpReceiver.java | 54 ++++-- .../jetty/client/HttpClientGZIPTest.java | 156 ++++++++++++++++++ .../eclipse/jetty/client/HttpClientTest.java | 28 ---- .../client/http/HttpReceiverOverHTTPTest.java | 24 +-- 5 files changed, 200 insertions(+), 64 deletions(-) create mode 100644 jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java b/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java index ab8f2a40b5f..6a7d6fa8ac0 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/GZIPContentDecoder.java @@ -251,7 +251,7 @@ public class GZIPContentDecoder implements ContentDecoder else { // Accumulate inflated bytes and loop to see if we have finished - byte[] newOutput = Arrays.copyOf(output, output.length+decoded); + byte[] newOutput = Arrays.copyOf(output, output.length + decoded); System.arraycopy(bytes, 0, newOutput, output.length, decoded); output = newOutput; } diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java index 356413a04ce..4b8546594cd 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.client; import java.io.IOException; import java.net.URI; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -282,7 +283,7 @@ public abstract class HttpReceiver * @param buffer the response HTTP content buffer * @return whether the processing should continue */ - protected boolean responseContent(HttpExchange exchange, ByteBuffer buffer, Callback callback) + protected boolean responseContent(HttpExchange exchange, ByteBuffer buffer, final Callback callback) { out: while (true) { @@ -307,19 +308,46 @@ public abstract class HttpReceiver if (LOG.isDebugEnabled()) LOG.debug("Response content {}{}{}", response, System.lineSeparator(), BufferUtil.toDetailString(buffer)); - ContentDecoder decoder = this.decoder; - if (decoder != null) - { - buffer = decoder.decode(buffer); - - // TODO If the decoder consumes all the content, should we return here? - - if (LOG.isDebugEnabled()) - LOG.debug("Response content decoded ({}) {}{}{}", decoder, response, System.lineSeparator(), BufferUtil.toDetailString(buffer)); - } - ResponseNotifier notifier = getHttpDestination().getResponseNotifier(); - notifier.notifyContent(exchange.getConversation().getResponseListeners(), response, buffer, callback); + List listeners = exchange.getConversation().getResponseListeners(); + + ContentDecoder decoder = this.decoder; + if (decoder == null) + { + notifier.notifyContent(listeners, response, buffer, callback); + } + else + { + List decodeds = new ArrayList<>(2); + while (buffer.hasRemaining()) + { + ByteBuffer decoded = decoder.decode(buffer); + if (!decoded.hasRemaining()) + continue; + decodeds.add(decoded); + if (LOG.isDebugEnabled()) + LOG.debug("Response content decoded ({}) {}{}{}", decoder, response, System.lineSeparator(), BufferUtil.toDetailString(decoded)); + } + + if (decodeds.isEmpty()) + { + callback.succeeded(); + } + else + { + Callback partial = new Callback.Adapter() + { + @Override + public void failed(Throwable x) + { + callback.failed(x); + } + }; + + for (int i = 1, size = decodeds.size(); i <= size; ++i) + notifier.notifyContent(listeners, response, decodeds.get(i - 1), i < size ? partial : callback); + } + } if (!updateResponseState(ResponseState.TRANSIENT, ResponseState.CONTENT)) terminateResponse(exchange, failure); diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java new file mode 100644 index 00000000000..e8b8cfa60b3 --- /dev/null +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java @@ -0,0 +1,156 @@ +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.client; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.util.Arrays; +import java.util.concurrent.TimeUnit; +import java.util.zip.GZIPOutputStream; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.eclipse.jetty.client.api.ContentResponse; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.junit.Assert; +import org.junit.Test; + +public class HttpClientGZIPTest extends AbstractHttpClientServerTest +{ + public HttpClientGZIPTest(SslContextFactory sslContextFactory) + { + super(sslContextFactory); + } + + @Test + public void testGZIPContentEncoding() throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, org.eclipse.jetty.server.Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + GZIPOutputStream gzipOutput = new GZIPOutputStream(response.getOutputStream()); + gzipOutput.write(data); + gzipOutput.finish(); + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .timeout(5, TimeUnit.SECONDS) + .send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertArrayEquals(data, response.getContent()); + } + + @Test + public void testGZIPContentOneByteAtATime() throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + + ByteArrayOutputStream gzipData = new ByteArrayOutputStream(); + GZIPOutputStream gzipOutput = new GZIPOutputStream(gzipData); + gzipOutput.write(data); + gzipOutput.finish(); + + ServletOutputStream output = response.getOutputStream(); + byte[] gzipBytes = gzipData.toByteArray(); + for (byte gzipByte : gzipBytes) + { + output.write(gzipByte); + output.flush(); + sleep(100); + } + } + + private void sleep(long ms) throws IOException + { + try + { + TimeUnit.MILLISECONDS.sleep(ms); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertArrayEquals(data, response.getContent()); + } + + @Test + public void testGZIPContentSentTwiceInOneWrite() throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + + ByteArrayOutputStream gzipData = new ByteArrayOutputStream(); + GZIPOutputStream gzipOutput = new GZIPOutputStream(gzipData); + gzipOutput.write(data); + gzipOutput.finish(); + + byte[] gzipBytes = gzipData.toByteArray(); + byte[] content = Arrays.copyOf(gzipBytes, 2 * gzipBytes.length); + System.arraycopy(gzipBytes, 0, content, gzipBytes.length, gzipBytes.length); + + ServletOutputStream output = response.getOutputStream(); + output.write(content); + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .send(); + + Assert.assertEquals(200, response.getStatus()); + + byte[] expected = Arrays.copyOf(data, 2 * data.length); + System.arraycopy(data, 0, expected, data.length, data.length); + Assert.assertArrayEquals(expected, response.getContent()); + } +} diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java index 9b77675ff08..1cab93ae99a 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java @@ -43,8 +43,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import java.util.zip.GZIPOutputStream; - import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; @@ -672,32 +670,6 @@ public class HttpClientTest extends AbstractHttpClientServerTest Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); } - @Test - public void test_GZIP_ContentEncoding() throws Exception - { - final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - start(new AbstractHandler() - { - @Override - public void handle(String target, org.eclipse.jetty.server.Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException - { - baseRequest.setHandled(true); - response.setHeader("Content-Encoding", "gzip"); - GZIPOutputStream gzipOutput = new GZIPOutputStream(response.getOutputStream()); - gzipOutput.write(data); - gzipOutput.finish(); - } - }); - - ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) - .scheme(scheme) - .timeout(5, TimeUnit.SECONDS) - .send(); - - Assert.assertEquals(200, response.getStatus()); - Assert.assertArrayEquals(data, response.getContent()); - } - @Slow @Test public void test_Request_IdleTimeout() throws Exception diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java index b6662cd1581..32db8dd5eaf 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java @@ -23,7 +23,6 @@ import java.io.EOFException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Collections; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -222,26 +221,8 @@ public class HttpReceiverOverHTTPTest "Content-Length: " + gzip.length + "\r\n" + "Content-Encoding: gzip\r\n" + "\r\n"); - - HttpRequest request = (HttpRequest)client.newRequest("http://localhost"); - final CountDownLatch latch = new CountDownLatch(1); - FutureResponseListener listener = new FutureResponseListener(request) - { - @Override - public void onContent(Response response, ByteBuffer content) - { - boolean hadRemaining=content.hasRemaining(); - super.onContent(response, content); - - // TODO gzip decoding can pass on empty chunks. Currently ignoring them here, but could be done at the decoder??? - if (hadRemaining) // Ignore empty chunks - latch.countDown(); - } - }; - HttpExchange exchange = new HttpExchange(destination, request, Collections.singletonList(listener)); - connection.getHttpChannel().associate(exchange); - exchange.requestComplete(); - exchange.terminateRequest(null); + HttpExchange exchange = newExchange(); + FutureResponseListener listener = (FutureResponseListener)exchange.getResponseListeners().get(0); connection.getHttpChannel().receive(); endPoint.reset(); @@ -260,7 +241,6 @@ public class HttpReceiverOverHTTPTest ContentResponse response = listener.get(5, TimeUnit.SECONDS); Assert.assertNotNull(response); Assert.assertEquals(200, response.getStatus()); - Assert.assertTrue(latch.await(5, TimeUnit.SECONDS)); Assert.assertArrayEquals(data, response.getContent()); } } From 1678f93ce91a57af4ea59f0d8cb482d8644ea3b9 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 21 Jul 2014 23:22:28 +0200 Subject: [PATCH 099/111] 439788 - CORS filter headers gone between 9.2.0.M0 and 9.2.1 .v20140609 for ProxyServlet requests. Removed the offending code that was added only to avoid duplicate Date headers, but sending of those headers is configurable from HttpConfiguration. --- .../org/eclipse/jetty/proxy/ProxyServlet.java | 4 -- .../eclipse/jetty/proxy/ProxyServletTest.java | 51 ++++++++++++++++++- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java index 3e93592d8db..115b5544d8c 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java @@ -517,10 +517,6 @@ public class ProxyServlet extends HttpServlet protected void onResponseHeaders(HttpServletRequest request, HttpServletResponse response, Response proxyResponse) { - // Clear the response headers in case it comes with predefined ones. - for (String name : response.getHeaderNames()) - response.setHeader(name, null); - for (HttpField field : proxyResponse.getHeaders()) { String headerName = field.getName(); diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java index 1eec08a483f..9641c88163c 100644 --- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java +++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java @@ -32,6 +32,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.Arrays; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +45,14 @@ import java.util.zip.GZIPOutputStream; import javax.servlet.AsyncContext; import javax.servlet.AsyncEvent; import javax.servlet.AsyncListener; +import javax.servlet.DispatcherType; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -67,6 +74,7 @@ import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.toolchain.test.MavenTestingUtils; @@ -102,6 +110,7 @@ public class ProxyServletTest private HttpClient client; private Server proxy; private ServerConnector proxyConnector; + private ServletContextHandler proxyContext; private ProxyServlet proxyServlet; private Server server; private ServerConnector serverConnector; @@ -121,16 +130,18 @@ public class ProxyServletTest proxy = new Server(); HttpConfiguration configuration = new HttpConfiguration(); + configuration.setSendDateHeader(false); + configuration.setSendServerVersion(false); String value = initParams.get("outputBufferSize"); if (value != null) configuration.setOutputBufferSize(Integer.valueOf(value)); proxyConnector = new ServerConnector(proxy, new HttpConnectionFactory(configuration)); proxy.addConnector(proxyConnector); - ServletContextHandler proxyCtx = new ServletContextHandler(proxy, "/", true, false); + proxyContext = new ServletContextHandler(proxy, "/", true, false); ServletHolder proxyServletHolder = new ServletHolder(proxyServlet); proxyServletHolder.setInitParameters(initParams); - proxyCtx.addServlet(proxyServletHolder, "/*"); + proxyContext.addServlet(proxyServletHolder, "/*"); proxy.start(); @@ -1054,5 +1065,41 @@ public class ProxyServletTest Assert.assertEquals(0, destination.getConnectionPool().getIdleConnections().size()); } + @Test + public void testResponseHeadersAreNotRemoved() throws Exception + { + prepareProxy(); + proxyContext.stop(); + final String headerName = "X-Test"; + final String headerValue = "test-value"; + proxyContext.addFilter(new FilterHolder(new Filter() + { + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException + { + ((HttpServletResponse)response).addHeader(headerName, headerValue); + chain.doFilter(request, response); + } + + @Override + public void destroy() + { + } + }), "/*", EnumSet.of(DispatcherType.REQUEST)); + proxyContext.start(); + prepareServer(new EmptyHttpServlet()); + + HttpClient client = prepareClient(); + ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort()).send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertEquals(headerValue, response.getHeaders().get(headerName)); + } + // TODO: test proxy authentication } From b6ca7b3fa5c00af61a32d34401d4987f1a60a4a7 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 22 Jul 2014 16:03:11 +0200 Subject: [PATCH 100/111] 411323 - DosFilter/QoSFilter should use AsyncContext rather than Continuations. --- .../org/eclipse/jetty/servlets/QoSFilter.java | 264 ++++++++++-------- .../eclipse/jetty/servlets/QoSFilterTest.java | 90 +++--- .../test/resources/jetty-logging.properties | 1 + 3 files changed, 186 insertions(+), 169 deletions(-) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java index 81513ce5ba4..0338900ce8d 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java @@ -23,7 +23,9 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; - +import javax.servlet.AsyncContext; +import javax.servlet.AsyncEvent; +import javax.servlet.AsyncListener; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -35,27 +37,27 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.eclipse.jetty.continuation.Continuation; -import org.eclipse.jetty.continuation.ContinuationListener; -import org.eclipse.jetty.continuation.ContinuationSupport; +import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; /** * Quality of Service Filter. - * + *

      * This filter limits the number of active requests to the number set by the "maxRequests" init parameter (default 10). * If more requests are received, they are suspended and placed on priority queues. Priorities are determined by * the {@link #getPriority(ServletRequest)} method and are a value between 0 and the value given by the "maxPriority" * init parameter (default 10), with higher values having higher priority. - *

      + *

      * This filter is ideal to prevent wasting threads waiting for slow/limited * resources such as a JDBC connection pool. It avoids the situation where all of a * containers thread pool may be consumed blocking on such a slow resource. * By limiting the number of active threads, a smaller thread pool may be used as * the threads are not wasted waiting. Thus more memory may be available for use by * the active threads. - *

      + *

      * Furthermore, this filter uses a priority when resuming waiting requests. So that if * a container is under load, and there are many requests waiting for resources, * the {@link #getPriority(ServletRequest)} method is used, so that more important @@ -63,175 +65,168 @@ import org.eclipse.jetty.util.annotation.ManagedObject; * maxRequest limit slightly smaller than the containers thread pool and a high priority * allocated to admin users. Thus regardless of load, admin users would always be * able to access the web application. - *

      + *

      * The maxRequest limit is policed by a {@link Semaphore} and the filter will wait a short while attempting to acquire * the semaphore. This wait is controlled by the "waitMs" init parameter and allows the expense of a suspend to be * avoided if the semaphore is shortly available. If the semaphore cannot be obtained, the request will be suspended * for the default suspend period of the container or the valued set as the "suspendMs" init parameter. - *

      + *

      * If the "managedAttr" init parameter is set to true, then this servlet is set as a {@link ServletContext} attribute with the * filter name as the attribute name. This allows context external mechanism (eg JMX via {@link ContextHandler#MANAGED_ATTRIBUTES}) to * manage the configuration of the filter. - *

      - * - * */ @ManagedObject("Quality of Service Filter") public class QoSFilter implements Filter { - final static int __DEFAULT_MAX_PRIORITY=10; - final static int __DEFAULT_PASSES=10; - final static int __DEFAULT_WAIT_MS=50; - final static long __DEFAULT_TIMEOUT_MS = -1; + private static final Logger LOG = Log.getLogger(QoSFilter.class); - final static String MANAGED_ATTR_INIT_PARAM="managedAttr"; - final static String MAX_REQUESTS_INIT_PARAM="maxRequests"; - final static String MAX_PRIORITY_INIT_PARAM="maxPriority"; - final static String MAX_WAIT_INIT_PARAM="waitMs"; - final static String SUSPEND_INIT_PARAM="suspendMs"; + static final int __DEFAULT_MAX_PRIORITY = 10; + static final int __DEFAULT_PASSES = 10; + static final int __DEFAULT_WAIT_MS = 50; + static final long __DEFAULT_TIMEOUT_MS = -1; - ServletContext _context; - - protected long _waitMs; - protected long _suspendMs; - protected int _maxRequests; + static final String MANAGED_ATTR_INIT_PARAM = "managedAttr"; + static final String MAX_REQUESTS_INIT_PARAM = "maxRequests"; + static final String MAX_PRIORITY_INIT_PARAM = "maxPriority"; + static final String MAX_WAIT_INIT_PARAM = "waitMs"; + static final String SUSPEND_INIT_PARAM = "suspendMs"; + private final String _suspended = "QoSFilter@" + Integer.toHexString(hashCode()) + ".SUSPENDED"; + private final String _resumed = "QoSFilter@" + Integer.toHexString(hashCode()) + ".RESUMED"; + private long _waitMs; + private long _suspendMs; + private int _maxRequests; private Semaphore _passes; - private Queue[] _queue; - private ContinuationListener[] _listener; - private String _suspended="QoSFilter@"+this.hashCode(); + private Queue[] _queues; + private AsyncListener[] _listeners; - /* ------------------------------------------------------------ */ - /** - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) - */ public void init(FilterConfig filterConfig) { - _context=filterConfig.getServletContext(); - - int max_priority=__DEFAULT_MAX_PRIORITY; - if (filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM)!=null) - max_priority=Integer.parseInt(filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM)); - _queue=new Queue[max_priority+1]; - _listener = new ContinuationListener[max_priority + 1]; - for (int p=0;p<_queue.length;p++) + int max_priority = __DEFAULT_MAX_PRIORITY; + if (filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM) != null) + max_priority = Integer.parseInt(filterConfig.getInitParameter(MAX_PRIORITY_INIT_PARAM)); + _queues = new Queue[max_priority + 1]; + _listeners = new AsyncListener[_queues.length]; + for (int p = 0; p < _queues.length; ++p) { - _queue[p]=new ConcurrentLinkedQueue(); - - final int priority=p; - _listener[p] = new ContinuationListener() - { - public void onComplete(Continuation continuation) - {} - - public void onTimeout(Continuation continuation) - { - _queue[priority].remove(continuation); - } - }; + _queues[p] = new ConcurrentLinkedQueue<>(); + _listeners[p] = new QoSAsyncListener(p); } - int maxRequests=__DEFAULT_PASSES; - if (filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM)!=null) - maxRequests=Integer.parseInt(filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM)); - _passes=new Semaphore(maxRequests,true); + int maxRequests = __DEFAULT_PASSES; + if (filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM) != null) + maxRequests = Integer.parseInt(filterConfig.getInitParameter(MAX_REQUESTS_INIT_PARAM)); + _passes = new Semaphore(maxRequests, true); _maxRequests = maxRequests; long wait = __DEFAULT_WAIT_MS; - if (filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM)!=null) - wait=Integer.parseInt(filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM)); - _waitMs=wait; + if (filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM) != null) + wait = Integer.parseInt(filterConfig.getInitParameter(MAX_WAIT_INIT_PARAM)); + _waitMs = wait; long suspend = __DEFAULT_TIMEOUT_MS; - if (filterConfig.getInitParameter(SUSPEND_INIT_PARAM)!=null) - suspend=Integer.parseInt(filterConfig.getInitParameter(SUSPEND_INIT_PARAM)); - _suspendMs=suspend; + if (filterConfig.getInitParameter(SUSPEND_INIT_PARAM) != null) + suspend = Integer.parseInt(filterConfig.getInitParameter(SUSPEND_INIT_PARAM)); + _suspendMs = suspend; - if (_context!=null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) - _context.setAttribute(filterConfig.getFilterName(),this); + ServletContext context = filterConfig.getServletContext(); + if (context != null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) + context.setAttribute(filterConfig.getFilterName(), this); } - /* ------------------------------------------------------------ */ - /** - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain) - */ - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - boolean accepted=false; + boolean accepted = false; try { - if (request.getAttribute(_suspended)==null) + Boolean suspended = (Boolean)request.getAttribute(_suspended); + if (suspended == null) { - accepted=_passes.tryAcquire(_waitMs,TimeUnit.MILLISECONDS); + accepted = _passes.tryAcquire(getWaitMs(), TimeUnit.MILLISECONDS); if (accepted) { - request.setAttribute(_suspended,Boolean.FALSE); + request.setAttribute(_suspended, Boolean.FALSE); + if (LOG.isDebugEnabled()) + LOG.debug("Accepted {}", request); } else { - request.setAttribute(_suspended,Boolean.TRUE); + request.setAttribute(_suspended, Boolean.TRUE); int priority = getPriority(request); - Continuation continuation = ContinuationSupport.getContinuation(request); - if (_suspendMs>0) - continuation.setTimeout(_suspendMs); - continuation.suspend(); - continuation.addContinuationListener(_listener[priority]); - _queue[priority].add(continuation); + AsyncContext asyncContext = request.startAsync(); + long suspendMs = getSuspendMs(); + if (suspendMs > 0) + asyncContext.setTimeout(suspendMs); + asyncContext.addListener(_listeners[priority]); + _queues[priority].add(asyncContext); + if (LOG.isDebugEnabled()) + LOG.debug("Suspended {}", request); return; } } else { - Boolean suspended=(Boolean)request.getAttribute(_suspended); - - if (suspended.booleanValue()) + if (suspended) { - request.setAttribute(_suspended,Boolean.FALSE); - if (request.getAttribute("javax.servlet.resumed")==Boolean.TRUE) + request.setAttribute(_suspended, Boolean.FALSE); + Boolean resumed = (Boolean)request.getAttribute(_resumed); + if (resumed == Boolean.TRUE) { _passes.acquire(); - accepted=true; + accepted = true; + if (LOG.isDebugEnabled()) + LOG.debug("Resumed {}", request); } else { // Timeout! try 1 more time. - accepted = _passes.tryAcquire(_waitMs,TimeUnit.MILLISECONDS); + accepted = _passes.tryAcquire(getWaitMs(), TimeUnit.MILLISECONDS); + if (LOG.isDebugEnabled()) + LOG.debug("Timeout {}", request); } } else { - // pass through resume of previously accepted request + // Pass through resume of previously accepted request. _passes.acquire(); accepted = true; + if (LOG.isDebugEnabled()) + LOG.debug("Passthrough {}", request); } } if (accepted) { - chain.doFilter(request,response); + chain.doFilter(request, response); } else { + if (LOG.isDebugEnabled()) + LOG.debug("Rejected {}", request); ((HttpServletResponse)response).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); } } - catch(InterruptedException e) + catch (InterruptedException e) { - _context.log("QoS",e); ((HttpServletResponse)response).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); } finally { if (accepted) { - for (int p=_queue.length;p-->0;) + for (int p = _queues.length - 1; p >= 0; --p) { - Continuation continutaion=_queue[p].poll(); - if (continutaion!=null && continutaion.isSuspended()) + AsyncContext asyncContext = _queues[p].poll(); + if (asyncContext != null) { - continutaion.resume(); - break; + ServletRequest candidate = asyncContext.getRequest(); + Boolean suspended = (Boolean)candidate.getAttribute(_suspended); + if (suspended == Boolean.TRUE) + { + candidate.setAttribute(_resumed, Boolean.TRUE); + asyncContext.dispatch(); + break; + } } } _passes.release(); @@ -240,40 +235,40 @@ public class QoSFilter implements Filter } /** - * Get the request Priority. - *

      The default implementation assigns the following priorities:

        - *
      • 2 - for a authenticated request - *
      • 1 - for a request with valid /non new session + * Computes the request priority. + *

        + * The default implementation assigns the following priorities: + *

          + *
        • 2 - for an authenticated request + *
        • 1 - for a request with valid / non new session *
        • 0 - for all other requests. *
        - * This method may be specialised to provide application specific priorities. + * This method may be overridden to provide application specific priorities. * - * @param request - * @return the request priority + * @param request the incoming request + * @return the computed request priority */ protected int getPriority(ServletRequest request) { HttpServletRequest baseRequest = (HttpServletRequest)request; - if (baseRequest.getUserPrincipal() != null ) + if (baseRequest.getUserPrincipal() != null) + { return 2; + } else { HttpSession session = baseRequest.getSession(false); - if (session!=null && !session.isNew()) + if (session != null && !session.isNew()) return 1; else return 0; } } + public void destroy() + { + } - /* ------------------------------------------------------------ */ - /** - * @see javax.servlet.Filter#destroy() - */ - public void destroy(){} - - /* ------------------------------------------------------------ */ /** * Get the (short) amount of time (in milliseconds) that the filter would wait * for the semaphore to become available before suspending a request. @@ -286,7 +281,6 @@ public class QoSFilter implements Filter return _waitMs; } - /* ------------------------------------------------------------ */ /** * Set the (short) amount of time (in milliseconds) that the filter would wait * for the semaphore to become available before suspending a request. @@ -298,7 +292,6 @@ public class QoSFilter implements Filter _waitMs = value; } - /* ------------------------------------------------------------ */ /** * Get the amount of time (in milliseconds) that the filter would suspend * a request for while waiting for the semaphore to become available. @@ -311,7 +304,6 @@ public class QoSFilter implements Filter return _suspendMs; } - /* ------------------------------------------------------------ */ /** * Set the amount of time (in milliseconds) that the filter would suspend * a request for while waiting for the semaphore to become available. @@ -323,7 +315,6 @@ public class QoSFilter implements Filter _suspendMs = value; } - /* ------------------------------------------------------------ */ /** * Get the maximum number of requests allowed to be processed * at the same time. @@ -336,7 +327,6 @@ public class QoSFilter implements Filter return _maxRequests; } - /* ------------------------------------------------------------ */ /** * Set the maximum number of requests allowed to be processed * at the same time. @@ -345,8 +335,40 @@ public class QoSFilter implements Filter */ public void setMaxRequests(int value) { - _passes = new Semaphore((value-_maxRequests+_passes.availablePermits()), true); + _passes = new Semaphore((value - getMaxRequests() + _passes.availablePermits()), true); _maxRequests = value; } + private class QoSAsyncListener implements AsyncListener + { + private final int priority; + + public QoSAsyncListener(int priority) + { + this.priority = priority; + } + + @Override + public void onStartAsync(AsyncEvent event) throws IOException + { + } + + @Override + public void onComplete(AsyncEvent event) throws IOException + { + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + // Remove before it's redispatched, so it won't be + // redispatched again in the finally block below. + _queues[priority].remove(event.getAsyncContext()); + } + + @Override + public void onError(AsyncEvent event) throws IOException + { + } + } } diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java index a7516228b41..1ab5204c345 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/QoSFilterTest.java @@ -18,16 +18,12 @@ package org.eclipse.jetty.servlets; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.net.URL; import java.util.EnumSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.servlet.DispatcherType; -import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServlet; @@ -64,14 +60,14 @@ public class QoSFilterTest _tester = new ServletTester(); _tester.setContextPath("/context"); _tester.addServlet(TestServlet.class, "/test"); - TestServlet.__maxSleepers=0; - TestServlet.__sleepers=0; + TestServlet.__maxSleepers = 0; + TestServlet.__sleepers = 0; _connectors = new LocalConnector[NUM_CONNECTIONS]; - for(int i = 0; i < _connectors.length; ++i) + for (int i = 0; i < _connectors.length; ++i) _connectors[i] = _tester.createLocalConnector(); - _doneRequests = new CountDownLatch(NUM_CONNECTIONS*NUM_LOOPS); + _doneRequests = new CountDownLatch(NUM_CONNECTIONS * NUM_LOOPS); _tester.start(); } @@ -85,17 +81,17 @@ public class QoSFilterTest @Test public void testNoFilter() throws Exception { - for(int i = 0; i < NUM_CONNECTIONS; ++i ) + for (int i = 0; i < NUM_CONNECTIONS; ++i) { new Thread(new Worker(i)).start(); } - _doneRequests.await(10,TimeUnit.SECONDS); + _doneRequests.await(10, TimeUnit.SECONDS); - if (TestServlet.__maxSleepers<=MAX_QOS) + if (TestServlet.__maxSleepers <= MAX_QOS) LOG.warn("TEST WAS NOT PARALLEL ENOUGH!"); else - Assert.assertThat(TestServlet.__maxSleepers,Matchers.lessThanOrEqualTo(NUM_CONNECTIONS)); + Assert.assertThat(TestServlet.__maxSleepers, Matchers.lessThanOrEqualTo(NUM_CONNECTIONS)); } @Test @@ -103,19 +99,19 @@ public class QoSFilterTest { FilterHolder holder = new FilterHolder(QoSFilter2.class); holder.setAsyncSupported(true); - holder.setInitParameter(QoSFilter.MAX_REQUESTS_INIT_PARAM, ""+MAX_QOS); - _tester.getContext().getServletHandler().addFilterWithMapping(holder,"/*",EnumSet.of(DispatcherType.REQUEST,DispatcherType.ASYNC)); + holder.setInitParameter(QoSFilter.MAX_REQUESTS_INIT_PARAM, "" + MAX_QOS); + _tester.getContext().getServletHandler().addFilterWithMapping(holder, "/*", EnumSet.of(DispatcherType.REQUEST, DispatcherType.ASYNC)); - for(int i = 0; i < NUM_CONNECTIONS; ++i ) + for (int i = 0; i < NUM_CONNECTIONS; ++i) { new Thread(new Worker(i)).start(); } - _doneRequests.await(10,TimeUnit.SECONDS); - if (TestServlet.__maxSleepers __maxSleepers) + if (__sleepers > __maxSleepers) __maxSleepers = __sleepers; } Thread.sleep(50); - synchronized(TestServlet.class) + synchronized (TestServlet.class) { - // System.err.println(_count++); __sleepers--; - if(__sleepers > __maxSleepers) - __maxSleepers = __sleepers; } response.setContentType("text/plain"); @@ -234,7 +229,6 @@ public class QoSFilterTest } catch (InterruptedException e) { - e.printStackTrace(); response.sendError(500); } } @@ -246,7 +240,7 @@ public class QoSFilterTest public int getPriority(ServletRequest request) { String p = request.getParameter("priority"); - if (p!=null) + if (p != null) return Integer.parseInt(p); return 0; } diff --git a/jetty-servlets/src/test/resources/jetty-logging.properties b/jetty-servlets/src/test/resources/jetty-logging.properties index f97be99cc87..aa0b767d107 100644 --- a/jetty-servlets/src/test/resources/jetty-logging.properties +++ b/jetty-servlets/src/test/resources/jetty-logging.properties @@ -2,3 +2,4 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog #org.eclipse.jetty.LEVEL=DEBUG #org.eclipse.jetty.servlets.LEVEL=DEBUG #org.eclipse.jetty.servlets.GzipFilter.LEVEL=DEBUG +#org.eclipse.jetty.servlets.QoSFilter.LEVEL=DEBUG From 987800c41936e799aa6cc822c64af657c83cd3f7 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 22 Jul 2014 16:36:15 +0200 Subject: [PATCH 101/111] 440122 - Remove usages of ForkInvoker. --- .../eclipse/jetty/proxy/ProxyConnection.java | 121 ++++++++-------- .../org/eclipse/jetty/util/ForkInvoker.java | 135 ------------------ 2 files changed, 60 insertions(+), 196 deletions(-) delete mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/ForkInvoker.java diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java index f8572949833..5eb72ec059d 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java @@ -28,13 +28,13 @@ import org.eclipse.jetty.io.ByteBufferPool; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.util.Callback; -import org.eclipse.jetty.util.ForkInvoker; +import org.eclipse.jetty.util.IteratingCallback; import org.eclipse.jetty.util.log.Logger; public abstract class ProxyConnection extends AbstractConnection { protected static final Logger LOG = ConnectHandler.LOG; - private final ForkInvoker invoker = new ProxyForkInvoker(); + private final IteratingCallback pipe = new ProxyIteratingCallback(); private final ByteBufferPool bufferPool; private final ConcurrentMap context; private Connection connection; @@ -69,52 +69,7 @@ public abstract class ProxyConnection extends AbstractConnection @Override public void onFillable() { - final ByteBuffer buffer = getByteBufferPool().acquire(getInputBufferSize(), true); - try - { - final int filled = read(getEndPoint(), buffer); - if (LOG.isDebugEnabled()) - LOG.debug("{} filled {} bytes", this, filled); - if (filled > 0) - { - write(getConnection().getEndPoint(), buffer, new Callback() - { - @Override - public void succeeded() - { - if (LOG.isDebugEnabled()) - LOG.debug("{} wrote {} bytes", this, filled); - bufferPool.release(buffer); - invoker.invoke(null); - } - - @Override - public void failed(Throwable x) - { - LOG.debug(this + " failed to write " + filled + " bytes", x); - bufferPool.release(buffer); - connection.close(); - } - }); - } - else if (filled == 0) - { - bufferPool.release(buffer); - fillInterested(); - } - else - { - bufferPool.release(buffer); - connection.getEndPoint().shutdownOutput(); - } - } - catch (IOException x) - { - LOG.debug(this + " could not fill", x); - bufferPool.release(buffer); - close(); - connection.close(); - } + pipe.iterate(); } protected abstract int read(EndPoint endPoint, ByteBuffer buffer) throws IOException; @@ -130,29 +85,73 @@ public abstract class ProxyConnection extends AbstractConnection getEndPoint().getRemoteAddress().getPort()); } - private class ProxyForkInvoker extends ForkInvoker implements Runnable + private class ProxyIteratingCallback extends IteratingCallback { - private ProxyForkInvoker() + private ByteBuffer buffer; + private int filled; + + @Override + protected Action process() throws Exception { - super(4); + buffer = bufferPool.acquire(getInputBufferSize(), true); + try + { + int filled = this.filled = read(getEndPoint(), buffer); + if (LOG.isDebugEnabled()) + LOG.debug("{} filled {} bytes", ProxyConnection.this, filled); + if (filled > 0) + { + write(connection.getEndPoint(), buffer, this); + return Action.SCHEDULED; + } + else if (filled == 0) + { + bufferPool.release(buffer); + fillInterested(); + return Action.IDLE; + } + else + { + bufferPool.release(buffer); + connection.getEndPoint().shutdownOutput(); + return Action.SUCCEEDED; + } + } + catch (IOException x) + { + LOG.debug(ProxyConnection.this + " could not fill", x); + disconnect(); + return Action.SUCCEEDED; + } } @Override - public void fork(Void arg) + public void succeeded() { - getExecutor().execute(this); - } - - @Override - public void run() - { - onFillable(); + if (LOG.isDebugEnabled()) + LOG.debug("{} wrote {} bytes", ProxyConnection.this, filled); + bufferPool.release(buffer); + super.succeeded(); } @Override - public void call(Void arg) + protected void onCompleteSuccess() { - onFillable(); + } + + @Override + protected void onCompleteFailure(Throwable x) + { + if (LOG.isDebugEnabled()) + LOG.debug(ProxyConnection.this + " failed to write " + filled + " bytes", x); + disconnect(); + } + + private void disconnect() + { + bufferPool.release(buffer); + ProxyConnection.this.close(); + connection.close(); } } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ForkInvoker.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ForkInvoker.java deleted file mode 100644 index c15b313b0d9..00000000000 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ForkInvoker.java +++ /dev/null @@ -1,135 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.util; - -/** - * Utility class that splits calls to {@link #invoke(Object)} into calls to {@link #fork(Object)} or {@link #call(Object)} - * depending on the max number of reentrant calls to {@link #invoke(Object)}. - *

        - * This class prevents {@link StackOverflowError}s in case of methods that end up invoking themselves, - * such is common for {@link Callback#succeeded()}. - *

        - * Typical use case is: - * 

        - * public void reentrantMethod(Object param)
- * {
- *     if (condition || tooManyReenters)
- *         fork(param)
- *     else
- *         call(param)
- * }
- *
        - * Calculating {@code tooManyReenters} usually involves using a {@link ThreadLocal} and algebra on the - * number of reentrant invocations, which is factored out in this class for convenience. - *

        - * The same code using this class becomes: - * 

        - * private final ForkInvoker invoker = ...;
- *
- * public void reentrantMethod(Object param)
- * {
- *     invoker.invoke(param);
- * }
- *
        - * - */ -public abstract class ForkInvoker -{ - private static final ThreadLocal __invocations = new ThreadLocal() - { - @Override - protected Integer initialValue() - { - return 0; - } - }; - private final int _maxInvocations; - - /** - * Creates an instance with the given max number of reentrant calls to {@link #invoke(Object)} - *

        - * If {@code maxInvocations} is zero or negative, it is interpreted - * as if the max number of reentrant calls is infinite. - * - * @param maxInvocations the max number of reentrant calls to {@link #invoke(Object)} - */ - public ForkInvoker(int maxInvocations) - { - _maxInvocations = maxInvocations; - } - - /** - * Invokes either {@link #fork(Object)} or {@link #call(Object)}. - * If {@link #condition()} returns true, {@link #fork(Object)} is invoked. - * Otherwise, if the max number of reentrant calls is positive and the - * actual number of reentrant invocations exceeds it, {@link #fork(Object)} is invoked. - * Otherwise, {@link #call(Object)} is invoked. - * @param arg TODO - * - * @return true if {@link #fork(Object)} has been called, false otherwise - */ - public boolean invoke(T arg) - { - boolean countInvocations = _maxInvocations > 0; - int invocations = __invocations.get(); - if (condition() || countInvocations && invocations > _maxInvocations) - { - fork(arg); - return true; - } - else - { - if (countInvocations) - __invocations.set(invocations + 1); - try - { - call(arg); - return false; - } - finally - { - if (countInvocations) - __invocations.set(invocations); - } - } - } - - /** - * Subclasses should override this method returning true if they want - * {@link #invoke(Object)} to call {@link #fork(Object)}. - * - * @return true if {@link #invoke(Object)} should call {@link #fork(Object)}, false otherwise - */ - protected boolean condition() - { - return false; - } - - /** - * Executes the forked invocation - * @param arg TODO - */ - public abstract void fork(T arg); - - /** - * Executes the direct, non-forked, invocation - * @param arg TODO - */ - public abstract void call(T arg); -} From 4daba1ba79e56624688308bef04bed85f5593c1b Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 22 Jul 2014 19:32:13 +0200 Subject: [PATCH 102/111] Restored IteratingCallback APIs (in particular the completed() method) to keep compatibility over micro versions of Jetty. Removed getState() - can't return a private class from a protected method, plus it was only used in a toString() with the wrong formatting string, that was already printing the state. Removed also final modifiers to keep compatibility. --- .../eclipse/jetty/server/HttpConnection.java | 2 +- .../eclipse/jetty/util/IteratingCallback.java | 71 ++++++++++++------- 2 files changed, 48 insertions(+), 25 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index ca8ea64e9be..c88e08b679b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -705,7 +705,7 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http @Override public String toString() { - return String.format("%s[i=%s,cb=%s]",super.toString(),getState(),_info,_callback); + return String.format("%s[i=%s,cb=%s]",super.toString(),_info,_callback); } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java index 1600eb3f8b6..2791803ba69 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java @@ -50,7 +50,6 @@ import java.util.concurrent.atomic.AtomicReference; */ public abstract class IteratingCallback implements Callback { - /** * The internal states of this callback */ @@ -86,10 +85,11 @@ public abstract class IteratingCallback implements Callback */ FAILED, /** - * The ICB has been closed and cannot be reset + * This callback has been closed and cannot be reset. */ CLOSED } + /** * The indication of the overall progress of the overall job that * implementations of {@link #process()} must return. @@ -123,14 +123,9 @@ public abstract class IteratingCallback implements Callback protected IteratingCallback(boolean needReset) { - _state = new AtomicReference<>(needReset?State.SUCCEEDED:State.INACTIVE); + _state = new AtomicReference<>(needReset ? State.SUCCEEDED : State.INACTIVE); } - protected State getState() - { - return _state.get(); - } - /** * Method called by {@link #iterate()} to process the sub task. *

        @@ -149,14 +144,31 @@ public abstract class IteratingCallback implements Callback protected abstract Action process() throws Exception; /** - * Invoked when the overall task has completed successfully. + * @deprecated Use {@link #onCompleteSuccess()} instead. */ - protected abstract void onCompleteSuccess(); + @Deprecated + protected void completed() + { + } + + /** + * Invoked when the overall task has completed successfully. + * + * @see #onCompleteFailure(Throwable) + */ + protected void onCompleteSuccess() + { + completed(); + } /** - * Invoked when the overall task has completely failed. + * Invoked when the overall task has completed with a failure. + * + * @see #onCompleteSuccess() */ - protected abstract void onCompleteFailure(Throwable x); + protected void onCompleteFailure(Throwable x) + { + } /** * This method must be invoked by applications to start the processing @@ -318,9 +330,10 @@ public abstract class IteratingCallback implements Callback return; } case CLOSED: - // too late! + { + // Too late! return; - + } default: { throw new IllegalStateException(toString()); @@ -335,49 +348,56 @@ public abstract class IteratingCallback implements Callback * {@code super.failed(Throwable)}. */ @Override - public final void failed(Throwable x) + public void failed(Throwable x) { while (true) { State current = _state.get(); - switch(current) + switch (current) { case SUCCEEDED: case FAILED: case INACTIVE: case CLOSED: + { // Already complete!. return; - + } default: + { if (_state.compareAndSet(current, State.FAILED)) { onCompleteFailure(x); return; } + } } } } - public final void close() + public void close() { while (true) { State current = _state.get(); - switch(current) + switch (current) { case INACTIVE: case SUCCEEDED: case FAILED: + { if (_state.compareAndSet(current, State.CLOSED)) return; break; + } default: + { if (_state.compareAndSet(current, State.CLOSED)) { - onCompleteFailure(new IllegalStateException("Closed with pending callback "+this)); + onCompleteFailure(new IllegalStateException("Closed with pending callback " + this)); return; } + } } } } @@ -412,10 +432,13 @@ public abstract class IteratingCallback implements Callback return _state.get() == State.SUCCEEDED; } - /* ------------------------------------------------------------ */ - /** Reset the callback - *

        A callback can only be reset to INACTIVE from the SUCCEEDED or FAILED states or if it is already INACTIVE. - * @return True if the reset was successful + /** + * Resets this callback. + *

        + * A callback can only be reset to INACTIVE from the + * SUCCEEDED or FAILED states or if it is already INACTIVE. + * + * @return true if the reset was successful */ public boolean reset() { From dd914db3cfa1766e0d9c786ca0c74767b6271009 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 22 Jul 2014 20:55:18 +0200 Subject: [PATCH 103/111] Reorganized GZIP tests. --- .../jetty/client/HttpClientGZIPTest.java | 77 ++++++++++++++++--- .../client/http/HttpReceiverOverHTTPTest.java | 43 ----------- 2 files changed, 65 insertions(+), 55 deletions(-) diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java index e8b8cfa60b3..98aaf9966c6 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientGZIPTest.java @@ -95,18 +95,6 @@ public class HttpClientGZIPTest extends AbstractHttpClientServerTest sleep(100); } } - - private void sleep(long ms) throws IOException - { - try - { - TimeUnit.MILLISECONDS.sleep(ms); - } - catch (InterruptedException x) - { - throw new InterruptedIOException(); - } - } }); ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) @@ -153,4 +141,69 @@ public class HttpClientGZIPTest extends AbstractHttpClientServerTest System.arraycopy(data, 0, expected, data.length, data.length); Assert.assertArrayEquals(expected, response.getContent()); } + + @Test + public void testGZIPContentFragmentedBeforeTrailer() throws Exception + { + // There are 8 trailer bytes to gzip encoding. + testGZIPContentFragmented(9); + } + + @Test + public void testGZIPContentFragmentedAtTrailer() throws Exception + { + // There are 8 trailer bytes to gzip encoding. + testGZIPContentFragmented(1); + } + + private void testGZIPContentFragmented(final int fragment) throws Exception + { + final byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + start(new AbstractHandler() + { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + response.setHeader("Content-Encoding", "gzip"); + + ByteArrayOutputStream gzipData = new ByteArrayOutputStream(); + GZIPOutputStream gzipOutput = new GZIPOutputStream(gzipData); + gzipOutput.write(data); + gzipOutput.finish(); + + byte[] gzipBytes = gzipData.toByteArray(); + byte[] chunk1 = Arrays.copyOfRange(gzipBytes, 0, gzipBytes.length - fragment); + byte[] chunk2 = Arrays.copyOfRange(gzipBytes, gzipBytes.length - fragment, gzipBytes.length); + + ServletOutputStream output = response.getOutputStream(); + output.write(chunk1); + output.flush(); + + sleep(500); + + output.write(chunk2); + output.flush(); + } + }); + + ContentResponse response = client.newRequest("localhost", connector.getLocalPort()) + .scheme(scheme) + .send(); + + Assert.assertEquals(200, response.getStatus()); + Assert.assertArrayEquals(data, response.getContent()); + } + + private static void sleep(long ms) throws IOException + { + try + { + TimeUnit.MILLISECONDS.sleep(ms); + } + catch (InterruptedException x) + { + throw new InterruptedIOException(); + } + } } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java index 32db8dd5eaf..e7564b5e641 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTPTest.java @@ -18,22 +18,18 @@ package org.eclipse.jetty.client.http; -import java.io.ByteArrayOutputStream; import java.io.EOFException; -import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.zip.GZIPOutputStream; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpExchange; import org.eclipse.jetty.client.HttpRequest; import org.eclipse.jetty.client.HttpResponseException; import org.eclipse.jetty.client.Origin; -import org.eclipse.jetty.client.api.ContentResponse; import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.util.FutureResponseListener; import org.eclipse.jetty.http.HttpFields; @@ -204,43 +200,4 @@ public class HttpReceiverOverHTTPTest Assert.assertTrue(e.getCause() instanceof HttpResponseException); } } - - @Test - public void test_Receive_GZIPResponseContent_Fragmented() throws Exception - { - byte[] data = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try (GZIPOutputStream gzipOutput = new GZIPOutputStream(baos)) - { - gzipOutput.write(data); - } - byte[] gzip = baos.toByteArray(); - - endPoint.setInput("" + - "HTTP/1.1 200 OK\r\n" + - "Content-Length: " + gzip.length + "\r\n" + - "Content-Encoding: gzip\r\n" + - "\r\n"); - HttpExchange exchange = newExchange(); - FutureResponseListener listener = (FutureResponseListener)exchange.getResponseListeners().get(0); - connection.getHttpChannel().receive(); - endPoint.reset(); - - ByteBuffer buffer = ByteBuffer.wrap(gzip); - int fragment = buffer.limit() - 1; - buffer.limit(fragment); - endPoint.setInput(buffer); - connection.getHttpChannel().receive(); - endPoint.reset(); - - buffer.limit(gzip.length); - buffer.position(fragment); - endPoint.setInput(buffer); - connection.getHttpChannel().receive(); - - ContentResponse response = listener.get(5, TimeUnit.SECONDS); - Assert.assertNotNull(response); - Assert.assertEquals(200, response.getStatus()); - Assert.assertArrayEquals(data, response.getContent()); - } } From d2e36bcc105f482c55f81c277de3f9e1e03718bf Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 23 Jul 2014 10:41:56 +1000 Subject: [PATCH 104/111] 439809 mvn jetty:jspc cannot find taglibs in dependency jars --- .../eclipse/jetty/jspc/plugin/JspcMojo.java | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java index ac3e45f3f59..3e524b05be7 100644 --- a/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java +++ b/jetty-jspc-maven-plugin/src/main/java/org/eclipse/jetty/jspc/plugin/JspcMojo.java @@ -82,6 +82,21 @@ public class JspcMojo extends AbstractMojo public static final String PRECOMPILED_FLAG = "org.eclipse.jetty.jsp.precompiled"; + /** + * JettyJspC + * + * Add some extra setters to standard JspC class to help configure it + * for running in maven. + */ + public static class JettyJspC extends JspC + { + public void setClassLoader (ClassLoader loader) + { + this.loader = loader; + } + } + + /** * Whether or not to include dependencies on the plugin's classpath with <scope>provided</scope> * Use WITH CAUTION as you may wind up with duplicate jars/classes. @@ -219,7 +234,7 @@ public class JspcMojo extends AbstractMojo * * @parameter */ - private JspC jspc; + private JettyJspC jspc; @@ -286,19 +301,22 @@ public class JspcMojo extends AbstractMojo if (i+1 Date: Wed, 23 Jul 2014 14:58:31 +1000 Subject: [PATCH 105/111] ignore failing tests --- .../eclipse/jetty/websocket/jsr356/DecoderReaderTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java index 441e8a60a80..4d537f7301a 100644 --- a/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java +++ b/jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java @@ -54,6 +54,7 @@ import org.eclipse.jetty.websocket.common.test.BlockheadServer.ServerConnection; import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -250,6 +251,8 @@ public class DecoderReaderTest server.stop(); } + // TODO analyse and fix + @Ignore @Test public void testSingleQuotes() throws Exception { @@ -266,7 +269,9 @@ public class DecoderReaderTest Assert.assertThat("Quotes Author",quotes.author,is("Benjamin Franklin")); Assert.assertThat("Quotes Count",quotes.quotes.size(),is(3)); } - + + // TODO analyse and fix + @Ignore @Test public void testTwoQuotes() throws Exception { From 564ffca5dceb9bd54388770533a0f6065a5583ca Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 23 Jul 2014 15:22:20 +1000 Subject: [PATCH 106/111] 440114 ContextHandlerCollection does not skip context wrappers --- .../eclipse/jetty/server/LocalConnector.java | 2 + .../jetty/server/handler/ContextHandler.java | 79 ++++--- .../handler/ContextHandlerCollection.java | 194 +++++++++++------ .../server/handler/HandlerCollection.java | 9 + .../handler/ContextHandlerCollectionTest.java | 201 +++++++++++++++++- 5 files changed, 386 insertions(+), 99 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java index 4047f871d36..26ff80fb5bf 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java @@ -158,6 +158,8 @@ public class LocalConnector extends AbstractConnector private LocalEndPoint executeRequest(ByteBuffer rawRequest) { + if (!isStarted()) + throw new IllegalStateException("!STARTED"); LocalEndPoint endp = new LocalEndPoint(); endp.setInput(rawRequest); _connects.add(endp); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java index 49c40f5b1f2..ed6efd1b654 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java @@ -870,27 +870,8 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu _scontext.clearAttributes(); } - /* ------------------------------------------------------------ */ - /* - * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ - public boolean checkContext(final String target, final Request baseRequest, final HttpServletResponse response) throws IOException + public boolean checkVirtualHost(final Request baseRequest) { - DispatcherType dispatch = baseRequest.getDispatcherType(); - - switch (_availability) - { - case SHUTDOWN: - case UNAVAILABLE: - baseRequest.setHandled(true); - response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); - return false; - default: - if ((DispatcherType.REQUEST.equals(dispatch) && baseRequest.isHandled())) - return false; - } - - // Check the vhosts if (_vhosts != null && _vhosts.length > 0) { String vhost = normalizeHostname(baseRequest.getServerName()); @@ -926,27 +907,61 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu if (!match || connectorName && !connectorMatch) return false; } - + return true; + } + + public boolean checkContextPath(String uri) + { // Are we not the root context? if (_contextPath.length() > 1) { // reject requests that are not for us - if (!target.startsWith(_contextPath)) + if (!uri.startsWith(_contextPath)) return false; - if (target.length() > _contextPath.length() && target.charAt(_contextPath.length()) != '/') + if (uri.length() > _contextPath.length() && uri.charAt(_contextPath.length()) != '/') return false; + } + return true; + } + + /* ------------------------------------------------------------ */ + /* + * @see org.eclipse.jetty.server.Handler#handle(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) + */ + public boolean checkContext(final String target, final Request baseRequest, final HttpServletResponse response) throws IOException + { + DispatcherType dispatch = baseRequest.getDispatcherType(); - // redirect null path infos - if (!_allowNullPathInfo && _contextPath.length() == target.length()) - { - // context request must end with / + // Check the vhosts + if (!checkVirtualHost(baseRequest)) + return false; + + if (!checkContextPath(target)) + return false; + + // Are we not the root context? + // redirect null path infos + if (!_allowNullPathInfo && _contextPath.length() == target.length() && _contextPath.length()>1) + { + // context request must end with / + baseRequest.setHandled(true); + if (baseRequest.getQueryString() != null) + response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH) + "?" + baseRequest.getQueryString()); + else + response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH)); + return false; + } + + switch (_availability) + { + case SHUTDOWN: + case UNAVAILABLE: baseRequest.setHandled(true); - if (baseRequest.getQueryString() != null) - response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH) + "?" + baseRequest.getQueryString()); - else - response.sendRedirect(URIUtil.addPaths(baseRequest.getRequestURI(),URIUtil.SLASH)); + response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); return false; - } + default: + if ((DispatcherType.REQUEST.equals(dispatch) && baseRequest.isHandled())) + return false; } return true; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java index 4ade3649030..19396d49ea2 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java @@ -19,6 +19,15 @@ package org.eclipse.jetty.server.handler; import java.io.IOException; +import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -52,7 +61,8 @@ public class ContextHandlerCollection extends HandlerCollection { private static final Logger LOG = Log.getLogger(ContextHandlerCollection.class); - private volatile Trie _contexts; + private final ConcurrentMap _contextBranches = new ConcurrentHashMap<>(); + private volatile Trie> _pathBranches; private Class _contextClass = ContextHandler.class; /* ------------------------------------------------------------ */ @@ -69,71 +79,70 @@ public class ContextHandlerCollection extends HandlerCollection @ManagedOperation("update the mapping of context path to context") public void mapContexts() { - int capacity=512; + _contextBranches.clear(); + + if (getHandlers()==null) + { + _pathBranches=new ArrayTernaryTrie<>(false,16); + return; + } + + // Create map of contextPath to handler Branch + Map map = new HashMap<>(); + for (Handler handler:getHandlers()) + { + Branch branch=new Branch(handler); + for (String contextPath : branch.getContextPaths()) + { + Branch[] branches=map.get(contextPath); + map.put(contextPath, ArrayUtil.addToArray(branches, branch, Branch.class)); + } + + for (ContextHandler context : branch.getContextHandlers()) + _contextBranches.putIfAbsent(context, branch.getHandler()); + } + + // Sort the branches so those with virtual hosts are considered before those without + for (Map.Entry entry: map.entrySet()) + { + Branch[] branches=entry.getValue(); + Branch[] sorted=new Branch[branches.length]; + int i=0; + for (Branch branch:branches) + if (branch.hasVirtualHost()) + sorted[i++]=branch; + for (Branch branch:branches) + if (!branch.hasVirtualHost()) + sorted[i++]=branch; + entry.setValue(sorted); + } // Loop until we have a big enough trie to hold all the context paths - Trie trie; + int capacity=512; + Trie> trie; loop: while(true) { trie=new ArrayTernaryTrie<>(false,capacity); - - Handler[] branches = getHandlers(); - - // loop over each group of contexts - for (int b=0;branches!=null && b entry: map.entrySet()) { - Handler[] handlers=null; - - if (branches[b] instanceof ContextHandler) + if (!trie.put(entry.getKey().substring(1),entry)) { - handlers = new Handler[]{ branches[b] }; - } - else if (branches[b] instanceof HandlerContainer) - { - handlers = ((HandlerContainer)branches[b]).getChildHandlersByClass(ContextHandler.class); - } - else - continue; - - // for each context handler in a group - for (int i=0;handlers!=null && i0) - sorted[i++]=handler; - for (ContextHandler handler:contexts) - if (handler.getVirtualHosts()==null || handler.getVirtualHosts().length==0) - sorted[i++]=handler; - trie.put(ctx,sorted); + for (String ctx : trie.keySet()) + LOG.debug("{}->{}",ctx,Arrays.asList(trie.get(ctx).getValue())); } - - //for (String ctx : trie.keySet()) - // System.err.printf("'%s'->%s%n",ctx,Arrays.asList(trie.get(ctx))); - _contexts=trie; + _pathBranches=trie; } - /* ------------------------------------------------------------ */ /* * @see org.eclipse.jetty.server.server.handler.HandlerCollection#setHandlers(org.eclipse.jetty.server.server.Handler[]) @@ -172,11 +181,16 @@ public class ContextHandlerCollection extends HandlerCollection ContextHandler context=async.getContextHandler(); if (context!=null) { - context.handle(target,baseRequest,request, response); + Handler branch = _contextBranches.get(context); + + if (branch==null) + context.handle(target,baseRequest,request, response); + else + branch.handle(target, baseRequest, request, response); return; } } - + // data structure which maps a request to a context; first-best match wins // { context path => [ context ] } // } @@ -187,16 +201,18 @@ public class ContextHandlerCollection extends HandlerCollection while (limit>=0) { // Get best match - ContextHandler[] contexts = _contexts.getBest(target,1,limit); - if (contexts==null) + Map.Entry branches = _pathBranches.getBest(target,1,limit); + + + if (branches==null) break; - - int l=contexts[0].getContextPath().length(); + + int l=branches.getKey().length(); if (l==1 || target.length()==l || target.charAt(l)=='/') { - for (ContextHandler handler : contexts) + for (Branch branch : branches.getValue()) { - handler.handle(target,baseRequest, request, response); + branch.getHandler().handle(target,baseRequest, request, response); if (baseRequest.isHandled()) return; } @@ -217,7 +233,6 @@ public class ContextHandlerCollection extends HandlerCollection } } - /* ------------------------------------------------------------ */ /** Add a context handler. * @param contextPath The context path to add @@ -263,5 +278,64 @@ public class ContextHandlerCollection extends HandlerCollection _contextClass = contextClass; } + /* ------------------------------------------------------------ */ + /* ------------------------------------------------------------ */ + /* ------------------------------------------------------------ */ + private final static class Branch + { + private final Handler _handler; + private final ContextHandler[] _contexts; + + Branch(Handler handler) + { + _handler=handler; + + if (handler instanceof ContextHandler) + { + _contexts = new ContextHandler[]{(ContextHandler)handler}; + } + else if (handler instanceof HandlerContainer) + { + Handler[] contexts=((HandlerContainer)handler).getChildHandlersByClass(ContextHandler.class); + _contexts = new ContextHandler[contexts.length]; + System.arraycopy(contexts, 0, _contexts, 0, contexts.length); + } + else + _contexts = new ContextHandler[0]; + } + + Set getContextPaths() + { + Set set = new HashSet(); + for (ContextHandler context:_contexts) + set.add(context.getContextPath()); + return set; + } + + boolean hasVirtualHost() + { + for (ContextHandler context:_contexts) + if (context.getVirtualHosts()!=null && context.getVirtualHosts().length>0) + return true; + return false; + } + + ContextHandler[] getContextHandlers() + { + return _contexts; + } + + Handler getHandler() + { + return _handler; + } + + @Override + public String toString() + { + return String.format("{%s,%s}",_handler,Arrays.asList(_contexts)); + } + } + } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java index c118c7ec1da..b79b75dc23c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/HandlerCollection.java @@ -19,6 +19,7 @@ package org.eclipse.jetty.server.handler; import java.io.IOException; +import java.util.Arrays; import java.util.List; import javax.servlet.ServletException; @@ -185,4 +186,12 @@ public class HandlerCollection extends AbstractHandlerContainer child.destroy(); super.destroy(); } + + /* ------------------------------------------------------------ */ + @Override + public String toString() + { + Handler[] handlers=getHandlers(); + return super.toString()+(handlers==null?"[]":Arrays.asList(getHandlers()).toString()); + } } diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java index 5e2adf2a2f1..3c13fea0ae1 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerCollectionTest.java @@ -18,17 +18,24 @@ package org.eclipse.jetty.server.handler; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.IOException; +import javax.servlet.AsyncContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.LocalConnector; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; @@ -84,9 +91,9 @@ public class ContextHandlerCollectionTest c.addHandler(contextC); HandlerList list = new HandlerList(); - list.addHandler(contextD); list.addHandler(contextE); list.addHandler(contextF); + list.addHandler(contextD); c.addHandler(list); server.setHandler(c); @@ -132,18 +139,22 @@ public class ContextHandlerCollectionTest handlerE.reset(); handlerF.reset(); - // System.err.printf("test %d %s@%s --> %s | %s%n",i,uri,host,connector.getName(),handler); + String t = String.format("test %d %s@%s --> %s | %s%n",i,uri,host,connector.getName(),handler); String response = connector.getResponses("GET "+uri+" HTTP/1.0\nHost: "+host+"\n\n"); if (handler==null) { - Assert.assertThat(response,Matchers.containsString(" 302 ")); + Assert.assertThat(t,response,Matchers.containsString(" 302 ")); } - else if (!handler.isHandled()) + else { - System.err.printf("FAILED %d %s@%s --> %s | %s%n",i,uri,host,connector.getName(),handler); - System.err.println(response); - Assert.fail(); + assertThat(t,response,endsWith(handler.toString())); + if (!handler.isHandled()) + { + System.err.printf("FAILED %s",t); + System.err.println(response); + Assert.fail(); + } } } @@ -260,8 +271,148 @@ public class ContextHandlerCollectionTest assertEquals(wrapperB,AbstractHandlerContainer.findContainerOf(contextB,HandlerWrapper.class,handlerB)); } + + @Test + public void testWrappedContext() throws Exception + { + Server server = new Server(); + LocalConnector connector = new LocalConnector(server); + server.setConnectors(new Connector[] { connector }); + + ContextHandler root = new ContextHandler("/"); + root.setHandler(new IsHandledHandler("root")); + + ContextHandler left = new ContextHandler("/left"); + left.setHandler(new IsHandledHandler("left")); + + HandlerList centre = new HandlerList(); + ContextHandler centreLeft = new ContextHandler("/leftcentre"); + centreLeft.setHandler(new IsHandledHandler("left of centre")); + ContextHandler centreRight = new ContextHandler("/rightcentre"); + centreRight.setHandler(new IsHandledHandler("right of centre")); + centre.setHandlers(new Handler[]{centreLeft,new WrappedHandler(centreRight)}); + + ContextHandler right = new ContextHandler("/right"); + right.setHandler(new IsHandledHandler("right")); + + ContextHandlerCollection contexts = new ContextHandlerCollection(); + contexts.setHandlers(new Handler[]{root,left,centre,new WrappedHandler(right)}); + + server.setHandler(contexts); + server.start(); + + String response=connector.getResponses("GET / HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /foobar/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /left/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /leftcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left of centre")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /rightcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right of centre")); + assertThat(response, containsString("Wrapped: TRUE")); + + response=connector.getResponses("GET /right/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right")); + assertThat(response, containsString("Wrapped: TRUE")); + } + @Test + public void testAsyncWrappedContext() throws Exception + { + Server server = new Server(); + LocalConnector connector = new LocalConnector(server); + server.setConnectors(new Connector[] { connector }); + + ContextHandler root = new ContextHandler("/"); + root.setHandler(new AsyncHandler("root")); + + ContextHandler left = new ContextHandler("/left"); + left.setHandler(new AsyncHandler("left")); + + HandlerList centre = new HandlerList(); + ContextHandler centreLeft = new ContextHandler("/leftcentre"); + centreLeft.setHandler(new AsyncHandler("left of centre")); + ContextHandler centreRight = new ContextHandler("/rightcentre"); + centreRight.setHandler(new AsyncHandler("right of centre")); + centre.setHandlers(new Handler[]{centreLeft,new WrappedHandler(centreRight)}); + + ContextHandler right = new ContextHandler("/right"); + right.setHandler(new AsyncHandler("right")); + + ContextHandlerCollection contexts = new ContextHandlerCollection(); + contexts.setHandlers(new Handler[]{root,left,centre,new WrappedHandler(right)}); + + server.setHandler(contexts); + server.start(); + + String response=connector.getResponses("GET / HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /foobar/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("root")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /left/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /leftcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("left of centre")); + assertThat(response, not(containsString("Wrapped: TRUE"))); + + response=connector.getResponses("GET /rightcentre/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right of centre")); + assertThat(response, containsString("Wrapped: ASYNC")); + + response=connector.getResponses("GET /right/info HTTP/1.0\r\n\r\n"); + assertThat(response, startsWith("HTTP/1.1 200 OK")); + assertThat(response, endsWith("right")); + assertThat(response, containsString("Wrapped: ASYNC")); + } + + + private static final class WrappedHandler extends HandlerWrapper + { + WrappedHandler(Handler handler) + { + setHandler(handler); + } + + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + if (response.containsHeader("Wrapped")) + response.setHeader("Wrapped", "ASYNC"); + else + response.setHeader("Wrapped", "TRUE"); + super.handle(target, baseRequest, request, response); + } + } + + private static final class IsHandledHandler extends AbstractHandler { private boolean handled; @@ -298,5 +449,41 @@ public class ContextHandlerCollectionTest } + + private static final class AsyncHandler extends AbstractHandler + { + private final String name; + + public AsyncHandler(String string) + { + name=string; + } + + @Override + public void handle(String s, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException + { + baseRequest.setHandled(true); + + String n = (String)baseRequest.getAttribute("async"); + if (n==null) + { + AsyncContext async=baseRequest.startAsync(); + async.setTimeout(1000); + baseRequest.setAttribute("async", name); + async.dispatch(); + } + else + { + response.getWriter().print(n); + } + } + + @Override + public String toString() + { + return name; + } + } + } From e199b671bb486432498a55b83e5ede89f75d212c Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 23 Jul 2014 16:31:19 +1000 Subject: [PATCH 107/111] 440020 Abort bad proxy responses with sendError(-1) --- .../org/eclipse/jetty/proxy/ProxyServlet.java | 12 +++++++++- .../org/eclipse/jetty/server/HttpChannel.java | 22 +++++-------------- .../eclipse/jetty/server/HttpConnection.java | 4 ++-- .../org/eclipse/jetty/server/HttpOutput.java | 4 ++-- .../org/eclipse/jetty/server/Response.java | 16 ++++++++++---- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java index 115b5544d8c..367badf876d 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java @@ -32,6 +32,7 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; + import javax.servlet.AsyncContext; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -51,6 +52,7 @@ import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpVersion; +import org.eclipse.jetty.server.HttpConnection; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.HttpCookieStore; import org.eclipse.jetty.util.log.Log; @@ -558,7 +560,15 @@ public class ProxyServlet extends HttpServlet _log.debug(getRequestId(request) + " proxying failed", failure); if (response.isCommitted()) { - request.setAttribute("org.eclipse.jetty.server.Response.failure", failure); + // Use Jetty specific behavior to close connection + try + { + response.sendError(-1); + } + catch (IOException e) + { + getServletContext().log("close failed", e); + } AsyncContext asyncContext = request.getAsyncContext(); asyncContext.complete(); } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java index e6abb983113..9248d9f874b 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java @@ -402,21 +402,8 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H } else { - // There is no way in the Servlet API to directly close a connection, - // so we rely on applications to pass this attribute to signal they - // want to hard close the connection, without even closing the output. - Object failure = _request.getAttribute("org.eclipse.jetty.server.Response.failure"); - if (failure != null) - { - if (LOG.isDebugEnabled()) - LOG.debug("Explicit response failure", failure); - failed(); - } - else - { - // Complete generating the response - _response.closeOutput(); - } + // Complete generating the response + _response.closeOutput(); } } catch(EofException|ClosedChannelException e) @@ -812,10 +799,11 @@ public class HttpChannel implements HttpParser.RequestHandler, Runnable, H /** * If a write or similar to this channel fails this method should be called. The standard implementation - * of {@link #failed()} is a noop. But the different implementations of HttpChannel might want to take actions. + * is to call {@link HttpTransport#abort()} */ - public void failed() + public void abort() { + _transport.abort(); } private class CommitCallback implements Callback diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java index c88e08b679b..cec4058cf65 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java @@ -537,10 +537,10 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http } @Override - public void failed() + public void abort() { + super.abort(); _generator.setPersistent(false); - getEndPoint().shutdownOutput(); } @Override diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index 1879dbb6893..12a23d5fb35 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -157,7 +157,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable catch(IOException e) { LOG.debug(e); - _channel.failed(); + _channel.abort(); } releaseBuffer(); return; @@ -192,7 +192,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable catch(IOException e) { LOG.debug(e); - _channel.failed(); + _channel.abort(); } releaseBuffer(); return; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java index eb95e204019..79f4e4989c1 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java @@ -541,10 +541,7 @@ public class Response implements HttpServletResponse @Override public void sendError(int sc) throws IOException { - if (sc == 102) - sendProcessing(); - else - sendError(sc, null); + sendError(sc, null); } @Override @@ -553,6 +550,17 @@ public class Response implements HttpServletResponse if (isIncluding()) return; + switch(code) + { + case -1: + _channel.abort(); + return; + case 102: + sendProcessing(); + return; + default: + } + if (isCommitted()) LOG.warn("Committed before "+code+" "+message); From 3a6879d3e8efb895bf27803735785428f7ed3659 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 23 Jul 2014 16:49:05 +1000 Subject: [PATCH 108/111] expanded tabs in indents --- .../annotations/AnnotationConfiguration.java | 4 +- .../jetty/client/ssl/SslBytesServerTest.java | 14 +- .../jetty/deploy/AppLifeCycleTest.java | 6 +- .../ScanningAppProviderStartupTest.java | 4 +- .../jetty/http/spi/JettyHttpContext.java | 4 +- .../jetty/http/spi/JettyHttpServer.java | 538 +++++++++--------- .../http/spi/JettyHttpServerProvider.java | 4 +- .../eclipse/jetty/jaas/JAASLoginService.java | 2 +- .../eclipse/jetty/jmx/ConnectorServer.java | 24 +- .../maven/plugin/JettyWebAppContext.java | 4 +- .../jetty/monitor/jmx/ServiceConnection.java | 2 +- .../org/eclipse/jetty/nosql/NoSqlSession.java | 2 +- .../nosql/mongodb/MongoSessionManager.java | 4 +- .../HttpServiceErrorHandlerHelper.java | 22 +- .../HttpServiceErrorPageErrorHandler.java | 80 +-- .../eclipse/jetty/overlays/OverlayServer.java | 2 +- .../plus/annotation/ContainerInitializer.java | 2 +- .../jetty/rhttp/gateway/GatewayServer.java | 4 +- .../DeferredAuthentication.java | 40 +- .../authentication/SpnegoAuthenticator.java | 8 +- .../handler/ContextHandlerCollection.java | 110 ++-- .../ssl/SelectChannelServerSslTest.java | 10 +- .../eclipse/jetty/servlet/FilterMapping.java | 30 +- .../org/eclipse/jetty/servlet/Invoker.java | 2 +- .../jetty/servlet/ServletContextHandler.java | 6 +- .../eclipse/jetty/servlet/ServletHandler.java | 32 +- .../eclipse/jetty/servlet/ServletHolder.java | 2 +- .../AsyncContextDispatchWithQueryStrings.java | 104 ++-- .../eclipse/jetty/servlets/WelcomeFilter.java | 6 +- .../servlets/CloseableDoSFilterTest.java | 2 +- .../org/eclipse/jetty/start/StartArgs.java | 6 +- .../eclipse/jetty/util/resource/Resource.java | 2 +- .../eclipse/jetty/util/URLEncodedTest.java | 2 +- .../jetty/util/resource/ResourceTest.java | 6 +- .../jetty/webapp/FragmentConfiguration.java | 8 +- .../jetty/webapp/WebAppClassLoader.java | 2 +- .../eclipse/jetty/webapp/WebAppContext.java | 2 +- .../websocket/client/ClientConnectTest.java | 22 +- .../eclipse/jetty/xml/TestConfiguration.java | 2 +- .../jetty/test/rfcs/RFC2616BaseTest.java | 2 +- .../session/SessionValueSavingTest.java | 32 +- .../AbstractSessionValueSavingTest.java | 20 +- .../src/main/java/com/acme/Counter.java | 4 +- .../src/main/java/com/acme/DateTag.java | 16 +- .../src/main/java/com/acme/Dump.java | 16 +- .../src/main/java/com/acme/HelloWorld.java | 2 +- .../src/main/java/com/acme/LoginServlet.java | 2 +- .../src/main/java/com/acme/RegTest.java | 2 +- .../main/java/com/acme/SecureModeServlet.java | 2 +- .../src/main/java/com/acme/Bar.java | 8 +- 50 files changed, 616 insertions(+), 616 deletions(-) diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java index 2a79a43bd10..8b8d7e28df1 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java @@ -441,14 +441,14 @@ public class AnnotationConfiguration extends AbstractConfiguration // Resolve container initializers List initializers = - (List)context.getAttribute(AnnotationConfiguration.CONTAINER_INITIALIZERS); + (List)context.getAttribute(AnnotationConfiguration.CONTAINER_INITIALIZERS); if (initializers != null && initializers.size()>0) { Map> map = ( Map>) context.getAttribute(AnnotationConfiguration.CLASS_INHERITANCE_MAP); if (map == null) LOG.warn ("ServletContainerInitializers: detected. Class hierarchy: empty"); for (ContainerInitializer i : initializers) - i.resolveClasses(context,map); + i.resolveClasses(context,map); } } diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java index bdef5f21fd9..1f4077f83c3 100644 --- a/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java +++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ssl/SslBytesServerTest.java @@ -1049,9 +1049,9 @@ public class SslBytesServerTest extends SslBytesTest @Test public void testRequestWithBigContentWriteBlockedThenReset() throws Exception { - // Don't run on Windows (buggy JVM) - Assume.assumeTrue(!OS.IS_WINDOWS); - + // Don't run on Windows (buggy JVM) + Assume.assumeTrue(!OS.IS_WINDOWS); + final SSLSocket client = newClient(); SimpleProxy.AutomaticFlow automaticProxyFlow = proxy.startAutomaticFlow(); @@ -1110,10 +1110,10 @@ public class SslBytesServerTest extends SslBytesTest @Test public void testRequestWithBigContentReadBlockedThenReset() throws Exception { - // Don't run on Windows (buggy JVM) - Assume.assumeTrue(!OS.IS_WINDOWS); - - final SSLSocket client = newClient(); + // Don't run on Windows (buggy JVM) + Assume.assumeTrue(!OS.IS_WINDOWS); + + final SSLSocket client = newClient(); SimpleProxy.AutomaticFlow automaticProxyFlow = proxy.startAutomaticFlow(); client.startHandshake(); diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java index 78f113967d9..d296611946d 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/AppLifeCycleTest.java @@ -36,10 +36,10 @@ import org.junit.Test; */ public class AppLifeCycleTest { - @Rule - public TestingDir testdir = new TestingDir(); + @Rule + public TestingDir testdir = new TestingDir(); - private void assertNoPath(String from, String to) + private void assertNoPath(String from, String to) { assertPath(from,to,new ArrayList()); } diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java index eb7e0c0e698..949acfd626f 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderStartupTest.java @@ -30,8 +30,8 @@ import org.junit.Test; */ public class ScanningAppProviderStartupTest { - @Rule - public TestingDir testdir = new TestingDir(); + @Rule + public TestingDir testdir = new TestingDir(); private static XmlConfiguredJetty jetty; @Before diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java index 531e02464d3..b7b838f2741 100644 --- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java +++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java @@ -97,8 +97,8 @@ public class JettyHttpContext extends com.sun.net.httpserver.HttpContext @Override public Authenticator setAuthenticator(Authenticator auth) { - Authenticator previous = _authenticator; - _authenticator = auth; + Authenticator previous = _authenticator; + _authenticator = auth; return previous; } diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java index 417169c0cef..7f1af098d47 100644 --- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java +++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServer.java @@ -1,271 +1,271 @@ -// -// ======================================================================== -// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package org.eclipse.jetty.http.spi; - -import java.io.IOException; -import java.net.InetSocketAddress; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Executor; -import java.util.concurrent.ThreadPoolExecutor; - -import org.eclipse.jetty.server.Connector; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.NetworkConnector; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.server.handler.ContextHandlerCollection; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.util.thread.ThreadPool; - -import com.sun.net.httpserver.HttpContext; -import com.sun.net.httpserver.HttpHandler; - -/** - * Jetty implementation of {@link com.sun.net.httpserver.HttpServer}. - */ -public class JettyHttpServer extends com.sun.net.httpserver.HttpServer +// +// ======================================================================== +// Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd. +// ------------------------------------------------------------------------ +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Eclipse Public License v1.0 +// and Apache License v2.0 which accompanies this distribution. +// +// The Eclipse Public License is available at +// http://www.eclipse.org/legal/epl-v10.html +// +// The Apache License v2.0 is available at +// http://www.opensource.org/licenses/apache2.0.php +// +// You may elect to redistribute this code under either of these licenses. +// ======================================================================== +// + +package org.eclipse.jetty.http.spi; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.Executor; +import java.util.concurrent.ThreadPoolExecutor; + +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.NetworkConnector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.handler.ContextHandlerCollection; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; +import org.eclipse.jetty.util.thread.ThreadPool; + +import com.sun.net.httpserver.HttpContext; +import com.sun.net.httpserver.HttpHandler; + +/** + * Jetty implementation of {@link com.sun.net.httpserver.HttpServer}. + */ +public class JettyHttpServer extends com.sun.net.httpserver.HttpServer { private static final Logger LOG = Log.getLogger(JettyHttpServer.class); - - - private Server _server; - - private boolean _serverShared; - - private InetSocketAddress _addr; - - private ThreadPoolExecutor _executor; - - private Map _contexts = new HashMap(); - - private Map _connectors = new HashMap(); - - - public JettyHttpServer(Server server, boolean shared) - { - this._server = server; - this._serverShared = shared; - } - - @Override - public void bind(InetSocketAddress addr, int backlog) throws IOException - { - // check if there is already a connector listening - Collection connectors = _server.getBeans(NetworkConnector.class); - if (connectors != null) - { - for (NetworkConnector connector : connectors) - { - if (connector.getPort() == addr.getPort()) { - if (LOG.isDebugEnabled()) LOG.debug("server already bound to port " + addr.getPort() + ", no need to rebind"); - return; - } - } - } - - if (_serverShared) - throw new IOException("jetty server is not bound to port " + addr.getPort()); - - this._addr = addr; - - if (LOG.isDebugEnabled()) LOG.debug("binding server to port " + addr.getPort()); - ServerConnector connector = new ServerConnector(_server); - connector.setPort(addr.getPort()); - connector.setHost(addr.getHostName()); - _server.addConnector(connector); - - _connectors.put(addr.getHostName() + addr.getPort(), connector); - } - - @Override - public InetSocketAddress getAddress() - { - return _addr; - } - - @Override - public void start() - { - if (_serverShared) return; - - try - { - _server.start(); - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - } - - @Override - public void setExecutor(Executor executor) - { - if (executor == null) - throw new IllegalArgumentException("missing required 'executor' argument"); - ThreadPool threadPool = _server.getThreadPool(); - if (threadPool instanceof DelegatingThreadPool) - ((DelegatingThreadPool)_server.getThreadPool()).setExecutor(executor); - else - throw new UnsupportedOperationException("!DelegatingThreadPool"); - } - - @Override - public Executor getExecutor() - { - ThreadPool threadPool = _server.getThreadPool(); - if (threadPool instanceof DelegatingThreadPool) - return ((DelegatingThreadPool)_server.getThreadPool()).getExecutor(); - return threadPool; - } - - @Override - public void stop(int delay) - { - cleanUpContexts(); - cleanUpConnectors(); - - if (_serverShared) return; - - try - { - _server.stop(); - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - } - - private void cleanUpContexts() - { - for (Map.Entry stringJettyHttpContextEntry : _contexts.entrySet()) - { - JettyHttpContext context = stringJettyHttpContextEntry.getValue(); - _server.removeBean(context.getJettyContextHandler()); - } - _contexts.clear(); - } - - private void cleanUpConnectors() - { - for (Map.Entry stringConnectorEntry : _connectors.entrySet()) - { - Connector connector = stringConnectorEntry.getValue(); - try - { - connector.stop(); - } catch (Exception ex) { - LOG.warn(ex); - } - _server.removeConnector(connector); - } - _connectors.clear(); - } - - @Override - public HttpContext createContext(String path, HttpHandler httpHandler) - { - checkIfContextIsFree(path); - - JettyHttpContext context = new JettyHttpContext(this, path, httpHandler); - HttpSpiContextHandler jettyContextHandler = context.getJettyContextHandler(); - - ContextHandlerCollection chc = findContextHandlerCollection(_server.getHandlers()); - if (chc == null) - throw new RuntimeException("could not find ContextHandlerCollection, you must configure one"); - - chc.addHandler(jettyContextHandler); - _contexts.put(path, context); - - return context; - } - - private ContextHandlerCollection findContextHandlerCollection(Handler[] handlers) - { - if (handlers == null) - return null; - - for (Handler handler : handlers) - { - if (handler instanceof ContextHandlerCollection) - { - return (ContextHandlerCollection) handler; - } - - if (handler instanceof HandlerCollection) - { - HandlerCollection hc = (HandlerCollection) handler; - ContextHandlerCollection chc = findContextHandlerCollection(hc.getHandlers()); - if (chc != null) - return chc; - } - } - return null; - } - - private void checkIfContextIsFree(String path) - { - Handler serverHandler = _server.getHandler(); - if (serverHandler instanceof ContextHandler) - { - ContextHandler ctx = (ContextHandler) serverHandler; - if (ctx.getContextPath().equals(path)) - throw new RuntimeException("another context already bound to path " + path); - } - - Handler[] handlers = _server.getHandlers(); - if (handlers == null) return; - - for (Handler handler : handlers) - { - if (handler instanceof ContextHandler) { - ContextHandler ctx = (ContextHandler) handler; - if (ctx.getContextPath().equals(path)) - throw new RuntimeException("another context already bound to path " + path); - } - } - } - - @Override - public HttpContext createContext(String path) - { - return createContext(path, null); - } - - @Override - public void removeContext(String path) throws IllegalArgumentException - { - JettyHttpContext context = _contexts.remove(path); - if (context == null) return; - _server.removeBean(context.getJettyContextHandler()); - } - - @Override - public void removeContext(HttpContext context) - { - removeContext(context.getPath()); - } - -} + + + private Server _server; + + private boolean _serverShared; + + private InetSocketAddress _addr; + + private ThreadPoolExecutor _executor; + + private Map _contexts = new HashMap(); + + private Map _connectors = new HashMap(); + + + public JettyHttpServer(Server server, boolean shared) + { + this._server = server; + this._serverShared = shared; + } + + @Override + public void bind(InetSocketAddress addr, int backlog) throws IOException + { + // check if there is already a connector listening + Collection connectors = _server.getBeans(NetworkConnector.class); + if (connectors != null) + { + for (NetworkConnector connector : connectors) + { + if (connector.getPort() == addr.getPort()) { + if (LOG.isDebugEnabled()) LOG.debug("server already bound to port " + addr.getPort() + ", no need to rebind"); + return; + } + } + } + + if (_serverShared) + throw new IOException("jetty server is not bound to port " + addr.getPort()); + + this._addr = addr; + + if (LOG.isDebugEnabled()) LOG.debug("binding server to port " + addr.getPort()); + ServerConnector connector = new ServerConnector(_server); + connector.setPort(addr.getPort()); + connector.setHost(addr.getHostName()); + _server.addConnector(connector); + + _connectors.put(addr.getHostName() + addr.getPort(), connector); + } + + @Override + public InetSocketAddress getAddress() + { + return _addr; + } + + @Override + public void start() + { + if (_serverShared) return; + + try + { + _server.start(); + } + catch (Exception ex) + { + throw new RuntimeException(ex); + } + } + + @Override + public void setExecutor(Executor executor) + { + if (executor == null) + throw new IllegalArgumentException("missing required 'executor' argument"); + ThreadPool threadPool = _server.getThreadPool(); + if (threadPool instanceof DelegatingThreadPool) + ((DelegatingThreadPool)_server.getThreadPool()).setExecutor(executor); + else + throw new UnsupportedOperationException("!DelegatingThreadPool"); + } + + @Override + public Executor getExecutor() + { + ThreadPool threadPool = _server.getThreadPool(); + if (threadPool instanceof DelegatingThreadPool) + return ((DelegatingThreadPool)_server.getThreadPool()).getExecutor(); + return threadPool; + } + + @Override + public void stop(int delay) + { + cleanUpContexts(); + cleanUpConnectors(); + + if (_serverShared) return; + + try + { + _server.stop(); + } + catch (Exception ex) + { + throw new RuntimeException(ex); + } + } + + private void cleanUpContexts() + { + for (Map.Entry stringJettyHttpContextEntry : _contexts.entrySet()) + { + JettyHttpContext context = stringJettyHttpContextEntry.getValue(); + _server.removeBean(context.getJettyContextHandler()); + } + _contexts.clear(); + } + + private void cleanUpConnectors() + { + for (Map.Entry stringConnectorEntry : _connectors.entrySet()) + { + Connector connector = stringConnectorEntry.getValue(); + try + { + connector.stop(); + } catch (Exception ex) { + LOG.warn(ex); + } + _server.removeConnector(connector); + } + _connectors.clear(); + } + + @Override + public HttpContext createContext(String path, HttpHandler httpHandler) + { + checkIfContextIsFree(path); + + JettyHttpContext context = new JettyHttpContext(this, path, httpHandler); + HttpSpiContextHandler jettyContextHandler = context.getJettyContextHandler(); + + ContextHandlerCollection chc = findContextHandlerCollection(_server.getHandlers()); + if (chc == null) + throw new RuntimeException("could not find ContextHandlerCollection, you must configure one"); + + chc.addHandler(jettyContextHandler); + _contexts.put(path, context); + + return context; + } + + private ContextHandlerCollection findContextHandlerCollection(Handler[] handlers) + { + if (handlers == null) + return null; + + for (Handler handler : handlers) + { + if (handler instanceof ContextHandlerCollection) + { + return (ContextHandlerCollection) handler; + } + + if (handler instanceof HandlerCollection) + { + HandlerCollection hc = (HandlerCollection) handler; + ContextHandlerCollection chc = findContextHandlerCollection(hc.getHandlers()); + if (chc != null) + return chc; + } + } + return null; + } + + private void checkIfContextIsFree(String path) + { + Handler serverHandler = _server.getHandler(); + if (serverHandler instanceof ContextHandler) + { + ContextHandler ctx = (ContextHandler) serverHandler; + if (ctx.getContextPath().equals(path)) + throw new RuntimeException("another context already bound to path " + path); + } + + Handler[] handlers = _server.getHandlers(); + if (handlers == null) return; + + for (Handler handler : handlers) + { + if (handler instanceof ContextHandler) { + ContextHandler ctx = (ContextHandler) handler; + if (ctx.getContextPath().equals(path)) + throw new RuntimeException("another context already bound to path " + path); + } + } + } + + @Override + public HttpContext createContext(String path) + { + return createContext(path, null); + } + + @Override + public void removeContext(String path) throws IllegalArgumentException + { + JettyHttpContext context = _contexts.remove(path); + if (context == null) return; + _server.removeBean(context.getJettyContextHandler()); + } + + @Override + public void removeContext(HttpContext context) + { + removeContext(context.getPath()); + } + +} diff --git a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java index 39083bb207d..6cff91d55ea 100644 --- a/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java +++ b/jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java @@ -43,7 +43,7 @@ public class JettyHttpServerProvider extends HttpServerProvider public static void setServer(Server server) { - _server = server; + _server = server; } @Override @@ -51,7 +51,7 @@ public class JettyHttpServerProvider extends HttpServerProvider throws IOException { Server server = _server; - boolean shared = true; + boolean shared = true; if (server == null) { diff --git a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java index a46ff320348..d850e65ad4c 100644 --- a/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java +++ b/jetty-jaas/src/main/java/org/eclipse/jetty/jaas/JAASLoginService.java @@ -210,7 +210,7 @@ public class JAASLoginService extends AbstractLifeCycle implements LoginService } else if (callback instanceof RequestParameterCallback) { - HttpChannel channel = HttpChannel.getCurrentHttpChannel(); + HttpChannel channel = HttpChannel.getCurrentHttpChannel(); if (channel == null) return; diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java index 40624001859..343de02d9b3 100644 --- a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java +++ b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ConnectorServer.java @@ -82,23 +82,23 @@ public class ConnectorServer extends AbstractLifeCycle public ConnectorServer(JMXServiceURL svcUrl, Map environment, String name) throws Exception { - String urlPath = svcUrl.getURLPath(); - int idx = urlPath.indexOf("rmi://"); - if (idx > 0) - { - String hostPort = urlPath.substring(idx+6, urlPath.indexOf('/', idx+6)); - String regHostPort = startRegistry(hostPort); - if (regHostPort != null) { - urlPath = urlPath.replace(hostPort,regHostPort); - svcUrl = new JMXServiceURL(svcUrl.getProtocol(), svcUrl.getHost(), svcUrl.getPort(), urlPath); - } - } + String urlPath = svcUrl.getURLPath(); + int idx = urlPath.indexOf("rmi://"); + if (idx > 0) + { + String hostPort = urlPath.substring(idx+6, urlPath.indexOf('/', idx+6)); + String regHostPort = startRegistry(hostPort); + if (regHostPort != null) { + urlPath = urlPath.replace(hostPort,regHostPort); + svcUrl = new JMXServiceURL(svcUrl.getProtocol(), svcUrl.getHost(), svcUrl.getPort(), urlPath); + } + } MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); _connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(svcUrl, environment, mbeanServer); mbeanServer.registerMBean(_connectorServer,new ObjectName(name)); } - /* ------------------------------------------------------------ */ + /* ------------------------------------------------------------ */ /** * @see org.eclipse.jetty.util.component.AbstractLifeCycle#doStart() */ diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java index 265e2852a7e..6bdb0134128 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java @@ -139,7 +139,7 @@ public class JettyWebAppContext extends WebAppContext } public void setContainerIncludeJarPattern(String pattern) { - _containerIncludeJarPattern = pattern; + _containerIncludeJarPattern = pattern; } public String getContainerIncludeJarPattern() @@ -150,7 +150,7 @@ public class JettyWebAppContext extends WebAppContext public String getWebInfIncludeJarPattern() { - return _webInfIncludeJarPattern; + return _webInfIncludeJarPattern; } public void setWebInfIncludeJarPattern(String pattern) { diff --git a/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/ServiceConnection.java b/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/ServiceConnection.java index 0f11428ff7d..bdce382fed0 100644 --- a/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/ServiceConnection.java +++ b/jetty-monitor/src/main/java/org/eclipse/jetty/monitor/jmx/ServiceConnection.java @@ -82,7 +82,7 @@ public class ServiceConnection */ public String getServiceUrl() { - return _serviceUrl; + return _serviceUrl; } /* ------------------------------------------------------------ */ diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java index 8b732d4d2b3..ae92051e7ad 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java @@ -207,7 +207,7 @@ public class NoSqlSession extends MemSession /* ------------------------------------------------------------ */ public Object getVersion() { - return _version; + return _version; } @Override diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java index d8556da87ac..50384666f53 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java @@ -654,7 +654,7 @@ public class MongoSessionManager extends NoSqlSessionManager /*------------------------------------------------------------ */ private String getContextKey() { - return __CONTEXT + "." + _contextId; + return __CONTEXT + "." + _contextId; } /*------------------------------------------------------------ */ @@ -664,7 +664,7 @@ public class MongoSessionManager extends NoSqlSessionManager */ private String getContextAttributeKey(String attr) { - return getContextKey()+ "." + attr; + return getContextKey()+ "." + attr; } @ManagedOperation(value="purge invalid sessions in the session store based on normal criteria", impact="ACTION") diff --git a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java index 35f186681fd..f8fdc636f8a 100644 --- a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java +++ b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorHandlerHelper.java @@ -30,16 +30,16 @@ import javax.servlet.http.HttpServlet; */ public class HttpServiceErrorHandlerHelper { - private static HttpServlet _customErrorHandler; + private static HttpServlet _customErrorHandler; - public static HttpServlet getCustomErrorHandler() - { - return _customErrorHandler; - } - - public static void setHttpServiceErrorHandler(HttpServlet servlet) - { - _customErrorHandler = servlet; - } - + public static HttpServlet getCustomErrorHandler() + { + return _customErrorHandler; + } + + public static void setHttpServiceErrorHandler(HttpServlet servlet) + { + _customErrorHandler = servlet; + } + } diff --git a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java index 1b08f9b13a9..e9ebc855620 100644 --- a/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java +++ b/jetty-osgi/jetty-osgi-httpservice/src/main/java/org/eclipse/jetty/osgi/httpservice/HttpServiceErrorPageErrorHandler.java @@ -35,46 +35,46 @@ import org.eclipse.jetty.servlet.ErrorPageErrorHandler; public class HttpServiceErrorPageErrorHandler extends ErrorPageErrorHandler { - private static HttpServiceErrorPageErrorHandler INSTANCE; - - public static HttpServiceErrorPageErrorHandler getInstance() - { - return INSTANCE; - } - - public HttpServiceErrorPageErrorHandler() - { - INSTANCE = this; - } + private static HttpServiceErrorPageErrorHandler INSTANCE; + + public static HttpServiceErrorPageErrorHandler getInstance() + { + return INSTANCE; + } + + public HttpServiceErrorPageErrorHandler() + { + INSTANCE = this; + } - @Override - public void handle(String target, Request baseRequest, - HttpServletRequest request, HttpServletResponse response) - throws IOException { - if (HttpServiceErrorHandlerHelper.getCustomErrorHandler() != null) - { - try - { - HttpServiceErrorHandlerHelper.getCustomErrorHandler().service(request, response); - } - catch (ServletException e) - { - //well - } - } - if (!response.isCommitted()) - { - super.handle(target, baseRequest, request, response); - } - } + @Override + public void handle(String target, Request baseRequest, + HttpServletRequest request, HttpServletResponse response) + throws IOException { + if (HttpServiceErrorHandlerHelper.getCustomErrorHandler() != null) + { + try + { + HttpServiceErrorHandlerHelper.getCustomErrorHandler().service(request, response); + } + catch (ServletException e) + { + //well + } + } + if (!response.isCommitted()) + { + super.handle(target, baseRequest, request, response); + } + } - @Override - protected void doStop() throws Exception - { - INSTANCE = null; - super.doStop(); - } - - - + @Override + protected void doStop() throws Exception + { + INSTANCE = null; + super.doStop(); + } + + + } diff --git a/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java b/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java index 8a6f4e7f7a1..c7cb7d977e7 100644 --- a/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java +++ b/jetty-overlay-deployer/src/test/java/org/eclipse/jetty/overlays/OverlayServer.java @@ -86,7 +86,7 @@ public class OverlayServer server.setStopAtShutdown(true); //server.setSendServerVersion(true); - // Uncomment to work with JNDI examples + // Uncomment to work with JNDI examples // new org.eclipse.jetty.plus.jndi.Transaction(new com.atomikos.icatch.jta.UserTransactionImp()); diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java index 66557c5f251..8176916cc54 100644 --- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java +++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/ContainerInitializer.java @@ -157,7 +157,7 @@ public class ContainerInitializer interested.add(c.getName()); } - return String.format("ContainerInitializer{%s,interested=%s,applicable=%s,annotated=%s}",_target.getClass().getName(),interested,_applicableTypeNames,_annotatedTypeNames); + return String.format("ContainerInitializer{%s,interested=%s,applicable=%s,annotated=%s}",_target.getClass().getName(),interested,_applicableTypeNames,_annotatedTypeNames); } public void resolveClasses(WebAppContext context, Map> classMap) diff --git a/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java b/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java index 83068d10d73..713b4fe0eee 100644 --- a/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java +++ b/jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/GatewayServer.java @@ -102,7 +102,7 @@ public class GatewayServer extends Server public GatewayServer() { - this("",DFT_EXT_PATH,DFT_CONNECT_PATH,new StandardTargetIdRetriever()); + this("",DFT_EXT_PATH,DFT_CONNECT_PATH,new StandardTargetIdRetriever()); } public GatewayServer(String contextPath, String externalServletPath,String gatewayServletPath, TargetIdRetriever targetIdRetriever) @@ -145,7 +145,7 @@ public class GatewayServer extends Server public Gateway getGateway() { - return gateway; + return gateway; } public ServletHolder getExternalServlet() diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java index df0f7d92f3a..fe4c64b8bbb 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java @@ -331,28 +331,28 @@ public class DeferredAuthentication implements Authentication.Deferred } @Override - public Collection getHeaderNames() - { - return Collections.emptyList(); - } - - @Override - public String getHeader(String arg0) - { - return null; - } - - @Override - public Collection getHeaders(String arg0) - { + public Collection getHeaderNames() + { return Collections.emptyList(); - } + } - @Override - public int getStatus() - { - return 0; - } + @Override + public String getHeader(String arg0) + { + return null; + } + + @Override + public Collection getHeaders(String arg0) + { + return Collections.emptyList(); + } + + @Override + public int getStatus() + { + return 0; + } }; diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java index 8469c0a800d..e0248b2e595 100644 --- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java +++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java @@ -50,7 +50,7 @@ public class SpnegoAuthenticator extends LoginAuthenticator */ public SpnegoAuthenticator( String authMethod ) { - _authMethod = authMethod; + _authMethod = authMethod; } @Override @@ -77,10 +77,10 @@ public class SpnegoAuthenticator extends LoginAuthenticator { try { - if (DeferredAuthentication.isDeferred(res)) - { + if (DeferredAuthentication.isDeferred(res)) + { return Authentication.UNAUTHENTICATED; - } + } LOG.debug("SpengoAuthenticator: sending challenge"); res.setHeader(HttpHeader.WWW_AUTHENTICATE.asString(), HttpHeader.NEGOTIATE.asString()); diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java index 19396d49ea2..2d77d1c2afe 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandlerCollection.java @@ -173,64 +173,64 @@ public class ContextHandlerCollection extends HandlerCollection { Handler[] handlers = getHandlers(); if (handlers==null || handlers.length==0) - return; + return; - HttpChannelState async = baseRequest.getHttpChannelState(); - if (async.isAsync()) - { - ContextHandler context=async.getContextHandler(); - if (context!=null) - { - Handler branch = _contextBranches.get(context); - - if (branch==null) - context.handle(target,baseRequest,request, response); - else - branch.handle(target, baseRequest, request, response); - return; - } - } - - // data structure which maps a request to a context; first-best match wins - // { context path => [ context ] } - // } - if (target.startsWith("/")) - { - int limit = target.length()-1; - - while (limit>=0) - { - // Get best match - Map.Entry branches = _pathBranches.getBest(target,1,limit); - - - if (branches==null) - break; + HttpChannelState async = baseRequest.getHttpChannelState(); + if (async.isAsync()) + { + ContextHandler context=async.getContextHandler(); + if (context!=null) + { + Handler branch = _contextBranches.get(context); - int l=branches.getKey().length(); - if (l==1 || target.length()==l || target.charAt(l)=='/') - { - for (Branch branch : branches.getValue()) - { - branch.getHandler().handle(target,baseRequest, request, response); - if (baseRequest.isHandled()) - return; - } - } - - limit=l-2; - } - } - else - { + if (branch==null) + context.handle(target,baseRequest,request, response); + else + branch.handle(target, baseRequest, request, response); + return; + } + } + + // data structure which maps a request to a context; first-best match wins + // { context path => [ context ] } + // } + if (target.startsWith("/")) + { + int limit = target.length()-1; + + while (limit>=0) + { + // Get best match + Map.Entry branches = _pathBranches.getBest(target,1,limit); + + + if (branches==null) + break; + + int l=branches.getKey().length(); + if (l==1 || target.length()==l || target.charAt(l)=='/') + { + for (Branch branch : branches.getValue()) + { + branch.getHandler().handle(target,baseRequest, request, response); + if (baseRequest.isHandled()) + return; + } + } + + limit=l-2; + } + } + else + { // This may not work in all circumstances... but then I think it should never be called - for (int i=0;i cache=_chainCache[dispatch]; final Queue lru=_chainLRU[dispatch]; - // Do we have too many cached chains? - while (_maxFilterChainsCacheSize>0 && cache.size()>=_maxFilterChainsCacheSize) - { - // The LRU list is not atomic with the cache map, so be prepared to invalidate if - // a key is not found to delete. - // Delete by LRU (where U==created) - String k=lru.poll(); - if (k==null) - { - cache.clear(); - break; - } - cache.remove(k); - } + // Do we have too many cached chains? + while (_maxFilterChainsCacheSize>0 && cache.size()>=_maxFilterChainsCacheSize) + { + // The LRU list is not atomic with the cache map, so be prepared to invalidate if + // a key is not found to delete. + // Delete by LRU (where U==created) + String k=lru.poll(); + if (k==null) + { + cache.clear(); + break; + } + cache.remove(k); + } - cache.put(key,chain); - lru.add(key); + cache.put(key,chain); + lru.add(key); } else if (filters.size() > 0) chain = new Chain(baseRequest,filters, servletHolder); diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index 32a6d3de6c1..ee57e2ab7db 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -569,7 +569,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope /* ------------------------------------------------------------ */ private void initServlet() - throws ServletException + throws ServletException { Object old_run_as = null; try diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java index ce220866e06..ac91ca79f52 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java @@ -45,67 +45,67 @@ import org.junit.Test; */ public class AsyncContextDispatchWithQueryStrings { - private Server _server = new Server(); - private ServletContextHandler _contextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); - private LocalConnector _connector = new LocalConnector(_server); + private Server _server = new Server(); + private ServletContextHandler _contextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); + private LocalConnector _connector = new LocalConnector(_server); - @Before - public void setUp() throws Exception { - _connector.setIdleTimeout(30000); - _server.setConnectors(new Connector[] { _connector }); + @Before + public void setUp() throws Exception { + _connector.setIdleTimeout(30000); + _server.setConnectors(new Connector[] { _connector }); - _contextHandler.setContextPath("/"); - _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/initialCall"); - _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/firstDispatchWithNewQueryString"); - _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/secondDispatchNewValueForExistingQueryString"); + _contextHandler.setContextPath("/"); + _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/initialCall"); + _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/firstDispatchWithNewQueryString"); + _contextHandler.addServlet(new ServletHolder(new TestServlet()), "/secondDispatchNewValueForExistingQueryString"); - HandlerList handlers = new HandlerList(); - handlers.setHandlers(new Handler[] { _contextHandler, new DefaultHandler() }); + HandlerList handlers = new HandlerList(); + handlers.setHandlers(new Handler[] { _contextHandler, new DefaultHandler() }); - _server.setHandler(handlers); - _server.start(); - } + _server.setHandler(handlers); + _server.start(); + } - @Test - public void testMultipleDispatchesWithNewQueryStrings() throws Exception { - String request = "GET /initialCall?initialParam=right HTTP/1.1\r\n" + "Host: localhost\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" - + "Connection: close\r\n" + "\r\n"; - String responseString = _connector.getResponses(request); - assertTrue("Not the expected response. Check STDOUT for details.", responseString.startsWith("HTTP/1.1 200")); - } + @Test + public void testMultipleDispatchesWithNewQueryStrings() throws Exception { + String request = "GET /initialCall?initialParam=right HTTP/1.1\r\n" + "Host: localhost\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" + + "Connection: close\r\n" + "\r\n"; + String responseString = _connector.getResponses(request); + assertTrue("Not the expected response. Check STDOUT for details.", responseString.startsWith("HTTP/1.1 200")); + } - @After - public void tearDown() throws Exception { - _server.stop(); - _server.join(); - } + @After + public void tearDown() throws Exception { + _server.stop(); + _server.join(); + } - private class TestServlet extends HttpServlet { - private static final long serialVersionUID = 1L; + private class TestServlet extends HttpServlet { + private static final long serialVersionUID = 1L; - @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String path = request.getRequestURI(); - String queryString = request.getQueryString(); - if ("/initialCall".equals(path)) - { - AsyncContext async = request.startAsync(); - async.dispatch("/firstDispatchWithNewQueryString?newQueryString=initialValue"); - assertEquals("initialParam=right", queryString); - } - else if ("/firstDispatchWithNewQueryString".equals(path)) - { + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String path = request.getRequestURI(); + String queryString = request.getQueryString(); + if ("/initialCall".equals(path)) + { + AsyncContext async = request.startAsync(); + async.dispatch("/firstDispatchWithNewQueryString?newQueryString=initialValue"); + assertEquals("initialParam=right", queryString); + } + else if ("/firstDispatchWithNewQueryString".equals(path)) + { AsyncContext async = request.startAsync(); async.dispatch("/secondDispatchNewValueForExistingQueryString?newQueryString=newValue"); assertEquals("newQueryString=initialValue&initialParam=right", queryString); - } - else - { - response.setContentType("text/html"); - response.setStatus(HttpServletResponse.SC_OK); - response.getWriter().println("

        woohhooooo

        "); - assertEquals("newQueryString=newValue&initialParam=right", queryString); - } - } - } + } + else + { + response.setContentType("text/html"); + response.setStatus(HttpServletResponse.SC_OK); + response.getWriter().println("

        woohhooooo

        "); + assertEquals("newQueryString=newValue&initialParam=right", queryString); + } + } + } } diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java index e628ed1b5cb..a17818e8d37 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/WelcomeFilter.java @@ -49,15 +49,15 @@ public class WelcomeFilter implements Filter public void init(FilterConfig filterConfig) { welcome=filterConfig.getInitParameter("welcome"); - if (welcome==null) - welcome="index.html"; + if (welcome==null) + welcome="index.html"; } /* ------------------------------------------------------------ */ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException + throws IOException, ServletException { String path=((HttpServletRequest)request).getServletPath(); if (welcome!=null && path.endsWith("/")) diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java index cb97090d5be..e0804d6781d 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CloseableDoSFilterTest.java @@ -57,6 +57,6 @@ public class CloseableDoSFilterTest extends AbstractDoSFilterTest public void testUnresponsiveClient() throws Exception { // TODO work out why this intermittently fails - LOG.warn("Ignored Closeable testUnresponsiveClient"); + LOG.warn("Ignored Closeable testUnresponsiveClient"); } } diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java index 5801421ca52..4aff293052b 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java @@ -894,9 +894,9 @@ public class StartArgs // only add non-duplicates if (!propertyFileRefs.contains(arg)) { - propertyFileRefs.add(arg); + propertyFileRefs.add(arg); } - return; + return; } // Anything else is unrecognized @@ -938,7 +938,7 @@ public class StartArgs Path propertyFile = baseHome.getPath(propertyFileRef); if (!FS.exists(propertyFile)) { - propertyFile = baseHome.getPath("etc/" + propertyFileRef); + propertyFile = baseHome.getPath("etc/" + propertyFileRef); } addUniquePropertyFile(propertyFileRef,propertyFile); } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java index 181ccf0d2af..426b46ea42e 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java @@ -549,7 +549,7 @@ public abstract class Resource implements ResourceFactory, Closeable buf.append(""); } buf.append("\n"); - buf.append("\n"); + buf.append("\n"); return buf.toString(); } diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java index 297b8e14027..5614edfb3ff 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java @@ -199,7 +199,7 @@ public class URLEncodedTest /* -------------------------------------------------------------- */ @Test public void testUrlEncodedStream() - throws Exception + throws Exception { String [][] charsets = new String[][] { diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java index 852a06b2933..688bb18ac8e 100644 --- a/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java +++ b/jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java @@ -124,9 +124,9 @@ public class ResourceTest __userURL=uri.toURL(); __userURL = MavenTestingUtils.getTestResourcesDir().toURI().toURL(); - FilePermission perm = (FilePermission) __userURL.openConnection().getPermission(); - __userDir = new File(perm.getName()).getCanonicalPath() + File.separatorChar; - __relDir = "src/test/resources/".replace('/', File.separatorChar); + FilePermission perm = (FilePermission) __userURL.openConnection().getPermission(); + __userDir = new File(perm.getName()).getCanonicalPath() + File.separatorChar; + __relDir = "src/test/resources/".replace('/', File.separatorChar); //System.err.println("User Dir="+__userDir); //System.err.println("Rel Dir="+__relDir); diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java index 4a7a04bb237..7bd19c7e3c4 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/FragmentConfiguration.java @@ -75,10 +75,10 @@ public class FragmentConfiguration extends AbstractConfiguration { for (Resource key : frags.keySet()) { - if (key.isDirectory()) //tolerate the case where the library is a directory, not a jar. useful for OSGi for example - { - metaData.addFragment(key, frags.get(key)); - } + if (key.isDirectory()) //tolerate the case where the library is a directory, not a jar. useful for OSGi for example + { + metaData.addFragment(key, frags.get(key)); + } else //the standard case: a jar most likely inside WEB-INF/lib { metaData.addFragment(key, frags.get(key)); diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java index 2ae1cae451f..dfb2ee46bf1 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppClassLoader.java @@ -221,7 +221,7 @@ public class WebAppClassLoader extends URLClassLoader * with '/'. */ public void addClassPath(String classPath) - throws IOException + throws IOException { if (classPath == null) return; diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java index c2eec1e1977..e55b578b420 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java @@ -914,7 +914,7 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL /* ------------------------------------------------------------ */ protected void loadConfigurations() - throws Exception + throws Exception { //if the configuration instances have been set explicitly, use them if (_configurations.size()>0) diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java index 1bc082eb759..ac4c4130f79 100644 --- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java +++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java @@ -67,8 +67,8 @@ public class ClientConnectTest Throwable cause = e.getCause(); if(!errorClass.isInstance(cause)) { - cause.printStackTrace(System.err); - Assert.assertThat("ExecutionException.cause",cause,instanceOf(errorClass)); + cause.printStackTrace(System.err); + Assert.assertThat("ExecutionException.cause",cause,instanceOf(errorClass)); } // Validate websocket captured cause @@ -359,15 +359,15 @@ public class ClientConnectTest } catch (ExecutionException e) { - if(OS.IS_WINDOWS) - { - // On windows, this is a SocketTimeoutException - assertExpectedError(e, wsocket, SocketTimeoutException.class); - } else - { - // Expected path - java.net.ConnectException - assertExpectedError(e,wsocket,ConnectException.class); - } + if(OS.IS_WINDOWS) + { + // On windows, this is a SocketTimeoutException + assertExpectedError(e, wsocket, SocketTimeoutException.class); + } else + { + // Expected path - java.net.ConnectException + assertExpectedError(e,wsocket,ConnectException.class); + } } } diff --git a/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java b/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java index 673a1dabc02..678f95184a9 100644 --- a/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java +++ b/jetty-xml/src/test/java/org/eclipse/jetty/xml/TestConfiguration.java @@ -79,7 +79,7 @@ public class TestConfiguration extends HashMap public void setPropertyTest(int value) { - propValue=value; + propValue=value; } public TestConfiguration getNested() diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/rfcs/RFC2616BaseTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/rfcs/RFC2616BaseTest.java index b2a32225a0f..ae891279c7b 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/rfcs/RFC2616BaseTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/rfcs/RFC2616BaseTest.java @@ -86,7 +86,7 @@ public abstract class RFC2616BaseTest public static void setUpServer(TestableJettyServer testableserver, Class testclazz) throws Exception { - File testWorkDir = MavenTestingUtils.getTargetTestingDir(testclazz.getName()); + File testWorkDir = MavenTestingUtils.getTargetTestingDir(testclazz.getName()); FS.ensureDirExists(testWorkDir); System.setProperty("java.io.tmpdir",testWorkDir.getAbsolutePath()); diff --git a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java index 6a37d8c7009..9d1d92e39de 100644 --- a/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java +++ b/tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/SessionValueSavingTest.java @@ -34,21 +34,21 @@ public class SessionValueSavingTest extends AbstractSessionValueSavingTest return new JdbcTestServer(port,max,scavenge); } - @Test - public void testSessionValueSaving() throws Exception - { - super.testSessionValueSaving(); - } + @Test + public void testSessionValueSaving() throws Exception + { + super.testSessionValueSaving(); + } - @After - public void tearDown() throws Exception - { - try - { - DriverManager.getConnection( "jdbc:derby:sessions;shutdown=true" ); - } - catch( SQLException expected ) - { - } - } + @After + public void tearDown() throws Exception + { + try + { + DriverManager.getConnection( "jdbc:derby:sessions;shutdown=true" ); + } + catch( SQLException expected ) + { + } + } } diff --git a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionValueSavingTest.java b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionValueSavingTest.java index 85e3dd7d36a..7cb0e9252bc 100644 --- a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionValueSavingTest.java +++ b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractSessionValueSavingTest.java @@ -133,8 +133,8 @@ public abstract class AbstractSessionValueSavingTest System.out.println("not init call " + session); if (session!=null) { - long value = System.currentTimeMillis(); - System.out.println("Setting test to : " + value); + long value = System.currentTimeMillis(); + System.out.println("Setting test to : " + value); session.setAttribute("test", value); } @@ -148,14 +148,14 @@ public abstract class AbstractSessionValueSavingTest private void sendResult(HttpSession session, PrintWriter writer) { - if (session != null) - { - writer.print(session.getAttribute("test")); - } - else - { - writer.print(0); - } + if (session != null) + { + writer.print(session.getAttribute("test")); + } + else + { + writer.print(0); + } } } diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Counter.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Counter.java index 06d509c72a3..71c97f26383 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Counter.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Counter.java @@ -26,8 +26,8 @@ public class Counter implements java.io.Serializable public int getCount() { - counter++; - return counter; + counter++; + return counter; } public void setLast(String uri) { diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DateTag.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DateTag.java index 81cb9b7e225..19f79dcb732 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DateTag.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/DateTag.java @@ -50,22 +50,22 @@ public class DateTag extends BodyTagSupport public void doInitBody() throws JspException {} public int doAfterBody() throws JspException { - try - { + try + { SimpleDateFormat format = new SimpleDateFormat(body.getString()); format.setTimeZone(TimeZone.getTimeZone(tz)); - body.getEnclosingWriter().write(format.format(new Date())); - return SKIP_BODY; - } - catch (Exception ex) { + body.getEnclosingWriter().write(format.format(new Date())); + return SKIP_BODY; + } + catch (Exception ex) { ex.printStackTrace(); throw new JspTagException(ex.toString()); - } + } } public void release() { - body=null; + body=null; } } diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java index fe97a1eb26e..ed36783d194 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/Dump.java @@ -68,16 +68,16 @@ public class Dump extends HttpServlet @Override public void init(ServletConfig config) throws ServletException { - super.init(config); + super.init(config); - if (config.getInitParameter("unavailable")!=null && !fixed) - { + if (config.getInitParameter("unavailable")!=null && !fixed) + { - fixed=true; - throw new UnavailableException("Unavailable test",Integer.parseInt(config.getInitParameter("unavailable"))); - } + fixed=true; + throw new UnavailableException("Unavailable test",Integer.parseInt(config.getInitParameter("unavailable"))); + } - _timer=new Timer(true); + _timer=new Timer(true); } /* ------------------------------------------------------------ */ @@ -118,7 +118,7 @@ public class Dump extends HttpServlet } catch(ServletException se) { - se.printStackTrace(); + se.printStackTrace(); } } diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/HelloWorld.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/HelloWorld.java index ede15a8ffed..9970e4ad5a6 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/HelloWorld.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/HelloWorld.java @@ -37,7 +37,7 @@ public class HelloWorld extends HttpServlet @Override public void init(ServletConfig config) throws ServletException { - super.init(config); + super.init(config); } /* ------------------------------------------------------------ */ diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/LoginServlet.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/LoginServlet.java index f83bdf668f5..e31b7b72a8a 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/LoginServlet.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/LoginServlet.java @@ -38,7 +38,7 @@ public class LoginServlet extends HttpServlet @Override public void init(ServletConfig config) throws ServletException { - super.init(config); + super.init(config); } /* ------------------------------------------------------------ */ diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RegTest.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RegTest.java index c867a1646ef..dc0e8123580 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RegTest.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/RegTest.java @@ -44,7 +44,7 @@ public class RegTest extends HttpServlet @Override public void init(ServletConfig config) throws ServletException { - super.init(config); + super.init(config); } /* ------------------------------------------------------------ */ diff --git a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java index 6ba2216ca06..3285b9c1475 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java +++ b/tests/test-webapps/test-jetty-webapp/src/main/java/com/acme/SecureModeServlet.java @@ -48,7 +48,7 @@ public class SecureModeServlet extends HttpServlet @Override public void init(ServletConfig config) throws ServletException { - super.init(config); + super.init(config); } /* ------------------------------------------------------------ */ diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/Bar.java b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/Bar.java index 01d21a5ca24..bbb083fb088 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/Bar.java +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/src/main/java/com/acme/Bar.java @@ -20,9 +20,9 @@ package com.acme; public class Bar { - - @Foo(2) - public void someMethod () { - } + + @Foo(2) + public void someMethod () { + } } From 103cdbf6efe714136b082950ad2d54a5616f950f Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 23 Jul 2014 11:35:47 +0200 Subject: [PATCH 109/111] Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. --- .../jetty/proxy/AsyncProxyServlet.java | 32 +++++++++---- .../eclipse/jetty/proxy/BalancerServlet.java | 4 +- .../eclipse/jetty/proxy/ProxyConnection.java | 3 +- .../org/eclipse/jetty/proxy/ProxyServlet.java | 46 +++++++++++-------- 4 files changed, 54 insertions(+), 31 deletions(-) diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java index 6ebc85ca219..518051d6901 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/AsyncProxyServlet.java @@ -60,7 +60,8 @@ public class AsyncProxyServlet extends ProxyServlet { try { - _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); StreamWriter writeListener = (StreamWriter)request.getAttribute(WRITE_LISTENER_ATTRIBUTE); if (writeListener == null) { @@ -130,24 +131,30 @@ public class AsyncProxyServlet extends ProxyServlet { int requestId = getRequestId(request); ServletInputStream input = request.getInputStream(); - _log.debug("{} asynchronous read start on {}", requestId, input); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous read start on {}", requestId, input); // First check for isReady() because it has // side effects, and then for isFinished(). while (input.isReady() && !input.isFinished()) { int read = input.read(buffer); - _log.debug("{} asynchronous read {} bytes on {}", requestId, read, input); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous read {} bytes on {}", requestId, read, input); if (read > 0) { - _log.debug("{} proxying content to upstream: {} bytes", requestId, read); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to upstream: {} bytes", requestId, read); onRequestContent(proxyRequest, request, provider, buffer, 0, read, this); // Do not call isReady() so that we can apply backpressure. break; } } if (!input.isFinished()) - _log.debug("{} asynchronous read pending on {}", requestId, input); + { + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous read pending on {}", requestId, input); + } } protected void onRequestContent(Request proxyRequest, HttpServletRequest request, DeferredContentProvider provider, byte[] buffer, int offset, int length, Callback callback) @@ -158,7 +165,8 @@ public class AsyncProxyServlet extends ProxyServlet @Override public void onAllDataRead() throws IOException { - _log.debug("{} proxying content to upstream completed", getRequestId(request)); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to upstream completed", getRequestId(request)); provider.close(); } @@ -225,23 +233,27 @@ public class AsyncProxyServlet extends ProxyServlet if (state == WriteState.READY) { // There is data to write. - _log.debug("{} asynchronous write start of {} bytes on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write start of {} bytes on {}", requestId, length, output); output.write(buffer, offset, length); state = WriteState.PENDING; if (output.isReady()) { - _log.debug("{} asynchronous write of {} bytes completed on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write of {} bytes completed on {}", requestId, length, output); complete(); } else { - _log.debug("{} asynchronous write of {} bytes pending on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write of {} bytes pending on {}", requestId, length, output); } } else if (state == WriteState.PENDING) { // The write blocked but is now complete. - _log.debug("{} asynchronous write of {} bytes completing on {}", requestId, length, output); + if (_log.isDebugEnabled()) + _log.debug("{} asynchronous write of {} bytes completing on {}", requestId, length, output); complete(); } else diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java index fed4bf402b7..ff4ae867dbb 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/BalancerServlet.java @@ -26,7 +26,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; - import javax.servlet.ServletException; import javax.servlet.UnavailableException; import javax.servlet.http.Cookie; @@ -133,7 +132,8 @@ public class BalancerServlet extends ProxyServlet protected URI rewriteURI(HttpServletRequest request) { BalancerMember balancerMember = selectBalancerMember(request); - _log.debug("Selected {}", balancerMember); + if (_log.isDebugEnabled()) + _log.debug("Selected {}", balancerMember); String path = request.getRequestURI(); String query = request.getQueryString(); if (query != null) diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java index 5eb72ec059d..3a620f43a17 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyConnection.java @@ -119,7 +119,8 @@ public abstract class ProxyConnection extends AbstractConnection } catch (IOException x) { - LOG.debug(ProxyConnection.this + " could not fill", x); + if (LOG.isDebugEnabled()) + LOG.debug(ProxyConnection.this + " could not fill", x); disconnect(); return Action.SUCCEEDED; } diff --git a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java index 367badf876d..ed00af25641 100644 --- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java +++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java @@ -32,7 +32,6 @@ import java.util.Set; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; - import javax.servlet.AsyncContext; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; @@ -52,7 +51,6 @@ import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpHeaderValue; import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.server.HttpConnection; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.HttpCookieStore; import org.eclipse.jetty.util.log.Log; @@ -203,7 +201,8 @@ public class ProxyServlet extends HttpServlet } catch (Exception x) { - _log.debug(x); + if (_log.isDebugEnabled()) + _log.debug(x); } } @@ -364,7 +363,8 @@ public class ProxyServlet extends HttpServlet { if (!_whiteList.contains(hostPort)) { - _log.debug("Host {}:{} not whitelisted", host, port); + if (_log.isDebugEnabled()) + _log.debug("Host {}:{} not whitelisted", host, port); return false; } } @@ -372,7 +372,8 @@ public class ProxyServlet extends HttpServlet { if (_blackList.contains(hostPort)) { - _log.debug("Host {}:{} blacklisted", host, port); + if (_log.isDebugEnabled()) + _log.debug("Host {}:{} blacklisted", host, port); return false; } } @@ -391,7 +392,8 @@ public class ProxyServlet extends HttpServlet StringBuffer uri = request.getRequestURL(); if (request.getQueryString() != null) uri.append("?").append(request.getQueryString()); - _log.debug("{} rewriting: {} -> {}", requestId, uri, rewrittenURI); + if (_log.isDebugEnabled()) + _log.debug("{} rewriting: {} -> {}", requestId, uri, rewrittenURI); } if (rewrittenURI == null) @@ -495,7 +497,8 @@ public class ProxyServlet extends HttpServlet protected void onClientRequestFailure(Request proxyRequest, HttpServletRequest request, Throwable failure) { - _log.debug(getRequestId(request) + " client request failure", failure); + if (_log.isDebugEnabled()) + _log.debug(getRequestId(request) + " client request failure", failure); proxyRequest.abort(failure); } @@ -538,7 +541,8 @@ public class ProxyServlet extends HttpServlet { try { - _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to downstream: {} bytes", getRequestId(request), length); response.getOutputStream().write(buffer, offset, length); callback.succeeded(); } @@ -550,27 +554,30 @@ public class ProxyServlet extends HttpServlet protected void onResponseSuccess(HttpServletRequest request, HttpServletResponse response, Response proxyResponse) { - _log.debug("{} proxying successful", getRequestId(request)); + if (_log.isDebugEnabled()) + _log.debug("{} proxying successful", getRequestId(request)); AsyncContext asyncContext = request.getAsyncContext(); asyncContext.complete(); } protected void onResponseFailure(HttpServletRequest request, HttpServletResponse response, Response proxyResponse, Throwable failure) { - _log.debug(getRequestId(request) + " proxying failed", failure); + if (_log.isDebugEnabled()) + _log.debug(getRequestId(request) + " proxying failed", failure); if (response.isCommitted()) { - // Use Jetty specific behavior to close connection try { + // Use Jetty specific behavior to close connection. response.sendError(-1); + AsyncContext asyncContext = request.getAsyncContext(); + asyncContext.complete(); } - catch (IOException e) + catch (IOException x) { - getServletContext().log("close failed", e); + if (_log.isDebugEnabled()) + _log.debug(getRequestId(request) + " could not close the connection", failure); } - AsyncContext asyncContext = request.getAsyncContext(); - asyncContext.complete(); } else { @@ -687,7 +694,8 @@ public class ProxyServlet extends HttpServlet String contextPath = config.getServletContext().getContextPath(); _prefix = _prefix == null ? contextPath : (contextPath + _prefix); - proxyServlet._log.debug(config.getServletName() + " @ " + _prefix + " to " + _proxyTo); + if (proxyServlet._log.isDebugEnabled()) + proxyServlet._log.debug(config.getServletName() + " @ " + _prefix + " to " + _proxyTo); } protected URI rewriteURI(HttpServletRequest request) @@ -807,7 +815,8 @@ public class ProxyServlet extends HttpServlet onResponseSuccess(request, response, result.getResponse()); else onResponseFailure(request, response, result.getResponse(), result.getFailure()); - _log.debug("{} proxying complete", getRequestId(request)); + if (_log.isDebugEnabled()) + _log.debug("{} proxying complete", getRequestId(request)); } } @@ -832,7 +841,8 @@ public class ProxyServlet extends HttpServlet @Override protected ByteBuffer onRead(byte[] buffer, int offset, int length) { - _log.debug("{} proxying content to upstream: {} bytes", getRequestId(request), length); + if (_log.isDebugEnabled()) + _log.debug("{} proxying content to upstream: {} bytes", getRequestId(request), length); return onRequestContent(proxyRequest, request, buffer, offset, length); } From 5956b9e013eeacac3e2d320c4bb271f1036dff5e Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 23 Jul 2014 14:07:14 +0200 Subject: [PATCH 110/111] 411323 - DosFilter/QoSFilter should use AsyncContext rather than Continuations. --- .../org/eclipse/jetty/servlets/DoSFilter.java | 198 +++++++++++------- .../org/eclipse/jetty/servlets/QoSFilter.java | 6 +- .../eclipse/jetty/servlets/DoSFilterTest.java | 9 +- .../test/resources/jetty-logging.properties | 1 + 4 files changed, 133 insertions(+), 81 deletions(-) diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java index d644a5a5105..174930af86a 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java @@ -31,7 +31,9 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; - +import javax.servlet.AsyncContext; +import javax.servlet.AsyncEvent; +import javax.servlet.AsyncListener; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -47,9 +49,7 @@ import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; import javax.servlet.http.HttpSessionEvent; -import org.eclipse.jetty.continuation.Continuation; -import org.eclipse.jetty.continuation.ContinuationListener; -import org.eclipse.jetty.continuation.ContinuationSupport; +import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.annotation.ManagedObject; import org.eclipse.jetty.util.annotation.ManagedOperation; @@ -168,7 +168,10 @@ public class DoSFilter implements Filter private static final int USER_IP = 1; private static final int USER_UNKNOWN = 0; - private ServletContext _context; + private final String _suspended = "DoSFilter@" + Integer.toHexString(hashCode()) + ".SUSPENDED"; + private final String _resumed = "DoSFilter@" + Integer.toHexString(hashCode()) + ".RESUMED"; + private final ConcurrentHashMap _rateTrackers = new ConcurrentHashMap<>(); + private final List _whitelist = new CopyOnWriteArrayList<>(); private volatile long _delayMs; private volatile long _throttleMs; private volatile long _maxWaitMs; @@ -181,34 +184,18 @@ public class DoSFilter implements Filter private Semaphore _passes; private volatile int _throttledRequests; private volatile int _maxRequestsPerSec; - private Queue[] _queue; - private ContinuationListener[] _listeners; - private final ConcurrentHashMap _rateTrackers = new ConcurrentHashMap<>(); - private final List _whitelist = new CopyOnWriteArrayList<>(); + private Queue[] _queues; + private AsyncListener[] _listeners; private Scheduler _scheduler; public void init(FilterConfig filterConfig) throws ServletException { - _context = filterConfig.getServletContext(); - - _queue = new Queue[getMaxPriority() + 1]; - _listeners = new ContinuationListener[getMaxPriority() + 1]; - for (int p = 0; p < _queue.length; p++) + _queues = new Queue[getMaxPriority() + 1]; + _listeners = new AsyncListener[_queues.length]; + for (int p = 0; p < _queues.length; p++) { - _queue[p] = new ConcurrentLinkedQueue<>(); - - final int priority = p; - _listeners[p] = new ContinuationListener() - { - public void onComplete(Continuation continuation) - { - } - - public void onTimeout(Continuation continuation) - { - _queue[priority].remove(continuation); - } - }; + _queues[p] = new ConcurrentLinkedQueue<>(); + _listeners[p] = new DoSAsyncListener(p); } _rateTrackers.clear(); @@ -275,8 +262,9 @@ public class DoSFilter implements Filter _scheduler = startScheduler(); - if (_context != null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) - _context.setAttribute(filterConfig.getFilterName(), this); + ServletContext context = filterConfig.getServletContext(); + if (context != null && Boolean.parseBoolean(filterConfig.getInitParameter(MANAGED_ATTR_INIT_PARAM))) + context.setAttribute(filterConfig.getFilterName(), this); } protected Scheduler startScheduler() throws ServletException @@ -306,37 +294,40 @@ public class DoSFilter implements Filter return; } - // Look for the rate tracker for this request + // Look for the rate tracker for this request. RateTracker tracker = (RateTracker)request.getAttribute(__TRACKER); - if (tracker == null) { // This is the first time we have seen this request. + if (LOG.isDebugEnabled()) + LOG.debug("Filtering {}", request); - // get a rate tracker associated with this request, and record one hit + // Get a rate tracker associated with this request, and record one hit. tracker = getRateTracker(request); // Calculate the rate and check it is over the allowed limit final boolean overRateLimit = tracker.isRateExceeded(System.currentTimeMillis()); - // pass it through if we are not currently over the rate limit + // Pass it through if we are not currently over the rate limit. if (!overRateLimit) { + if (LOG.isDebugEnabled()) + LOG.debug("Allowing {}", request); doFilterChain(filterChain, request, response); return; } // We are over the limit. - // So either reject it, delay it or throttle it + // So either reject it, delay it or throttle it. long delayMs = getDelayMs(); boolean insertHeaders = isInsertHeaders(); switch ((int)delayMs) { case -1: { - // Reject this request - LOG.warn("DOS ALERT: Request rejected ip=" + request.getRemoteAddr() + ",session=" + request.getRequestedSessionId() + ",user=" + request.getUserPrincipal()); + // Reject this request. + LOG.warn("DOS ALERT: Request rejected ip={}, session={}, user={}", request.getRemoteAddr(), request.getRequestedSessionId(), request.getUserPrincipal()); if (insertHeaders) response.addHeader("DoSFilter", "unavailable"); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); @@ -344,39 +335,41 @@ public class DoSFilter implements Filter } case 0: { - // fall through to throttle code - LOG.warn("DOS ALERT: Request throttled ip=" + request.getRemoteAddr() + ",session=" + request.getRequestedSessionId() + ",user=" + request.getUserPrincipal()); + // Fall through to throttle the request. + LOG.warn("DOS ALERT: Request throttled ip={}, session={}, user={}", request.getRemoteAddr(), request.getRequestedSessionId(), request.getUserPrincipal()); request.setAttribute(__TRACKER, tracker); break; } default: { - // insert a delay before throttling the request - LOG.warn("DOS ALERT: Request delayed="+delayMs+"ms ip=" + request.getRemoteAddr() + ",session=" + request.getRequestedSessionId() + ",user=" + request.getUserPrincipal()); + // Insert a delay before throttling the request, + // using the suspend+timeout mechanism of AsyncContext. + LOG.warn("DOS ALERT: Request delayed={}ms, ip={}, session={}, user={}", delayMs, request.getRemoteAddr(), request.getRequestedSessionId(), request.getUserPrincipal()); if (insertHeaders) response.addHeader("DoSFilter", "delayed"); - Continuation continuation = ContinuationSupport.getContinuation(request); request.setAttribute(__TRACKER, tracker); + AsyncContext asyncContext = request.startAsync(); if (delayMs > 0) - continuation.setTimeout(delayMs); - continuation.suspend(); + asyncContext.setTimeout(delayMs); + asyncContext.addListener(new DoSTimeoutAsyncListener()); return; } } } - // Throttle the request + if (LOG.isDebugEnabled()) + LOG.debug("Throttling {}", request); + + // Throttle the request. boolean accepted = false; try { - // check if we can afford to accept another request at this time + // Check if we can afford to accept another request at this time. accepted = _passes.tryAcquire(getMaxWaitMs(), TimeUnit.MILLISECONDS); - if (!accepted) { - // we were not accepted, so either we suspend to wait,or if we were woken up we insist or we fail - final Continuation continuation = ContinuationSupport.getContinuation(request); - + // We were not accepted, so either we suspend to wait, + // or if we were woken up we insist or we fail. Boolean throttled = (Boolean)request.getAttribute(__THROTTLED); long throttleMs = getThrottleMs(); if (throttled != Boolean.TRUE && throttleMs > 0) @@ -385,30 +378,39 @@ public class DoSFilter implements Filter request.setAttribute(__THROTTLED, Boolean.TRUE); if (isInsertHeaders()) response.addHeader("DoSFilter", "throttled"); + AsyncContext asyncContext = request.startAsync(); + request.setAttribute(_suspended, Boolean.TRUE); if (throttleMs > 0) - continuation.setTimeout(throttleMs); - continuation.suspend(); - - continuation.addContinuationListener(_listeners[priority]); - _queue[priority].add(continuation); + asyncContext.setTimeout(throttleMs); + asyncContext.addListener(_listeners[priority]); + _queues[priority].add(asyncContext); + if (LOG.isDebugEnabled()) + LOG.debug("Throttled {}, {}ms", request, throttleMs); return; } - // else were we resumed? - else if (request.getAttribute("javax.servlet.resumed") == Boolean.TRUE) + + Boolean resumed = (Boolean)request.getAttribute(_resumed); + if (resumed == Boolean.TRUE) { - // we were resumed and somebody stole our pass, so we wait for the next one. + // We were resumed, we wait for the next pass. _passes.acquire(); accepted = true; } } - // if we were accepted (either immediately or after throttle) + // If we were accepted (either immediately or after throttle)... if (accepted) - // call the chain + { + // ...call the chain. + if (LOG.isDebugEnabled()) + LOG.debug("Allowing {}", request); doFilterChain(filterChain, request, response); + } else { - // fail the request + // ...otherwise fail the request. + if (LOG.isDebugEnabled()) + LOG.debug("Rejecting {}", request); if (isInsertHeaders()) response.addHeader("DoSFilter", "unavailable"); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); @@ -416,21 +418,28 @@ public class DoSFilter implements Filter } catch (InterruptedException e) { - _context.log("DoS", e); response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE); } finally { if (accepted) { - // wake up the next highest priority request. - for (int p = _queue.length; p-- > 0; ) + // Wake up the next highest priority request. + for (int p = _queues.length - 1; p >= 0; --p) { - Continuation continuation = _queue[p].poll(); - if (continuation != null && continuation.isSuspended()) + AsyncContext asyncContext = _queues[p].poll(); + if (asyncContext != null) { - continuation.resume(); - break; + ServletRequest candidate = asyncContext.getRequest(); + Boolean suspended = (Boolean)candidate.getAttribute(_suspended); + if (suspended == Boolean.TRUE) + { + if (LOG.isDebugEnabled()) + LOG.debug("Resuming {}", request); + candidate.setAttribute(_resumed, Boolean.TRUE); + asyncContext.dispatch(); + break; + } } } _passes.release(); @@ -449,7 +458,6 @@ public class DoSFilter implements Filter closeConnection(request, response, thread); } }; - Scheduler.Task task = _scheduler.schedule(requestTimeout, getMaxRequestMs(), TimeUnit.MILLISECONDS); try { @@ -1056,10 +1064,10 @@ public class DoSFilter implements Filter { private static final long serialVersionUID = 3534663738034577872L; - transient protected final String _id; - transient protected final int _type; - transient protected final long[] _timestamps; - transient protected int _next; + protected transient final String _id; + protected transient final int _type; + protected transient final long[] _timestamps; + protected transient int _next; public RateTracker(String id, int type, int maxRequestsPerSecond) { @@ -1115,7 +1123,8 @@ public class DoSFilter implements Filter //and ensure that we take ourselves out of the session so we are not saved _rateTrackers.remove(_id); se.getSession().removeAttribute(__TRACKER); - if (LOG.isDebugEnabled()) LOG.debug("Value removed: {}", getId()); + if (LOG.isDebugEnabled()) + LOG.debug("Value removed: {}", getId()); } public void sessionDidActivate(HttpSessionEvent se) @@ -1171,4 +1180,45 @@ public class DoSFilter implements Filter return "Fixed" + super.toString(); } } + + private class DoSTimeoutAsyncListener implements AsyncListener + { + @Override + public void onStartAsync(AsyncEvent event) throws IOException + { + } + + @Override + public void onComplete(AsyncEvent event) throws IOException + { + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + event.getAsyncContext().dispatch(); + } + + @Override + public void onError(AsyncEvent event) throws IOException + { + } + } + + private class DoSAsyncListener extends DoSTimeoutAsyncListener + { + private final int priority; + + public DoSAsyncListener(int priority) + { + this.priority = priority; + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + _queues[priority].remove(event.getAsyncContext()); + super.onTimeout(event); + } + } } diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java index 0338900ce8d..d1df22b978f 100644 --- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java +++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/QoSFilter.java @@ -362,8 +362,10 @@ public class QoSFilter implements Filter public void onTimeout(AsyncEvent event) throws IOException { // Remove before it's redispatched, so it won't be - // redispatched again in the finally block below. - _queues[priority].remove(event.getAsyncContext()); + // redispatched again at the end of the filtering. + AsyncContext asyncContext = event.getAsyncContext(); + _queues[priority].remove(asyncContext); + asyncContext.dispatch(); } @Override diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java index 69353f6a9ef..66f787e9d58 100644 --- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java +++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/DoSFilterTest.java @@ -18,12 +18,8 @@ package org.eclipse.jetty.servlets; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.List; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,6 +30,9 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class DoSFilterTest extends AbstractDoSFilterTest { private static final Logger LOG = Log.getLogger(DoSFilterTest.class); @@ -62,7 +61,7 @@ public class DoSFilterTest extends AbstractDoSFilterTest } @Test - public void isRateExceededTest() throws InterruptedException + public void testRateIsRateExceeded() throws InterruptedException { DoSFilter doSFilter = new DoSFilter(); diff --git a/jetty-servlets/src/test/resources/jetty-logging.properties b/jetty-servlets/src/test/resources/jetty-logging.properties index aa0b767d107..a280c758842 100644 --- a/jetty-servlets/src/test/resources/jetty-logging.properties +++ b/jetty-servlets/src/test/resources/jetty-logging.properties @@ -3,3 +3,4 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog #org.eclipse.jetty.servlets.LEVEL=DEBUG #org.eclipse.jetty.servlets.GzipFilter.LEVEL=DEBUG #org.eclipse.jetty.servlets.QoSFilter.LEVEL=DEBUG +#org.eclipse.jetty.servlets.DoSFilter.LEVEL=DEBUG From 67e788bc5875b9c0054a4c2255ee2cf7029f7ff8 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 23 Jul 2014 14:56:31 +0200 Subject: [PATCH 111/111] Replaced usage of Continuation with AsyncContext. --- .../spdy/server/http/ServerHTTPSPDYTest.java | 123 ++++++++++-------- 1 file changed, 68 insertions(+), 55 deletions(-) diff --git a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java index b0bbf73a705..43c028a0980 100644 --- a/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java +++ b/jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java @@ -18,16 +18,6 @@ package org.eclipse.jetty.spdy.server.http; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.core.IsInstanceOf.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -40,15 +30,15 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; - +import javax.servlet.AsyncContext; +import javax.servlet.AsyncEvent; +import javax.servlet.AsyncListener; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.continuation.Continuation; -import org.eclipse.jetty.continuation.ContinuationSupport; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.Request; @@ -63,15 +53,23 @@ import org.eclipse.jetty.spdy.api.StringDataInfo; import org.eclipse.jetty.spdy.api.SynInfo; import org.eclipse.jetty.spdy.http.HTTPSPDYHeader; import org.eclipse.jetty.util.Fields; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.StdErrLog; import org.junit.Assert; import org.junit.Test; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.core.IsInstanceOf.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest { - private static final Logger LOG = Log.getLogger(ServerHTTPSPDYTest.class); + public static final String SUSPENDED_ATTRIBUTE = ServerHTTPSPDYTest.class.getName() + ".SUSPENDED"; public ServerHTTPSPDYTest(short version) { @@ -1160,10 +1158,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - - final Continuation continuation = ContinuationSupport.getContinuation(request); - continuation.suspend(); - + final AsyncContext asyncContext = request.startAsync(); new Thread() { @Override @@ -1172,7 +1167,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest try { readRequestData(request, data.length); - continuation.complete(); + asyncContext.complete(); latch.countDown(); } catch (IOException x) @@ -1213,17 +1208,17 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - final Continuation continuation = ContinuationSupport.getContinuation(request); - if (continuation.isInitial()) - { - continuation.setTimeout(1000); - continuation.suspend(); - } - else + if (request.getAttribute(SUSPENDED_ATTRIBUTE) == Boolean.TRUE) { dispatchedAgainAfterExpire.countDown(); } - + else + { + AsyncContext asyncContext = request.startAsync(); + asyncContext.setTimeout(1000); + asyncContext.addListener(new AsyncListenerAdapter()); + request.setAttribute(SUSPENDED_ATTRIBUTE, Boolean.TRUE); + } } }, 30000), null); @@ -1257,18 +1252,18 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - final Continuation continuation = ContinuationSupport.getContinuation(request); - if (continuation.isInitial()) - { - readRequestData(request, data.length); - continuation.setTimeout(1000); - continuation.suspend(); - } - else + if (request.getAttribute(SUSPENDED_ATTRIBUTE) == Boolean.TRUE) { dispatchedAgainAfterExpire.countDown(); } - + else + { + readRequestData(request, data.length); + AsyncContext asyncContext = request.startAsync(); + asyncContext.setTimeout(1000); + asyncContext.addListener(new AsyncListenerAdapter()); + request.setAttribute(SUSPENDED_ATTRIBUTE, Boolean.TRUE); + } } }, 30000), null); @@ -1312,10 +1307,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - - final Continuation continuation = ContinuationSupport.getContinuation(request); - continuation.suspend(); - + final AsyncContext asyncContext = request.startAsync(); new Thread() { @Override @@ -1328,7 +1320,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest int read = 0; while (read < 2 * data.length) read += input.read(buffer); - continuation.complete(); + asyncContext.complete(); latch.countDown(); } catch (IOException x) @@ -1371,17 +1363,20 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest throws IOException, ServletException { request.setHandled(true); - - final Continuation continuation = ContinuationSupport.getContinuation(request); - - if (continuation.isInitial()) + if (request.getAttribute(SUSPENDED_ATTRIBUTE) == Boolean.TRUE) { + OutputStream output = httpResponse.getOutputStream(); + output.write(data); + } + else + { + final AsyncContext asyncContext = request.startAsync(); + request.setAttribute(SUSPENDED_ATTRIBUTE, Boolean.TRUE); InputStream input = request.getInputStream(); byte[] buffer = new byte[256]; int read = 0; while (read < data.length) read += input.read(buffer); - continuation.suspend(); new Thread() { @Override @@ -1390,7 +1385,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest try { TimeUnit.SECONDS.sleep(1); - continuation.resume(); + asyncContext.dispatch(); latch.countDown(); } catch (InterruptedException x) @@ -1400,11 +1395,6 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest } }.start(); } - else - { - OutputStream output = httpResponse.getOutputStream(); - output.write(data); - } } }, 30000), null); @@ -1532,7 +1522,7 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest }, idleTimeout), null); Fields headers = SPDYTestUtils.createHeaders("localhost", connector.getPort(), version, "GET", "/"); - Stream stream = session.syn(new SynInfo(5, TimeUnit.SECONDS, headers, true, (byte)0), + session.syn(new SynInfo(5, TimeUnit.SECONDS, headers, true, (byte)0), new StreamFrameListener.Adapter() { @Override @@ -1609,4 +1599,27 @@ public class ServerHTTPSPDYTest extends AbstractHTTPSPDYTest }); } + private class AsyncListenerAdapter implements AsyncListener + { + @Override + public void onStartAsync(AsyncEvent event) throws IOException + { + } + + @Override + public void onComplete(AsyncEvent event) throws IOException + { + } + + @Override + public void onTimeout(AsyncEvent event) throws IOException + { + event.getAsyncContext().dispatch(); + } + + @Override + public void onError(AsyncEvent event) throws IOException + { + } + } }