Add the CLI param "-dbURI" #4385
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -316,6 +316,7 @@ static void mongoDriverLogger | |
| */ | ||
| static std::string composeMongoUri | ||
| ( | ||
| const char* dbURI, | ||
| const char* host, | ||
| const char* rplSet, | ||
| const char* username, | ||
|
|
@@ -329,54 +330,76 @@ static std::string composeMongoUri | |
| { | ||
| // Compose the mongoUri, taking into account all information | ||
|
|
||
| std::string uri; | ||
|
|
||
| if (strlen(dbURI) != 0) | ||
|
There was a problem hiding this comment. If That's fine, but such case of combining old and new CLI would be probably a misconfiguration that should be at least warned to the user (or maybe even better, raise a LM_X so the user have the chance to fix the configuration). |
||
| { | ||
| const char* pwd = strstr(dbURI, "${PWD}"); | ||
| if (pwd != NULL) | ||
| { | ||
| if (strlen(passwd) == 0) | ||
| { | ||
| LM_X(1, ("Invalid Command Line Options: -dbURI is used with a password substitution, but no password (-dbpwd) is supplied")); | ||
| } | ||
|
|
||
| uri = std::string(dbURI, pwd - dbURI) + passwd + (pwd + 6); | ||
ctc-nakatsuka marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
There was a problem hiding this comment. Why implementing this password substitution mechanism? Why don't just use the password in the There was a problem hiding this comment. This is because Orion-LD implements that functionality. See also following comment: There was a problem hiding this comment. After reading the documetnation added to cli.md, now it's clear to me how it works :) It can be an interesting feature. Let's keep it. NTC |
||
| else | ||
| { | ||
| uri = dbURI; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| uri = "mongodb://"; | ||
|
|
||
| // Add auth parameter if included | ||
| if (strlen(username) != 0 && strlen(passwd) != 0) | ||
| { | ||
| uri += username + std::string(":") + passwd + "@"; | ||
| } | ||
|
|
||
| uri += host + std::string("/"); | ||
|
|
||
| if (strlen(authDb) != 0) | ||
| { | ||
| uri += authDb; | ||
| } | ||
|
|
||
| // First option prefix is '?' symbol | ||
| std::string optionPrefix = "?"; | ||
|
|
||
| if (strlen(rplSet) != 0) | ||
| { | ||
| uri += optionPrefix + "replicaSet=" + rplSet; | ||
| optionPrefix = "&"; | ||
| } | ||
|
|
||
| if (strlen(mechanism) != 0) | ||
| { | ||
| uri += optionPrefix + "authMechanism=" + mechanism; | ||
| optionPrefix = "&"; | ||
| } | ||
|
|
||
| if (dbSSL) | ||
| { | ||
| uri += optionPrefix + "tls=true&tlsAllowInvalidCertificates=true"; | ||
| optionPrefix = "&"; | ||
| } | ||
|
|
||
| if (dbDisableRetryWrites) | ||
| { | ||
| uri += optionPrefix + "retryWrites=false"; | ||
| optionPrefix = "&"; | ||
| } | ||
|
|
||
| if (timeout > 0) | ||
| { | ||
| char buf[STRING_SIZE_FOR_LONG]; | ||
| i2s(timeout, buf, sizeof(buf)); | ||
| uri += optionPrefix + "connectTimeoutMS=" + buf; | ||
| optionPrefix = "&"; | ||
| } | ||
| } | ||
|
|
||
| LM_T(LmtMongo, ("MongoDB connection URI: '%s'", offuscatePassword(uri, passwd).c_str())); | ||
|
|
@@ -392,6 +415,7 @@ static std::string composeMongoUri | |
| */ | ||
| int orion::mongoConnectionPoolInit | ||
| ( | ||
| const char* dbURI, | ||
| const char* host, | ||
| const char* db, | ||
| const char* rplSet, | ||
|
|
@@ -421,7 +445,7 @@ int orion::mongoConnectionPoolInit | |
| atexit(shutdownClient); | ||
|
|
||
| // Set mongo Uri to connect | ||
| std::string uri = composeMongoUri(dbURI, host, rplSet, username, passwd, mechanism, authDb, dbSSL, dbDisableRetryWrites, timeout); | ||
|
|
||
| #ifdef UNIT_TEST | ||
| /* Basically, we are mocking all the DB pool with a single connection. The getMongoConnection() and mongoReleaseConnection() methods | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CHANGES_NEXT_RELEASE should include the changes in this PR. Maybe something like this:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In addition, documetnation in cli.md should be modified to describe the new CLI and env var
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in d9fd270 and b7cdb85