Skip to content

Bugfix/reconnection 401 #372

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

Merged
merged 2 commits into from
Jan 25, 2021
Merged

Bugfix/reconnection 401 #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f0f679
closing connection on failed authentication
rashtao Jan 25, 2021
586cd86
changelog upd
rashtao Jan 25, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

## [Unreleased]

- fixed closing connection on failed authentication (#ES-772)

## [6.8.1] - 2020-12-22

- fixed ignoring internal endpoints in acquireHostList (#DEVSUP-673)
Expand Down
18 changes: 16 additions & 2 deletions src/main/java/com/arangodb/internal/velocystream/VstCommunication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@

import com.arangodb.ArangoDBException;
import com.arangodb.internal.ArangoDefaults;
import com.arangodb.internal.net.*;
import com.arangodb.internal.net.AccessType;
import com.arangodb.internal.net.ArangoDBRedirectException;
import com.arangodb.internal.net.Host;
import com.arangodb.internal.net.HostDescription;
import com.arangodb.internal.net.HostHandle;
import com.arangodb.internal.net.HostHandler;
import com.arangodb.internal.util.HostUtils;
import com.arangodb.internal.util.RequestUtils;
import com.arangodb.internal.util.ResponseUtils;
Expand Down Expand Up @@ -87,7 +92,7 @@ protected synchronized C connect(final HostHandle hostHandle, final AccessType a
connection.open();
hostHandler.success();
if (user != null) {
authenticate(connection);
tryAuthenticate(connection);
}
hostHandler.confirm();
return connection;
Expand All @@ -111,6 +116,15 @@ protected synchronized C connect(final HostHandle hostHandle, final AccessType a
}
}

private void tryAuthenticate(final C connection) {
try {
authenticate(connection);
} catch (final ArangoDBException authException) {
connection.close();
throw authException;
}
}

protected abstract void authenticate(final C connection);

@Override
Expand Down