Skip to content

Feature/dmnd 1780 security config #459

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
jesusgudino merged 3 commits into from
Oct 12, 2023
Merged

Feature/dmnd 1780 security config #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6016d11
fix SecurityConfig.kt methods
jesusgudino Sep 30, 2023
8f7d01b
sync with DMND1721
jesusgudino Oct 9, 2023
3a575cb
fix http:// url ES clientmanager
jesusgudino Oct 12, 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
10 changes: 8 additions & 2 deletions api/src/main/kotlin/edu/wgu/osmt/elasticsearch/ElasticsearchClientManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,14 @@ class ElasticsearchClientManager {
}

private fun createHttpHost(): HttpHost {
val params = StringUtils.split(esConfig.uri, ":")
return HttpHost(params!![0], params[1].toInt())
val scheme = StringUtils.split(esConfig.uri, "://")
if(scheme.isNullOrEmpty()){
val params = StringUtils.split(esConfig.uri, ":")
return HttpHost(params!![0], params[1].toInt())
} else {
val params = StringUtils.split(scheme!![1], ":")
return HttpHost(params!![0], params[1].toInt(), scheme!![0])
}
}

private fun getCredentialsProvider(): CredentialsProvider? {
Expand Down
Loading