From 92ccc8dff78dcc8c303483403a5708a83c1bfdfe Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 31 Dec 2008 19:07:03 +0000 Subject: [PATCH] [FIXED HUDSON-2408] On a failed permission check for anonymous, it seems rsp.getOutputStream() has already been called before reaching this class. So use getOutputStream() instead of getWriter() to send html for login redirect (and catch exception/use getWriter, just in case). git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14049 71c3de6d-444a-0410-be80-ed276b4c234a --- .../security/HudsonAuthenticationEntryPoint.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java index ebc7c828ed..64eacc3562 100644 --- a/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java +++ b/core/src/main/java/hudson/security/HudsonAuthenticationEntryPoint.java @@ -4,12 +4,15 @@ import org.acegisecurity.AuthenticationException; import org.acegisecurity.ui.webapp.AuthenticationProcessingFilterEntryPoint; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; import java.net.URLEncoder; import java.text.MessageFormat; @@ -49,7 +52,14 @@ public class HudsonAuthenticationEntryPoint extends AuthenticationProcessingFilt rsp.setStatus(SC_FORBIDDEN); rsp.setContentType("text/html;charset=UTF-8"); - rsp.getWriter().printf( + PrintWriter out; + try { + ServletOutputStream sout = rsp.getOutputStream(); + out = new PrintWriter(new OutputStreamWriter(sout)); + } catch (IllegalStateException e) { + out = rsp.getWriter(); + } + out.printf( "" + "" + "" + @@ -57,6 +67,7 @@ public class HudsonAuthenticationEntryPoint extends AuthenticationProcessingFilt "" + "Authentication required", loginForm ); + out.flush(); } } }