libtransport.git Changeset - 94337d703e24

Changeset - 94337d703e24

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Alexander Skovpen - 13 years ago 2012-04-08 22:28:42
a.n.skovpen@gmail.com

partially #258

3 files changed with 41 insertions and 11 deletions:

src/admininterface.cpp

src/usermanager.cpp

src/userregistry.cpp

0 comments (0 inline, 0 general)

src/admininterface.cpp

➞

Show inline comments

 	if (!message->getTo().getNode().empty())
 		return;
 	if (message->getFrom().toBare().toString() != CONFIG_STRING(m_component->getConfig(), "service.admin_jid")) {
 		LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().toBare().toString());
 		return;
 	std::list<std::string> const &x = CONFIG_LIST(m_component->getConfig(),"service.admin_jid");
 	if (std::find(x.begin(), x.end(), message->getFrom().toBare().toString()) == x.end()) {
 	    LOG4CXX_WARN(logger, "Message not from admin user, but from " << message->getFrom().toBare().toString());
 	    return;
+	}
 	// Ignore empty messages
 	if (message->getBody().empty()) {
 		return;

src/usermanager.cpp

➞

Show inline comments

 	// Create user class if it's not there
 	if (!user) {
 		// Admin user is not legacy network user, so do not create User class instance for him
 /*
 		if (m_component->inServerMode() && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
 			// Send admin contact to the user.
 			Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 			m_component->getStanzaChannel()->sendPresence(response);
 			return;
+		}
 */
 		if (m_component->inServerMode()) {
 		//  && CONFIG_STRING(m_component->getConfig(), "service.admin_jid") == presence->getFrom().toBare().toString()) {
 		    std::list<std::string> const &x = CONFIG_LIST(m_component->getConfig(),"service.admin_jid");
 		    if (std::find(x.begin(), x.end(), presence->getFrom().toBare().toString()) != x.end()) {
 			// Send admin contact to the user.
 			Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 			Swift::RosterItemPayload item;
 			item.setJID(m_component->getJID());
 			item.setName("Admin");
 			item.setSubscription(Swift::RosterItemPayload::Both);
 			payload->addItem(item);
 			Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, presence->getFrom(), m_component->getIQRouter());
 			request->send();
 			Swift::Presence::ref response = Swift::Presence::create();
 			response->setTo(presence->getFrom());
 			response->setFrom(m_component->getJID());
 			m_component->getStanzaChannel()->sendPresence(response);
 			return;
+		    }
+		}
 		// No user and unavailable presence -> answer with unavailable
 		if (presence->getType() == Swift::Presence::Unavailable) {

src/userregistry.cpp

➞

Show inline comments

 UserRegistry::~UserRegistry() { m_removeTimer->stop(); }
 void UserRegistry::isValidUserPassword(const Swift::JID& user, Swift::ServerFromClientSession *session, const Swift::SafeByteArray& password) {
 	if (!CONFIG_STRING(config, "service.admin_jid").empty() && user.toBare().toString() == CONFIG_STRING(config, "service.admin_jid")) {
 		if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 	if (!CONFIG_STRING(config, "service.admin_jid").empty() ) {
 		std::list<std::string> const &x = CONFIG_LIST(config,"service.admin_jid");
 		if (std::find(x.begin(), x.end(), user.toBare().toString()) != x.end()) {
 		    if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 			session->handlePasswordValid();
+		}
 		else {
+		    }
 		    else {
 			session->handlePasswordInvalid();
+		}
 		return;
+		    }
 		    return;
+	    }
+	}
 	std::string key = user.toBare().toString();
 	// Users try to connect twice

0 comments (0 inline, 0 general)