LDEV-5952 correct internalRequest behavior with resetBuffer

https://luceeserver.atlassian.net/browse/LDEV-5952

Author: zspitzer

core/src/main/java/lucee/runtime/net/http/HttpServletResponseDummy.java

@@ -198,7 +198,7 @@ public void flushBuffer() throws IOException {
 
 	@Override
 	public void resetBuffer() {
-		commited = true;
+		if (commited) throw new IllegalStateException("Cannot reset buffer after response has been committed");
 	}
 
 	@Override
@@ -208,7 +208,7 @@ public boolean isCommitted() {
 
 	@Override
 	public void reset() {
-		commited = true;
+		if (commited) throw new IllegalStateException("Cannot reset buffer after response has been committed");
 	}
 
 	@Override

test/tickets/LDEV5952.cfc

@@ -0,0 +1,84 @@
+component extends="org.lucee.cfml.test.LuceeTestCase" labels="internalRequest,cfcontent" {
+
+	function run( testResults, testBox ) {
+		describe( "LDEV-5952 - _internalRequest fails with 'Content was already flushed' after resetBuffer()", function() {
+
+			it( "cfcontent should work after resetBuffer() is called", function() {
+				var result = _internalRequest(
+					template = createURI( "LDEV5952/resetBuffer.cfm" ),
+					method = "GET",
+					throwonerror = false
+				);
+
+				expect( result ).toHaveKey( "filecontent" );
+				expect( result ).notToHaveKey( "error" );
+				expect( result.status_code ).toBe( 200 );
+				expect( result.headers[ "content-type" ] ).toInclude( "application/json" );
+
+				var content = deserializeJSON( result.filecontent );
+				expect( content.success ).toBeTrue();
+			});
+
+			it( "cfcontent should work after reset() is called", function() {
+				var result = _internalRequest(
+					template = createURI( "LDEV5952/reset.cfm" ),
+					method = "GET",
+					throwonerror = false
+				);
+
+				expect( result ).toHaveKey( "filecontent" );
+				expect( result ).notToHaveKey( "error" );
+				expect( result.status_code ).toBe( 200 );
+				expect( result.headers[ "content-type" ] ).toInclude( "application/json" );
+
+				var content = deserializeJSON( result.filecontent );
+				expect( content.success ).toBeTrue();
+			});
+
+			it( "cfcontent should work without any buffer manipulation", function() {
+				var result = _internalRequest(
+					template = createURI( "LDEV5952/simple.cfm" ),
+					method = "GET",
+					throwonerror = false
+				);
+
+				expect( result ).toHaveKey( "filecontent" );
+				expect( result ).notToHaveKey( "error" );
+				expect( result.status_code ).toBe( 200 );
+				expect( result.headers[ "content-type" ] ).toInclude( "application/json" );
+
+				var content = deserializeJSON( result.filecontent );
+				expect( content.success ).toBeTrue();
+			});
+
+			it( "resetBuffer() should fail after flushBuffer()", function() {
+				var result = _internalRequest(
+					template = createURI( "LDEV5952/resetBufferAfterFlush.cfm" ),
+					method = "GET",
+					throwonerror = false
+				);
+
+				expect( result ).toHaveKey( "error" );
+				expect( result.error.message ).toInclude( "committed" );
+			});
+
+			it( "reset() should fail after flushBuffer()", function() {
+				var result = _internalRequest(
+					template = createURI( "LDEV5952/resetAfterFlush.cfm" ),
+					method = "GET",
+					throwonerror = false
+				);
+
+				expect( result ).toHaveKey( "error" );
+				expect( result.error.message ).toInclude( "committed" );
+			});
+
+		});
+	}
+
+	private string function createURI( string calledName ) {
+		var baseURI = "/test/#listLast( getDirectoryFromPath( getCurrenttemplatepath() ), "\/" )#/";
+		return baseURI & calledName;
+	}
+
+}

test/tickets/LDEV5952/reset.cfm

@@ -0,0 +1,6 @@
+<cfscript>
+	response = getPageContext().getResponse();
+	response.reset();
+	cfcontent( type="application/json" );
+	writeOutput( serializeJSON( { "success": true, "test": "reset" } ) );
+</cfscript>

test/tickets/LDEV5952/resetAfterFlush.cfm

@@ -0,0 +1,8 @@
+<cfscript>
+	response = getPageContext().getResponse();
+	writeOutput( "some content" );
+	response.flushBuffer();
+	response.reset();
+	cfcontent( type="application/json" );
+	writeOutput( serializeJSON( { "success": true, "test": "resetAfterFlush" } ) );
+</cfscript>

test/tickets/LDEV5952/resetBuffer.cfm

@@ -0,0 +1,6 @@
+<cfscript>
+	response = getPageContext().getResponse();
+	response.resetBuffer();
+	cfcontent( type="application/json" );
+	writeOutput( serializeJSON( { "success": true, "test": "resetBuffer" } ) );
+</cfscript>

test/tickets/LDEV5952/resetBufferAfterFlush.cfm

@@ -0,0 +1,8 @@
+<cfscript>
+	response = getPageContext().getResponse();
+	writeOutput( "some content" );
+	response.flushBuffer();
+	response.resetBuffer();
+	cfcontent( type="application/json" );
+	writeOutput( serializeJSON( { "success": true, "test": "resetBufferAfterFlush" } ) );
+</cfscript>

test/tickets/LDEV5952/resetBufferAfterFlushDebug.cfm

@@ -0,0 +1,13 @@
+<cfscript>
+	try {
+		response = getPageContext().getResponse();
+		writeOutput( "some content" );
+		response.flushBuffer();
+		response.resetBuffer();
+		cfcontent( type="application/json" );
+		writeOutput( serializeJSON( { "success": true, "test": "resetBufferAfterFlush" } ) );
+	}
+	catch ( any e ) {
+		writeOutput( "ERROR: " & e.message & " | " & e.detail );
+	}
+</cfscript>

test/tickets/LDEV5952/simple.cfm

@@ -0,0 +1,4 @@
+<cfscript>
+	cfcontent( type="application/json" );
+	writeOutput( serializeJSON( { "success": true, "test": "simple" } ) );
+</cfscript>