safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-990: Ensure internal errors during auth reach global error handling/logging.

Browse Source
This commit is contained in:
Michael Jumper
2022-09-26 10:32:38 -07:00
parent 165bd413c0
commit b7deee427d
2 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
guacamole/src/main/java/org/apache/guacamole/rest/auth/AuthenticationService.java
View File

@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.GuacamoleSecurityException;
import org.apache.guacamole.GuacamoleServerException;
import org.apache.guacamole.GuacamoleUnauthorizedException;
import org.apache.guacamole.GuacamoleSession;
import org.apache.guacamole.environment.Environment;
@@ -480,6 +481,18 @@ public class AuthenticationService {
getLoggableAddress(request));
// Rethrow exception
e.rethrowCause();
// This line SHOULD be unreachable unless a bug causes
// rethrowCause() to not actually rethrow the underlying failure
Throwable cause = e.getCause();
if (cause != null) {
logger.warn("An underlying internal error was not correctly rethrown by rethrowCause(): {}", cause.getMessage());
logger.debug("Internal error not rethrown by rethrowCause().", cause);
}
else
logger.warn("An underlying internal error was not correctly rethrown by rethrowCause().");
throw e.getCauseAsGuacamoleException();
}

32
guacamole/src/main/java/org/apache/guacamole/rest/auth/GuacamoleAuthenticationProcessException.java
View File

@@ -146,6 +146,38 @@ public class GuacamoleAuthenticationProcessException extends GuacamoleException
return guacCause;
}
/**
* Rethrows the original GuacamoleException wrapped within this
* GuacamoleAuthenticationProcessException. If there is no such exception,
* and the cause of this failure is an unchecked RuntimeException or Error,
* that unchecked exception/error is rethrown as-is.
*
* @throws GuacamoleException
* If the underlying cause of this exception is a checked
* GuacamoleException subclass.
*
* @throws RuntimeException
* If the underlying cause of this exception is an unchecked
* RuntimeException.
*
* @throws Error
* If the underlying cause of this exception is an unchecked Error.
*/
public void rethrowCause() throws GuacamoleException, RuntimeException, Error {
// Rethrow any unchecked exceptions/errors as-is
Throwable cause = getCause();
if (cause instanceof RuntimeException)
throw (RuntimeException) cause;
if (cause instanceof Error)
throw (Error) cause;
// Pass through all other exceptions as normal GuacamoleException
// subclassses
throw getCauseAsGuacamoleException();
}
@Override
public GuacamoleStatus getStatus() {
return getCauseAsGuacamoleException().getStatus();