From 8b87e301970ab7e2af7d0e433ead597d922a8f0a Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 14 Aug 2012 10:53:04 +0200
Subject: [PATCH] Removed roles/publications.

---
 components/checker/checkercomponent.cpp       |   6 +-
 components/cibsync/cibsynccomponent.cpp       |   4 --
 components/delegation/delegationcomponent.cpp |   2 +-
 components/demo/democomponent.cpp             |   1 -
 components/discovery/discoverycomponent.cpp   |  65 +-----------------
 components/discovery/discoverycomponent.h     |   2 -
 components/discovery/discoverymessage.cpp     |   9 ---
 components/discovery/discoverymessage.h       |   3 -
 configure.ac                                  |   1 +
 doc/icinga2-config.odt                        | Bin 31455 -> 31313 bytes
 icinga-app/icinga-checker1.conf               |   6 --
 icinga-app/icinga-checker2.conf               |   6 --
 icinga-app/icinga-standalone.conf             |  27 ++------
 icinga-app/icinga1.conf                       |  16 -----
 icinga-app/icinga2.conf                       |   7 --
 icinga-app/icinga3.conf                       |   6 --
 icinga/endpoint.cpp                           |  59 ----------------
 icinga/endpoint.h                             |  10 ---
 icinga/jsonrpcendpoint.cpp                    |   8 +--
 19 files changed, 17 insertions(+), 221 deletions(-)

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index fe12717d5..ed98ee86d 100644
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -24,7 +24,11 @@ using namespace icinga;
 void CheckerComponent::Start(void)
 {
 	m_Endpoint = boost::make_shared<VirtualEndpoint>();
-	m_Endpoint->RegisterPublication("checker::ServiceStateChange");
+
+	/* dummy registration so the delegation module knows this is a checker
+	   TODO: figure out a better way for this */
+	m_Endpoint->RegisterSubscription("checker");
+
 	EndpointManager::GetInstance()->RegisterEndpoint(m_Endpoint);
 
 	Service::OnCheckerChanged.connect(bind(&CheckerComponent::CheckerChangedHandler, this, _1));
diff --git a/components/cibsync/cibsynccomponent.cpp b/components/cibsync/cibsynccomponent.cpp
index ecd4ebf57..a44a168fb 100644
--- a/components/cibsync/cibsynccomponent.cpp
+++ b/components/cibsync/cibsynccomponent.cpp
@@ -36,12 +36,8 @@ void CIBSyncComponent::Start(void)
 	DynamicObject::OnUnregistered.connect(boost::bind(&CIBSyncComponent::LocalObjectUnregisteredHandler, this, _1));
 	DynamicObject::OnTransactionClosing.connect(boost::bind(&CIBSyncComponent::TransactionClosingHandler, this, _1));
 
-	m_Endpoint->RegisterPublication("config::ObjectUpdate");
-	m_Endpoint->RegisterPublication("config::ObjectRemoved");
-
 	EndpointManager::GetInstance()->OnNewEndpoint.connect(boost::bind(&CIBSyncComponent::NewEndpointHandler, this, _2));
 
-	m_Endpoint->RegisterPublication("config::FetchObjects");
 	m_Endpoint->RegisterTopicHandler("config::ObjectUpdate",
 	    boost::bind(&CIBSyncComponent::RemoteObjectUpdateHandler, this, _2, _3));
 	m_Endpoint->RegisterTopicHandler("config::ObjectRemoved",
diff --git a/components/delegation/delegationcomponent.cpp b/components/delegation/delegationcomponent.cpp
index bc4a053af..560dac591 100644
--- a/components/delegation/delegationcomponent.cpp
+++ b/components/delegation/delegationcomponent.cpp
@@ -33,7 +33,7 @@ void DelegationComponent::Start(void)
 
 bool DelegationComponent::IsEndpointChecker(const Endpoint::Ptr& endpoint)
 {
-	return (endpoint->HasPublication("checker::ServiceStateChange"));
+	return (endpoint->HasSubscription("checker"));
 }
 
 vector<Endpoint::Ptr> DelegationComponent::GetCheckerCandidates(const Service::Ptr& service) const
diff --git a/components/demo/democomponent.cpp b/components/demo/democomponent.cpp
index 5e7158b23..edeae95c2 100644
--- a/components/demo/democomponent.cpp
+++ b/components/demo/democomponent.cpp
@@ -29,7 +29,6 @@ void DemoComponent::Start(void)
 	m_Endpoint = boost::make_shared<VirtualEndpoint>();
 	m_Endpoint->RegisterTopicHandler("demo::HelloWorld",
 	    boost::bind(&DemoComponent::HelloWorldRequestHandler, this, _2, _3));
-	m_Endpoint->RegisterPublication("demo::HelloWorld");
 	EndpointManager::GetInstance()->RegisterEndpoint(m_Endpoint);
 
 	m_DemoTimer = boost::make_shared<Timer>();
diff --git a/components/discovery/discoverycomponent.cpp b/components/discovery/discoverycomponent.cpp
index a34f1ed82..cdbfddb88 100644
--- a/components/discovery/discoverycomponent.cpp
+++ b/components/discovery/discoverycomponent.cpp
@@ -28,11 +28,9 @@ void DiscoveryComponent::Start(void)
 {
 	m_Endpoint = boost::make_shared<VirtualEndpoint>();
 
-	m_Endpoint->RegisterPublication("discovery::RegisterComponent");
 	m_Endpoint->RegisterTopicHandler("discovery::RegisterComponent",
 		boost::bind(&DiscoveryComponent::RegisterComponentMessageHandler, this, _2, _3));
 
-	m_Endpoint->RegisterPublication("discovery::NewComponent");
 	m_Endpoint->RegisterTopicHandler("discovery::NewComponent",
 		boost::bind(&DiscoveryComponent::NewComponentMessageHandler, this, _3));
 
@@ -101,12 +99,6 @@ void DiscoveryComponent::NewEndpointHandler(const Endpoint::Ptr& endpoint)
 		return;
 	}
 
-	/* accept discovery::RegisterComponent messages from any endpoint */
-	endpoint->RegisterPublication("discovery::RegisterComponent");
-
-	/* accept discovery::Welcome messages from any endpoint */
-	endpoint->RegisterPublication("discovery::Welcome");
-
 	String identity = endpoint->GetIdentity();
 
 	if (identity == EndpointManager::GetInstance()->GetIdentity()) {
@@ -156,10 +148,6 @@ void DiscoveryComponent::NewEndpointHandler(const Endpoint::Ptr& endpoint)
 
 	// register published/subscribed topics for this endpoint
 	ComponentDiscoveryInfo::Ptr info = ic->second;
-	BOOST_FOREACH(String publication, info->Publications) {
-		endpoint->RegisterPublication(publication);
-	}
-
 	BOOST_FOREACH(String subscription, info->Subscriptions) {
 		endpoint->RegisterSubscription(subscription);
 	}
@@ -180,9 +168,6 @@ void DiscoveryComponent::DiscoveryEndpointHandler(const Endpoint::Ptr& endpoint,
 
 	for (i = endpoint->BeginSubscriptions(); i != endpoint->EndSubscriptions(); i++)
 		info->Subscriptions.insert(*i);
-
-	for (i = endpoint->BeginPublications(); i != endpoint->EndPublications(); i++)
-		info->Publications.insert(*i);
 }
 
 /**
@@ -295,41 +280,12 @@ void DiscoveryComponent::SendDiscoveryMessage(const String& method, const String
 
 	params.SetSubscriptions(subscriptions);
 
-	Dictionary::Ptr publications = boost::make_shared<Dictionary>();
-	BOOST_FOREACH(String publication, info->Publications) {
-		publications->Add(publication);
-	}
-
-	params.SetPublications(publications);
-
 	if (recipient)
 		EndpointManager::GetInstance()->SendUnicastMessage(m_Endpoint, recipient, request);
 	else
 		EndpointManager::GetInstance()->SendMulticastMessage(m_Endpoint, request);
 }
 
-bool DiscoveryComponent::HasMessagePermission(const Dictionary::Ptr& roles, const String& messageType, const String& message)
-{
-	if (!roles)
-		return false;
-
-	Value roleName;
-	BOOST_FOREACH(tie(tuples::ignore, roleName), roles) {
-		DynamicObject::Ptr role = DynamicObject::GetObject("Role", roleName);
-		Dictionary::Ptr permissions = role->Get(messageType);
-		if (!permissions)
-			continue;
-
-		Value permission;
-		BOOST_FOREACH(tie(tuples::ignore, permission), permissions) {
-			if (Utility::Match(permission, message))
-				return true;
-		}
-	}
-
-	return false;
-}
-
 /**
  * Processes a discovery message by registering the component in the
  * discovery component registry.
@@ -363,27 +319,13 @@ void DiscoveryComponent::ProcessDiscoveryMessage(const String& identity, const D
 
 	Endpoint::Ptr endpoint = EndpointManager::GetInstance()->GetEndpointByIdentity(identity);
 
-	Dictionary::Ptr publications;
-	if (message.GetPublications(&publications)) {
-		Value publication;
-		BOOST_FOREACH(tie(tuples::ignore, publication), publications) {
-			if (trusted || HasMessagePermission(roles, "publications", publication)) {
-				info->Publications.insert(publication);
-				if (endpoint)
-					endpoint->RegisterPublication(publication);
-			}
-		}
-	}
-
 	Dictionary::Ptr subscriptions;
 	if (message.GetSubscriptions(&subscriptions)) {
 		Value subscription;
 		BOOST_FOREACH(tie(tuples::ignore, subscription), subscriptions) {
-			if (trusted || HasMessagePermission(roles, "subscriptions", subscription)) {
-				info->Subscriptions.insert(subscription);
-				if (endpoint)
-					endpoint->RegisterSubscription(subscription);
-			}
+			info->Subscriptions.insert(subscription);
+			if (endpoint)
+				endpoint->RegisterSubscription(subscription);
 		}
 	}
 
@@ -490,7 +432,6 @@ void DiscoveryComponent::DiscoveryTimerHandler(void)
 			/* update LastSeen if we're still connected to this endpoint */
 			info->LastSeen = now;
 		} else {
-			/* TODO: figure out whether we actually want to connect to this component */
 			/* try and reconnect to this component */
 			try {
 				if (!info->Node.IsEmpty() && !info->Service.IsEmpty())
diff --git a/components/discovery/discoverycomponent.h b/components/discovery/discoverycomponent.h
index 629d78b3e..1160a5884 100644
--- a/components/discovery/discoverycomponent.h
+++ b/components/discovery/discoverycomponent.h
@@ -74,8 +74,6 @@ private:
 
 	void FinishDiscoverySetup(const Endpoint::Ptr& endpoint);
 
-	bool HasMessagePermission(const Dictionary::Ptr& roles, const String& messageType, const String& message);
-
 	static const int RegistrationTTL = 300;
 };
 
diff --git a/components/discovery/discoverymessage.cpp b/components/discovery/discoverymessage.cpp
index 6f22c7bd8..fde9df491 100644
--- a/components/discovery/discoverymessage.cpp
+++ b/components/discovery/discoverymessage.cpp
@@ -69,12 +69,3 @@ void DiscoveryMessage::SetSubscriptions(const Dictionary::Ptr& value)
 	Set("subscriptions", value);
 }
 
-bool DiscoveryMessage::GetPublications(Dictionary::Ptr *value) const
-{
-	return Get("publications", value);
-}
-
-void DiscoveryMessage::SetPublications(const Dictionary::Ptr& value)
-{
-	Set("publications", value);
-}
diff --git a/components/discovery/discoverymessage.h b/components/discovery/discoverymessage.h
index 9d6379afe..6f984b451 100644
--- a/components/discovery/discoverymessage.h
+++ b/components/discovery/discoverymessage.h
@@ -43,9 +43,6 @@ public:
 
 	bool GetSubscriptions(Dictionary::Ptr *value) const;
 	void SetSubscriptions(const Dictionary::Ptr& value);
-
-	bool GetPublications(Dictionary::Ptr *value) const;
-	void SetPublications(const Dictionary::Ptr& value);
 };
 
 }
diff --git a/configure.ac b/configure.ac
index 5dea77e11..4d439c62e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ AX_CXX_GCC_ABI_DEMANGLE
 AX_BOOST_BASE
 AX_BOOST_SIGNALS
 AX_BOOST_THREAD
+AX_BOOST_SYSTEM
 AX_BOOST_UNIT_TEST_FRAMEWORK
 AX_CHECK_OPENSSL([], [AC_MSG_ERROR([You need the OpenSSL headers and libraries in order to build this application])])
 AC_CHECK_LIB(ssl, SSL_new)
diff --git a/doc/icinga2-config.odt b/doc/icinga2-config.odt
index f6243285755f909eb07036141b840c270afc834a..1cba65153ea20facc80d86cf03b3fe055a8b8445 100644
GIT binary patch
delta 9508
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
DcbcC6

delta 9601
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
Tu3&!G4`5zzR2U-nzdZi~71kiG

diff --git a/icinga-app/icinga-checker1.conf b/icinga-app/icinga-checker1.conf
index b32ccb83a..c7c6f97a5 100644
--- a/icinga-app/icinga-checker1.conf
+++ b/icinga-app/icinga-checker1.conf
@@ -20,11 +20,5 @@ local object Component "discovery" {
 local object Endpoint "icinga-c1" {
         node = "192.168.5.46",
         service = 7777,
-
-        roles = { "all" }
 }
 
-local object Role "all" {
-        publications = { "*" },
-        subscriptions = { "*" }
-}
diff --git a/icinga-app/icinga-checker2.conf b/icinga-app/icinga-checker2.conf
index b249de745..70e8f9fc7 100644
--- a/icinga-app/icinga-checker2.conf
+++ b/icinga-app/icinga-checker2.conf
@@ -14,11 +14,5 @@ local object component "discovery" {
 local object endpoint "icinga-c1" {
 	node = "192.168.5.46",
 	service = 7777,
-
-	roles = { "all" }
 }
 
-local object role "all" {
-	publications = { "*" },
-	subscriptions = { "*" }
-}
diff --git a/icinga-app/icinga-standalone.conf b/icinga-app/icinga-standalone.conf
index 897efddfc..a6acc464a 100644
--- a/icinga-app/icinga-standalone.conf
+++ b/icinga-app/icinga-standalone.conf
@@ -3,7 +3,11 @@ local object Application "icinga" {
 	ca = "ca.crt",
 
 	node = "192.168.2.235",
-	service = 7777
+	service = 7777,
+
+	macros = {
+		plugindir = "/usr/local/icinga/libexec"
+	}
 }
 
 local object Component "discovery" {
@@ -22,23 +26,6 @@ local object Component "compat" {
 
 }
 
-local object Endpoint "icinga-c2" {
-	roles = { "all" }
-}
-
-local object Endpoint "icinga-c3" {
-	roles = { "all" }
-}
-
-local object Endpoint "icinga-c4" {
-	roles = { "all" }
-}
-
-local object Role "all" {
-	publications = { "*" },
-	subscriptions = { "*" }
-}
-
 object Host "localhost" {
 
 }
@@ -46,10 +33,6 @@ object Host "localhost" {
 abstract object Service "nagios-service" {
 	methods = {
 		check = "native::NagiosCheck"
-	},
-
-	macros = {
-		plugindir = "/usr/local/icinga/libexec"
 	}
 }
 
diff --git a/icinga-app/icinga1.conf b/icinga-app/icinga1.conf
index 35469dc4c..f24b3c11a 100644
--- a/icinga-app/icinga1.conf
+++ b/icinga-app/icinga1.conf
@@ -17,19 +17,3 @@ local object Component "discovery" {
 	broker = 1
 }
 
-local object Endpoint "icinga-c2" {
-	roles = { "demo" }
-}
-
-local object Endpoint "icinga-c3" {
-	roles = { "demo" }
-}
-
-local object Role "broker" {
-	publications = { "discovery::NewComponent" }
-}
-
-local object Role "demo" {
-	publications = { "demo::*" },
-	subscriptions = { "demo::*" }
-}
diff --git a/icinga-app/icinga2.conf b/icinga-app/icinga2.conf
index 0b0b85532..6dbee780c 100644
--- a/icinga-app/icinga2.conf
+++ b/icinga-app/icinga2.conf
@@ -22,13 +22,6 @@ local object component "discovery" {
 local object endpoint "icinga-c3" {
 	node = "192.168.5.46",
 	service = 9999,
-
-	roles = { "all" }
-}
-
-local object role "all" {
-	publications = { "*" },
-	subscriptions = { "*" }
 }
 
 # --------------------------------------------
diff --git a/icinga-app/icinga3.conf b/icinga-app/icinga3.conf
index 1793167f8..7e880b11b 100644
--- a/icinga-app/icinga3.conf
+++ b/icinga-app/icinga3.conf
@@ -19,11 +19,5 @@ local object component "discovery" {
 local object endpoint "icinga-c2" {
 	node = "192.168.2.235",
 	service = 7777,
-
-	roles = { "all" }
 }
 
-local object role "all" {
-	publications = { "*" },
-	subscriptions = { "*" }
-}
diff --git a/icinga/endpoint.cpp b/icinga/endpoint.cpp
index d5466e8ad..1209963df 100644
--- a/icinga/endpoint.cpp
+++ b/icinga/endpoint.cpp
@@ -72,37 +72,6 @@ bool Endpoint::HasSubscription(String topic) const
 	return (m_Subscriptions.find(topic) != m_Subscriptions.end());
 }
 
-/**
- * Registers a topic publication for this endpoint.
- *
- * @param topic The name of the topic.
- */
-void Endpoint::RegisterPublication(String topic)
-{
-	m_Publications.insert(topic);
-}
-
-/**
- * Removes a topic publication from this endpoint.
- *
- * @param topic The name of the topic.
- */
-void Endpoint::UnregisterPublication(String topic)
-{
-	m_Publications.erase(topic);
-}
-
-/**
- * Checks whether the endpoint  has a publication for the specified topic.
- *
- * @param topic The name of the topic.
- * @returns true if the endpoint is publishing this topic, false otherwise.
- */
-bool Endpoint::HasPublication(String topic) const
-{
-	return (m_Publications.find(topic) != m_Publications.end());
-}
-
 /**
  * Removes all subscriptions for the endpoint.
  */
@@ -111,14 +80,6 @@ void Endpoint::ClearSubscriptions(void)
 	m_Subscriptions.clear();
 }
 
-/**
- * Removes all publications for the endpoint.
- */
-void Endpoint::ClearPublications(void)
-{
-	m_Publications.clear();
-}
-
 /**
  * Returns the beginning of the subscriptions list.
  *
@@ -139,26 +100,6 @@ Endpoint::ConstTopicIterator Endpoint::EndSubscriptions(void) const
 	return m_Subscriptions.end();
 }
 
-/**
- * Returns the beginning of the publications list.
- *
- * @returns An iterator that points to the first publication.
- */
-Endpoint::ConstTopicIterator Endpoint::BeginPublications(void) const
-{
-	return m_Publications.begin();
-}
-
-/**
- * Returns the end of the publications list.
- *
- * @returns An iterator that points past the last publication.
- */
-Endpoint::ConstTopicIterator Endpoint::EndPublications(void) const
-{
-	return m_Publications.end();
-}
-
 /**
  * Sets whether a welcome message has been received from this endpoint.
  *
diff --git a/icinga/endpoint.h b/icinga/endpoint.h
index d853dd61a..f6586bbe3 100644
--- a/icinga/endpoint.h
+++ b/icinga/endpoint.h
@@ -58,10 +58,6 @@ public:
 	void UnregisterSubscription(String topic);
 	bool HasSubscription(String topic) const;
 
-	void RegisterPublication(String topic);
-	void UnregisterPublication(String topic);
-	bool HasPublication(String topic) const;
-
 	virtual bool IsLocal(void) const = 0;
 	virtual bool IsConnected(void) const = 0;
 
@@ -71,21 +67,15 @@ public:
 	virtual void Stop(void) = 0;
 
 	void ClearSubscriptions(void);
-	void ClearPublications(void);
 
 	ConstTopicIterator BeginSubscriptions(void) const;
 	ConstTopicIterator EndSubscriptions(void) const;
 
-	ConstTopicIterator BeginPublications(void) const;
-	ConstTopicIterator EndPublications(void) const;
-
 	boost::signal<void (const Endpoint::Ptr&)> OnSessionEstablished;
 
 private:
 	set<String> m_Subscriptions; /**< The topics this endpoint is
 					  subscribed to. */
-	set<String> m_Publications; /**< The topics this endpoint is
-				         publishing. */
 	bool m_ReceivedWelcome; /**< Have we received a welcome message
 				     from this endpoint? */
 	bool m_SentWelcome; /**< Have we sent a welcome message to this
diff --git a/icinga/jsonrpcendpoint.cpp b/icinga/jsonrpcendpoint.cpp
index f392ccb30..e21215cc5 100644
--- a/icinga/jsonrpcendpoint.cpp
+++ b/icinga/jsonrpcendpoint.cpp
@@ -96,9 +96,6 @@ void JsonRpcEndpoint::NewMessageHandler(const MessagePart& message)
 	if (!request.GetMethod(&method))
 		return;
 
-	if (!HasPublication(method))
-		return;
-
 	String id;
 	if (request.GetID(&id))
 		GetEndpointManager()->SendAnycastMessage(sender, request);
@@ -119,10 +116,9 @@ void JsonRpcEndpoint::ClientClosedHandler(void)
 
 	Logger::Write(LogWarning, "jsonrpc", "Lost connection to endpoint: identity=" + GetIdentity());
 
-	// TODO: _only_ clear non-persistent publications/subscriptions
-	// unregister ourselves if no persistent publications/subscriptions are left (use a timer for that, once we have a TTL property for the topics)
+	// TODO: _only_ clear non-persistent subscriptions
+	// unregister ourselves if no persistent subscriptions are left (use a timer for that, once we have a TTL property for the topics)
 	ClearSubscriptions();
-	ClearPublications();
 
 	// remove the endpoint if there are no more subscriptions */
 	if (BeginSubscriptions() == EndSubscriptions()) {
-- 
2.40.0