dnsdist: add ability to update webserver credentials #7117
Merged
Conversation
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
rgacogne
approved these changes
Oct 30, 2018
| @@ -631,7 +631,8 @@ void setupLuaConfig(bool client) | |||
| SBind(sock, local); | |||
| SListen(sock, 5); | |||
| auto launch=[sock, local, password, apiKey, customHeaders]() { | |||
| thread t(dnsdistWebserverThread, sock, local, password, apiKey ? *apiKey : "", customHeaders); | |||
| setWebserverConfig(password, apiKey, customHeaders); | |||
| thread t(dnsdistWebserverThread, sock, local); | |||
| t.detach(); | |||
There was a problem hiding this comment.
Just a nit but indentation seems off.
There was a problem hiding this comment.
The file has been partially indented with tabs :/
pieterlexis
reviewed
Oct 30, 2018
pdns/dnsdist-console.cc
Outdated
| @@ -446,6 +446,7 @@ const std::vector<ConsoleKeyword> g_consoleKeywords{ | |||
| { "setUDPMultipleMessagesVectorSize", true, "n", "set the size of the vector passed to recvmmsg() to receive UDP messages. Default to 1 which means that the feature is disabled and recvmsg() is used instead" }, | |||
| { "setUDPTimeout", true, "n", "set the maximum time dnsdist will wait for a response from a backend over UDP, in seconds" }, | |||
| { "setVerboseHealthChecks", true, "bool", "set whether health check errors will be logged" }, | |||
| { "setWebserverConfig", true, "password [, apiKey [, customHeaders ]]", "Updates webserver configuration" }, | |||
There was a problem hiding this comment.
Perhaps this function should take a table? A user could then update one of the items without updating the others. e.g.
setWebserverConfig({password: "hello"})setWebserverConfig({apiKey: "hello2"})There was a problem hiding this comment.
this means using setWebserverConfig({apiKey: ""}) to disable apiKey authentication. Is that something we want ? Otherwise I agree.
|
I followed pieter's remark and added two basic tests about custom headers |
rgacogne
reviewed
Oct 31, 2018
pdns/dnsdist-lua.cc
Outdated
| setWebserverPassword(password); | ||
| } | ||
| if(vars->count("apiKey")) { | ||
| // allows setting apiKey: nil to disable access with it |
There was a problem hiding this comment.
does nil really work? It looks like we only test for an empty string?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Short description
This PR adds
setWebserverConfiglua funciton to update webserver credentials and custom headers.Fix #7112
Checklist
I have: