Management SSE for apps fails when Accept-Encoding is sent #8518

enonic · Dec 1, 2020 · 6409dfe · 6409dfe
1 parent 0f1d172
commit 6409dfe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/modules/server/server-rest/src/main/java/com/enonic/xp/impl/server/rest/SseEntryPoint.java b/modules/server/server-rest/src/main/java/com/enonic/xp/impl/server/rest/SseEntryPoint.java
@@ -76,7 +76,11 @@ public void deactivate()
     @Context
     public void setSse( final Sse sse )
     {
-        this.contextHolder = new SseContextHolder( sse );
+        final SseContextHolder ctx = contextHolder;
+        if ( ctx == null )
+        {
+            this.contextHolder = new SseContextHolder( sse );
+        }
     }
 
     @GET
@@ -88,11 +92,9 @@ public void subscribe( final @Context SseEventSink sseEventSink )
 
         if ( ctx == null )
         {
-            return;
+            throw new IllegalStateException( "No SSE context" );
         }
 
-        ctx.broadcaster.register( sseEventSink );
-
         final OutboundSseEvent sseEvent = ctx.sse.newEventBuilder().
             name( "list" ).
             id( UUID.randomUUID().toString() ).
@@ -102,6 +104,8 @@ public void subscribe( final @Context SseEventSink sseEventSink )
                 collect( Collectors.toList() ) ) ).build();
 
         sseEventSink.send( sseEvent );
+
+        ctx.broadcaster.register( sseEventSink );
     }
 
     @Override

diff --git a/...es/server/server-rest/src/test/java/com/enonic/xp/impl/server/rest/SseEntryPointTest.java b/...es/server/server-rest/src/test/java/com/enonic/xp/impl/server/rest/SseEntryPointTest.java
@@ -25,6 +25,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doNothing;
@@ -199,7 +200,7 @@ public void testSubscribe_NoSseContext()
     {
         final SseEventSink eventSink = mock( SseEventSink.class );
 
-        listener.subscribe( eventSink );
+        assertThrows( IllegalStateException.class, () -> listener.subscribe( eventSink ) );
     }
 
     @Test

diff --git a/...b/web-jetty/src/main/java/com/enonic/xp/web/jetty/impl/configurator/GZipConfigurator.java b/...b/web-jetty/src/main/java/com/enonic/xp/web/jetty/impl/configurator/GZipConfigurator.java
@@ -18,6 +18,7 @@ protected void doConfigure()
         handler.setExcludedAgentPatterns();
         handler.setMinGzipSize( this.config.gzip_minSize() );
         handler.addExcludedMimeTypes( "application/octet-stream" );
+        handler.addExcludedMimeTypes( "text/event-stream" );
 
         this.object.setGzipHandler( handler );
     }