valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 09:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring getHostIdentifier and adding some extra logging

Browse Source
This commit is contained in:
mike@arpaia.co 2014-11-25 08:47:32 -08:00
parent 6b525af149
commit 6f8ec8587c
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
osquery/scheduler/scheduler.cpp
View File

@ -21,40 +21,44 @@ DEFINE_osquery_flag(string,
"hostname",
"Field used to identify the host running osqueryd");
std::string getHostIdentifier(std::string hostIdFlag,
std::shared_ptr<DBHandle> db) {
if (hostIdFlag == "uuid") {
Status getHostIdentifier(std::string& ident) {
std::shared_ptr<DBHandle> db;
try {
auto db = DBHandle::getInstance();
} catch (const std::exception& e) {
return Status(1, e.what());
}
if (FLAGS_host_identifier == "uuid") {
std::vector<std::string> results;
auto status = db->Scan(kConfigurations, results);
if (!status.ok()) {
LOG(ERROR) << "Could not access database, using hostname as the host "
"identifier.";
return osquery::getHostname();
ident = osquery::getHostname();
return Status(0, "OK");
}
std::string hostId;
bool present =
(std::find(results.begin(), results.end(), "hostIdentifier") !=
results.end());
if (present) {
status = db->Get(kConfigurations, "hostIdentifier", hostId);
if (std::find(results.begin(), results.end(), "hostIdentifier") !=
results.end()) {
status = db->Get(kConfigurations, "hostIdentifier", ident);
if (!status.ok()) {
LOG(ERROR) << "Could not access database, using hostname as the host "
"identifier.";
return osquery::getHostname();
ident = osquery::getHostname();
}
return status;
} else {
// There was no uuid stored in the database, generate one and store it.
hostId = osquery::generateHostUuid();
LOG(INFO) << "Using uuid " << hostId << " to identify this host.";
db->Put(kConfigurations, "hostIdentifier", hostId);
ident = osquery::generateHostUuid();
LOG(INFO) << "Using uuid " << ident << " to identify this host.";
return db->Put(kConfigurations, "hosknhutIdentifier", ident);
}
return hostId;
} else {
// use the hostname as the default machine identifier
return osquery::getHostname();
ident = osquery::getHostname();
return Status(0, "OK");
}
}
@ -80,15 +84,29 @@ void launchQueries(const std::vector<OsqueryScheduledQuery>& queries,
}
if (diff_results.added.size() > 0 || diff_results.removed.size() > 0) {
VLOG(1) << "Results found for query: \"" << q.query << "\"";
ScheduledQueryLogItem item;
Status s;
item.diffResults = diff_results;
item.name = q.name;
item.hostIdentifier =
getHostIdentifier(FLAGS_host_identifier, DBHandle::getInstance());
std::string ident;
s = getHostIdentifier(ident);
if (s.ok()) {
item.hostIdentifier = ident;
} else {
LOG(ERROR) << "Error getting the host identifier";
if (ident.empty()) {
ident = "<unknown>";
}
}
item.unixTime = osquery::getUnixTime();
item.calendarTime = osquery::getAsciiTime();
auto s = logScheduledQueryLogItem(item);
LOG(INFO) << "Found results for query " << q.name
<< " for host: " << ident;
s = logScheduledQueryLogItem(item);
if (!s.ok()) {
LOG(ERROR) << "Error logging the results of query \"" << q.query
<< "\""