Skip to content

GUACAMOLE-2293: Release active connection when guacd socket teardown throws on close #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nabaco wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GUACAMOLE-2293: Release active connection when guacd socket teardown throws on close #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...rc/main/java/org/apache/guacamole/auth/jdbc/activeconnection/ActiveConnectionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,11 @@ public void deleteObject(ModeledAuthenticatedUser user, String identifier)

if (hasObjectPermissions(user, identifier, ObjectPermission.Type.DELETE)) {

// Close connection if not already closed
// Always close, even if the peer already vanished (isOpen() may be
// false). close() releases the active connection record and is
// idempotent.
GuacamoleTunnel tunnel = activeConnection.getTunnel();
if (tunnel != null && tunnel.isOpen())
if (tunnel != null)
tunnel.close();

}
Expand Down
10 changes: 8 additions & 2 deletions ...-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedInetGuacamoleSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,14 @@ public ManagedInetGuacamoleSocket(String hostname, int port,

@Override
public void close() throws GuacamoleException {
super.close();
socketClosedTask.run();
// Run cleanup even if super.close() throws, or the active connection
// record could leak.
try {
super.close();
}
finally {
socketClosedTask.run();
}
}

}
10 changes: 8 additions & 2 deletions ...c-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/ManagedSSLGuacamoleSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,14 @@ public ManagedSSLGuacamoleSocket(String hostname, int port,

@Override
public void close() throws GuacamoleException {
super.close();
socketClosedTask.run();
// Run cleanup even if super.close() throws, or the active connection
// record could leak.
try {
super.close();
}
finally {
socketClosedTask.run();
}
}

}