Adding remote config/logging capabilities to Windows build #2469
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
|
Can one of the osquery admins reply with "ok to test" to kick off a build... |
2 similar comments
|
Can one of the osquery admins reply with "ok to test" to kick off a build... |
|
Can one of the osquery admins reply with "ok to test" to kick off a build... |
ghost
added
the
cla signed
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
|
ok to test |
ghost
added
the
cla signed
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
theopolis
reviewed
Sep 16, 2016
| @@ -27,7 +29,9 @@ std::string platformAsctime(const struct tm* timeptr) { | |||
| return ""; | |||
| } | |||
|
|
|||
| return std::string(buffer.data(), buffer.size()); | |||
| std::string time(buffer.data()); | |||
There was a problem hiding this comment.
nit, avoid time as a local variable name.
theopolis
reviewed
Sep 16, 2016
| std::string expected; | ||
| if (isPlatform(PlatformType::TYPE_WINDOWS)) { | ||
| expected = std::string( | ||
| "\x1F\x8B\b\0\0\0\0\0\x2\v\xED\xC4\xB1\r\0\0\x4\0\xB0s\xC5" |
There was a problem hiding this comment.
nit there's only 1 character difference? Maybe we can use some concatenation?
std::string expected = "\x1F\x8B\b\0\0\0\0\0\x2";
expected += (isPlatform(PlatformType::TYPE_WINDOWS)) ? "\v" : "\x3";
expected += ...
ghost
added
the
cla signed
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
ghost
added
the
cla signed
added 11 commits
September 20, 2016 14:34
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
ghost
added
the
cla signed
theopolis
reviewed
Sep 20, 2016
| options.openssl_certificate(server_certificate_file_); | ||
|
|
||
| // On Windows, we cannot set openssl_certificate to a directory | ||
| if (status.type() == fs::regular_file) { |
There was a problem hiding this comment.
We should include an else and a LOG(WARNING).
theopolis
reviewed
Sep 20, 2016
| @@ -10,6 +10,40 @@ | |||
|
|
|||
| #pragma once | |||
|
|
|||
| // Our third-party version of cpp-netlib uses OpenSSL APIs. | |||
theopolis
reviewed
Sep 20, 2016
| /// Suppressing warning C4005: 'ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition | ||
| #pragma warning(disable: 4005) | ||
|
|
||
| // Suppressing warning C4244: 'argument': conversion from '__int64' to 'long', possible loss of data |
theopolis
reviewed
Sep 20, 2016
| #ifdef WIN32 | ||
| #pragma warning(pop) | ||
|
|
||
| // We need to reinclude this to re-enable boost's warning suppression |
|
Ok, one last round of changes and this looks good. |
ghost
added
the
cla signed
|
@yying updated the pull request - view changes |
ghost
added
the
cla signed
theopolis
pushed a commit
to thedrow/osquery
that referenced
this pull request
Sep 24, 2016
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.
Suggestion cannot be applied right now. Please check back later.
Enabled remote config and logging capabilities using TLS.
For remote TLS logging and/or filesystem logging to work correctly, a glog with a bug fix (google/glog#123).
Closes #2425
Closes #2426