Skip to content
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

Fix basicauth for exploring remote http datasets #6866

Merged
merged 2 commits into from
Feb 21, 2023
Merged

Fix basicauth for exploring remote http datasets #6866

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
92e3027
Fix passing basicauth credentials to http client
fm3 Feb 21, 2023
b274515
changelog
fm3 Feb 21, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Fixed saving allowed teams in dataset settings. [#6817](https://github.com/scalableminds/webknossos/pull/6817)
- Fixed log streaming in Voxelytics workflow reports. [#6828](https://github.com/scalableminds/webknossos/pull/6828) [#6831](https://github.com/scalableminds/webknossos/pull/6831)
- Fixed some layouting issues with line breaks in segment list/dataset info tab [#6799](https://github.com/scalableminds/webknossos/pull/6799)
- Fixed basic auth for exploring remote http datasets [#6866](https://github.com/scalableminds/webknossos/pull/6866)

### Removed

Expand Down
2 changes: 1 addition & 1 deletion .../scalableminds/webknossos/datastore/storage/httpsfilesystem/HttpsFileSystemProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object HttpsFileSystemProvider {

def fileSystemKey(uri: URI, basicAuthCredentials: Option[HttpBasicAuthCredential]): String = {
val uriWithUser = basicAuthCredentials.map { c =>
new URI(uri.getScheme, c.user, uri.getHost, uri.getPort, uri.getPath, uri.getQuery, uri.getFragment)
new URI(uri.getScheme, c.username, uri.getHost, uri.getPort, uri.getPath, uri.getQuery, uri.getFragment)
}.getOrElse(uri)
uriWithUser.toString
}
Expand Down
2 changes: 1 addition & 1 deletion ...scalableminds/webknossos/datastore/storage/httpsfilesystem/HttpsSeekableByteChannel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class HttpsSeekableByteChannel(path: HttpsPath, openOptions: util.Set[_ <: OpenO
path.getBasicAuthCredential.map { credential =>
Http(uri.toString)
.timeout(connTimeoutMs = connectionTimeout.toMillis.toInt, readTimeoutMs = readTimeout.toMillis.toInt)
.auth(credential.user, credential.password)
.auth(credential.username, credential.password)
.asBytes
}.getOrElse(Http(uri.toString)
.timeout(connTimeoutMs = connectionTimeout.toMillis.toInt, readTimeoutMs = readTimeout.toMillis.toInt)
Expand Down