X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgrpc.cc;h=ae3dab25d6445249831d76291a0316c5aa1c7b3e;hb=f3d13bd9c187c75ec9b4dbf42f8d821fb303bc90;hp=45fb02902ad0434a1c4487741fe3d7f3e766208d;hpb=677a95a9e4d0adf7ebd2beb3820e5ef1116c32cf;p=collectd.git

diff --git a/src/grpc.cc b/src/grpc.cc
index 45fb0290..ae3dab25 100644
--- a/src/grpc.cc
+++ b/src/grpc.cc
@@ -1,6 +1,6 @@
 /**
  * collectd - src/grpc.cc
- * Copyright (C) 2015 Sebastian Harl
+ * Copyright (C) 2015-2016 Sebastian Harl
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,11 +27,15 @@
 #include <grpc++/grpc++.h>
 #include <google/protobuf/util/time_util.h>
 
+#include <fstream>
+#include <iostream>
+#include <vector>
+
 #include "collectd.grpc.pb.h"
 
 extern "C" {
+#include <fnmatch.h>
 #include <stdbool.h>
-#include <pthread.h>
 
 #include "collectd.h"
 #include "common.h"
@@ -39,47 +43,105 @@ extern "C" {
 #include "plugin.h"
 
 #include "daemon/utils_cache.h"
-
-	typedef struct {
-		char *addr;
-		char *port;
-	} listener_t;
-
-	static listener_t *listeners;
-	static size_t listeners_num;
 }
 
 using collectd::Collectd;
 
 using collectd::DispatchValuesRequest;
 using collectd::DispatchValuesReply;
-using collectd::ListValuesRequest;
-using collectd::ListValuesReply;
+using collectd::QueryValuesRequest;
+using collectd::QueryValuesReply;
 
 using google::protobuf::util::TimeUtil;
 
 /*
+ * private types
+ */
+
+struct Listener {
+	grpc::string addr;
+	grpc::string port;
+
+	grpc::SslServerCredentialsOptions *ssl;
+};
+static std::vector<Listener> listeners;
+static grpc::string default_addr("0.0.0.0:50051");
+
+/*
+ * helper functions
+ */
+
+static bool ident_matches(const value_list_t *vl, const value_list_t *matcher)
+{
+	if (fnmatch(matcher->host, vl->host, 0))
+		return false;
+
+	if (fnmatch(matcher->plugin, vl->plugin, 0))
+		return false;
+	if (fnmatch(matcher->plugin_instance, vl->plugin_instance, 0))
+		return false;
+
+	if (fnmatch(matcher->type, vl->type, 0))
+		return false;
+	if (fnmatch(matcher->type_instance, vl->type_instance, 0))
+		return false;
+
+	return true;
+} /* ident_matches */
+
+static grpc::string read_file(const char *filename)
+{
+	std::ifstream f;
+	grpc::string s, content;
+
+	f.open(filename);
+	if (!f.is_open()) {
+		ERROR("grpc: Failed to open '%s'", filename);
+		return "";
+	}
+
+	while (std::getline(f, s)) {
+		content += s;
+		content.push_back('\n');
+	}
+	f.close();
+	return content;
+} /* read_file */
+
+/*
  * proto conversion
  */
 
-static grpc::Status unmarshal_ident(const collectd::types::Identifier &msg, value_list_t *vl)
+static void marshal_ident(const value_list_t *vl, collectd::types::Identifier *msg)
+{
+	msg->set_host(vl->host);
+	msg->set_plugin(vl->plugin);
+	if (vl->plugin_instance[0] != '\0')
+		msg->set_plugin_instance(vl->plugin_instance);
+	msg->set_type(vl->type);
+	if (vl->type_instance[0] != '\0')
+		msg->set_type_instance(vl->type_instance);
+} /* marshal_ident */
+
+static grpc::Status unmarshal_ident(const collectd::types::Identifier &msg, value_list_t *vl,
+		bool require_fields)
 {
 	std::string s;
 
 	s = msg.host();
-	if (!s.length())
+	if (!s.length() && require_fields)
 		return grpc::Status(grpc::StatusCode::INVALID_ARGUMENT,
 				grpc::string("missing host name"));
 	sstrncpy(vl->host, s.c_str(), sizeof(vl->host));
 
 	s = msg.plugin();
-	if (!s.length())
+	if (!s.length() && require_fields)
 		return grpc::Status(grpc::StatusCode::INVALID_ARGUMENT,
 				grpc::string("missing plugin name"));
 	sstrncpy(vl->plugin, s.c_str(), sizeof(vl->plugin));
 
 	s = msg.type();
-	if (!s.length())
+	if (!s.length() && require_fields)
 		return grpc::Status(grpc::StatusCode::INVALID_ARGUMENT,
 				grpc::string("missing type name"));
 	sstrncpy(vl->type, s.c_str(), sizeof(vl->type));
@@ -93,19 +155,59 @@ static grpc::Status unmarshal_ident(const collectd::types::Identifier &msg, valu
 	return grpc::Status::OK;
 } /* unmarshal_ident() */
 
+static grpc::Status marshal_value_list(const value_list_t *vl, collectd::types::ValueList *msg)
+{
+	auto id = msg->mutable_identifier();
+	marshal_ident(vl, id);
+
+	auto ds = plugin_get_ds(vl->type);
+	if ((ds == NULL) || (ds->ds_num != vl->values_len)) {
+		return grpc::Status(grpc::StatusCode::INTERNAL,
+				grpc::string("failed to retrieve data-set for values"));
+	}
+
+	auto t = TimeUtil::NanosecondsToTimestamp(CDTIME_T_TO_NS(vl->time));
+	auto d = TimeUtil::NanosecondsToDuration(CDTIME_T_TO_NS(vl->interval));
+	msg->set_allocated_time(new google::protobuf::Timestamp(t));
+	msg->set_allocated_interval(new google::protobuf::Duration(d));
+
+	for (size_t i = 0; i < vl->values_len; ++i) {
+		auto v = msg->add_value();
+		switch (ds->ds[i].type) {
+			case DS_TYPE_COUNTER:
+				v->set_counter(vl->values[i].counter);
+				break;
+			case DS_TYPE_GAUGE:
+				v->set_gauge(vl->values[i].gauge);
+				break;
+			case DS_TYPE_DERIVE:
+				v->set_derive(vl->values[i].derive);
+				break;
+			case DS_TYPE_ABSOLUTE:
+				v->set_absolute(vl->values[i].absolute);
+				break;
+			default:
+				return grpc::Status(grpc::StatusCode::INTERNAL,
+						grpc::string("unknown value type"));
+		}
+	}
+
+	return grpc::Status::OK;
+} /* marshal_value_list */
+
 static grpc::Status unmarshal_value_list(const collectd::types::ValueList &msg, value_list_t *vl)
 {
 	vl->time = NS_TO_CDTIME_T(TimeUtil::TimestampToNanoseconds(msg.time()));
 	vl->interval = NS_TO_CDTIME_T(TimeUtil::DurationToNanoseconds(msg.interval()));
 
-	auto status = unmarshal_ident(msg.identifier(), vl);
+	auto status = unmarshal_ident(msg.identifier(), vl, true);
 	if (!status.ok())
 		return status;
 
 	value_t *values = NULL;
 	size_t values_len = 0;
-	status = grpc::Status::OK;
 
+	status = grpc::Status::OK;
 	for (auto v : msg.value()) {
 		value_t *val = (value_t *)realloc(values, (values_len + 1) * sizeof(*values));
 		if (!val) {
@@ -170,28 +272,60 @@ static grpc::Status Process(grpc::ServerContext *ctx,
 } /* Process(): DispatchValues */
 
 static grpc::Status Process(grpc::ServerContext *ctx,
-		ListValuesRequest request, ListValuesReply *reply)
+		QueryValuesRequest request, QueryValuesReply *reply)
 {
-	char **names = NULL;
-	cdtime_t *times = NULL;
-	size_t i, n = 0;
+	uc_iter_t *iter;
+	char *name = NULL;
 
-	if (uc_get_names(&names, &times, &n))
+	value_list_t matcher;
+	auto status = unmarshal_ident(request.identifier(), &matcher, false);
+	if (!status.ok())
+		return status;
+
+	if ((iter = uc_get_iterator()) == NULL) {
 		return grpc::Status(grpc::StatusCode::INTERNAL,
-				grpc::string("failed to retrieve values"));
-
-	for (i = 0; i < n; i++) {
-		auto v = reply->add_value();
-		auto t = TimeUtil::NanosecondsToTimestamp(CDTIME_T_TO_NS(times[i]));
-		v->set_name(names[i]);
-		v->set_allocated_time(new google::protobuf::Timestamp(t));
-		sfree(names[i]);
+				grpc::string("failed to query values: cannot create iterator"));
 	}
-	sfree(names);
-	sfree(times);
 
-	return grpc::Status::OK;
-} /* Process(): ListValues */
+	status = grpc::Status::OK;
+	while (uc_iterator_next(iter, &name) == 0) {
+		value_list_t res;
+		if (parse_identifier_vl(name, &res) != 0) {
+			status = grpc::Status(grpc::StatusCode::INTERNAL,
+					grpc::string("failed to parse identifier"));
+			break;
+		}
+
+		if (!ident_matches(&res, &matcher))
+			continue;
+
+		if (uc_iterator_get_time(iter, &res.time) < 0) {
+			status = grpc::Status(grpc::StatusCode::INTERNAL,
+					grpc::string("failed to retrieve value timestamp"));
+			break;
+		}
+		if (uc_iterator_get_interval(iter, &res.interval) < 0) {
+			status = grpc::Status(grpc::StatusCode::INTERNAL,
+					grpc::string("failed to retrieve value interval"));
+			break;
+		}
+		if (uc_iterator_get_values(iter, &res.values, &res.values_len) < 0) {
+			status = grpc::Status(grpc::StatusCode::INTERNAL,
+					grpc::string("failed to retrieve values"));
+			break;
+		}
+
+		auto vl = reply->add_values();
+		status = marshal_value_list(&res, vl);
+		free(res.values);
+		if (!status.ok())
+			break;
+	}
+
+	uc_iterator_destroy(iter);
+
+	return status;
+} /* Process(): QueryValues */
 
 class Call
 {
@@ -287,24 +421,27 @@ class CollectdServer final
 public:
 	void Start()
 	{
-		// TODO: make configurable
 		auto auth = grpc::InsecureServerCredentials();
 
 		grpc::ServerBuilder builder;
 
-		if (!listeners_num) {
-			std::string default_addr("0.0.0.0:50051");
+		if (listeners.empty()) {
 			builder.AddListeningPort(default_addr, auth);
 			INFO("grpc: Listening on %s", default_addr.c_str());
 		}
 		else {
-			size_t i;
-			for (i = 0; i < listeners_num; i++) {
-				auto l = listeners[i];
-				std::string addr(l.addr);
-				addr += std::string(":") + std::string(l.port);
-				builder.AddListeningPort(addr, auth);
-				INFO("grpc: Listening on %s", addr.c_str());
+			for (auto l : listeners) {
+				grpc::string addr = l.addr + ":" + l.port;
+
+				auto use_ssl = grpc::string("");
+				auto a = auth;
+				if (l.ssl != nullptr) {
+					use_ssl = grpc::string(" (SSL enabled)");
+					a = grpc::SslServerCredentials(*l.ssl);
+				}
+
+				builder.AddListeningPort(addr, a);
+				INFO("grpc: Listening on %s%s", addr.c_str(), use_ssl.c_str());
 			}
 		}
 
@@ -324,8 +461,8 @@ public:
 		// Register request types.
 		new RpcCall<DispatchValuesRequest, DispatchValuesReply>(&service_,
 				&Collectd::AsyncService::RequestDispatchValues, cq_.get());
-		new RpcCall<ListValuesRequest, ListValuesReply>(&service_,
-				&Collectd::AsyncService::RequestListValues, cq_.get());
+		new RpcCall<QueryValuesRequest, QueryValuesReply>(&service_,
+				&Collectd::AsyncService::RequestQueryValues, cq_.get());
 
 		while (true) {
 			void *req = NULL;
@@ -368,9 +505,6 @@ extern "C" {
 
 	static int c_grpc_config_listen(oconfig_item_t *ci)
 	{
-		listener_t *listener;
-		int i;
-
 		if ((ci->values_num != 2)
 				|| (ci->values[0].type != OCONFIG_TYPE_STRING)
 				|| (ci->values[1].type != OCONFIG_TYPE_STRING)) {
@@ -379,25 +513,65 @@ extern "C" {
 			return -1;
 		}
 
-		listener = (listener_t *)realloc(listeners,
-				(listeners_num + 1) * sizeof(*listeners));
-		if (!listener) {
-			ERROR("grpc: Failed to allocate listeners");
-			return -1;
-		}
-		listeners = listener;
-		listener = listeners + listeners_num;
-		listeners_num++;
+		auto listener = Listener();
+		listener.addr = grpc::string(ci->values[0].value.string);
+		listener.port = grpc::string(ci->values[1].value.string);
+		listener.ssl = nullptr;
 
-		listener->addr = strdup(ci->values[0].value.string);
-		listener->port = strdup(ci->values[1].value.string);
+		auto ssl_opts = new(grpc::SslServerCredentialsOptions);
+		grpc::SslServerCredentialsOptions::PemKeyCertPair pkcp = {};
+		bool use_ssl = false;
 
-		for (i = 0; i < ci->children_num; i++) {
+		for (int i = 0; i < ci->children_num; i++) {
 			oconfig_item_t *child = ci->children + i;
-			WARNING("grpc: Option `%s` not allowed in <%s> block.",
-					child->key, ci->key);
+
+			if (!strcasecmp("EnableSSL", child->key)) {
+				if (cf_util_get_boolean(child, &use_ssl)) {
+					ERROR("grpc: Option `%s` expects a boolean value",
+							child->key);
+					return -1;
+				}
+			}
+			else if (!strcasecmp("SSLRootCerts", child->key)) {
+				char *certs = NULL;
+				if (cf_util_get_string(child, &certs)) {
+					ERROR("grpc: Option `%s` expects a string value",
+							child->key);
+					return -1;
+				}
+				ssl_opts->pem_root_certs = read_file(certs);
+			}
+			else if (!strcasecmp("SSLServerKey", child->key)) {
+				char *key = NULL;
+				if (cf_util_get_string(child, &key)) {
+					ERROR("grpc: Option `%s` expects a string value",
+							child->key);
+					return -1;
+				}
+				pkcp.private_key = read_file(key);
+			}
+			else if (!strcasecmp("SSLServerCert", child->key)) {
+				char *cert = NULL;
+				if (cf_util_get_string(child, &cert)) {
+					ERROR("grpc: Option `%s` expects a string value",
+							child->key);
+					return -1;
+				}
+				pkcp.cert_chain = read_file(cert);
+			}
+			else {
+				WARNING("grpc: Option `%s` not allowed in <%s> block.",
+						child->key, ci->key);
+			}
 		}
 
+		ssl_opts->pem_key_cert_pairs.push_back(pkcp);
+		if (use_ssl)
+			listener.ssl = ssl_opts;
+		else
+			delete(ssl_opts);
+
+		listeners.push_back(listener);
 		return 0;
 	} /* c_grpc_config_listen() */