libtransport.git Changeset - 6872e99abbd9

Changeset - 6872e99abbd9

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Florian Kinder - 8 years ago 2017-06-05 11:27:27
Fank@users.noreply.github.com

Added opensteamworks via libpurple (#203)

* add compatibility for steam guard in opensteamworks plugin, fixes #62

* steam guard changes

2 files changed with 62 insertions and 40 deletions:

Dockerfile

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

Dockerfile

➞

Show inline comments

@@ @@ -6,7 +6,7 @@ ARG commit=unknown @@
 RUN echo $commit
 # Spectrum 2
 RUN dnf install protobuf protobuf swiften gcc gcc-c++ make libpqxx-devel libpurple-devel protobuf-devel swiften-devel rpm-build avahi-devel boost-devel cmake cppunit-devel expat-devel libcommuni-devel libidn-devel libsqlite3x-devel log4cxx-devel gettext libgcrypt-devel libwebp-devel libpurple-devel zlib-devel json-glib-devel python-pip zlib-devel libjpeg-devel python-devel  mysql-devel popt-devel git libevent-devel qt-devel dbus-glib-devel libcurl-devel wget mercurial libtool -y && \
+RUN dnf install protobuf protobuf swiften gcc gcc-c++ make libpqxx-devel libpurple-devel protobuf-devel swiften-devel rpm-build avahi-devel boost-devel cmake cppunit-devel expat-devel libcommuni-devel libidn-devel libsqlite3x-devel log4cxx-devel gettext libgcrypt-devel libwebp-devel libpurple-devel zlib-devel json-glib-devel python-pip zlib-devel libjpeg-devel python-devel  mysql-devel popt-devel git libevent-devel qt-devel dbus-glib-devel libcurl-devel wget mercurial libtool libgnome-keyring-devel nss-devel -y && \
 	echo "---> Installing Spectrum 2" && \
 		git clone git://github.com/hanzz/spectrum2.git && \
 		cd spectrum2 && \
 		make install && \
 		cd .. && \
 		rm -rf purple-discord && \
 	echo "---> Install Steam" && \
 		git clone https://github.com/EionRobb/pidgin-opensteamworks.git && \
 		cd pidgin-opensteamworks/steam-mobile && \
 		make && \
 		make install && \
 		cd ../.. && \
 		rm -rf pidgin-opensteamworks && \
 	echo "---> cleanup" && \
 		rm -rf /usr/share/locale/* && \
 		rm -rf /usr/share/doc/* && \

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -366,8 +366,12 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 				return;
+			}
 			if (protocol == "prpl-hangouts") {
 			        adminLegacyName = "hangouts";
 			        adminAlias = "hangouts";
 				adminLegacyName = "hangouts";
 				adminAlias = "hangouts";
+			}
 			else if (protocol == "prpl-steam-mobile") {
 				adminLegacyName = "steam-mobile";
 				adminAlias = "steam-mobile";
+			}
 			if (!purple_find_prpl_wrapped(protocol.c_str())) {
@@ @@ -519,7 +523,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 			if (account) {
 				LOG4CXX_INFO(logger, "Sending message to '" << legacyName << "'");
 				PurpleConversation *conv = purple_find_conversation_with_account_wrapped(PURPLE_CONV_TYPE_CHAT, LegacyNameToName(account, legacyName).c_str(), account);
-	                	if (legacyName == adminLegacyName) {
+				if (legacyName == adminLegacyName) {
 					// expect OAuth code
 					if (m_inputRequests.find(user) != m_inputRequests.end()) {
 						LOG4CXX_INFO(logger, "Updating token for '" << user << "'");
@@ @@ -873,13 +877,13 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 		std::map<PurpleAccount *, std::string> m_accounts;
 		std::map<std::string, unsigned int> m_vcards;
 		std::map<std::string, authRequest *> m_authRequests;
-	        std::map<std::string, inputRequest *> m_inputRequests;
+		std::map<std::string, inputRequest *> m_inputRequests;
 		std::map<std::string, std::list<std::string> > m_rooms;
 		std::map<unsigned long, PurpleXfer *> m_xfers;
 		std::map<std::string, PurpleXfer *> m_unhandledXfers;
 		std::vector<PurpleXfer *> m_waitingXfers;
 	        std::string adminLegacyName;
         	std::string adminAlias;
 		std::string adminLegacyName;
 		std::string adminAlias;
 };
 static bool getStatus(PurpleBuddy *m_buddy, pbnetwork::StatusType &status, std::string &statusMessage) {
+}
 void * requestInput(const char *title, const char *primary,const char *secondary, const char *default_value, gboolean multiline, gboolean masked, gchar *hint,const char *ok_text, GCallback ok_cb,const char *cancel_text, GCallback cancel_cb, PurpleAccount *account, const char *who,PurpleConversation *conv, void *user_data) {
     if (primary) {
         std::string primaryString(primary);
         if (primaryString == "Authorization Request Message:") {
             LOG4CXX_INFO(logger, "Authorization Request Message: calling ok_cb(...)");
             ((PurpleRequestInputCb) ok_cb)(user_data, "Please authorize me.");
             return NULL;
+        }
         else if (primaryString == "Authorization Request Message:") {
             LOG4CXX_INFO(logger, "Authorization Request Message: calling ok_cb(...)");
             ((PurpleRequestInputCb) ok_cb)(user_data, "Please authorize me.");
             return NULL;
+        }
         else if (primaryString == "Authorization Denied Message:") {
             LOG4CXX_INFO(logger, "Authorization Deined Message: calling ok_cb(...)");
             ((PurpleRequestInputCb) ok_cb)(user_data, "Authorization denied.");
             return NULL;
+        }
         else if (boost::starts_with(primaryString, "https://accounts.google.com/o/oauth2/auth")) {
             LOG4CXX_INFO(logger, "prpl-hangouts oauth request");
             np->handleMessage(np->m_accounts[account], np->adminLegacyName, std::string("Please visit the following link and authorize this application: ") + primaryString, "");
             np->handleMessage(np->m_accounts[account], np->adminLegacyName, std::string("Reply with code provided by Google: "));
             inputRequest *req = new inputRequest;
             req->ok_cb = (PurpleRequestInputCb)ok_cb;
             req->user_data = user_data;
             req->account = account;
             req->mainJID = np->m_accounts[account];
             np->m_inputRequests[req->mainJID] = req;
             return NULL;
+        }
         else {
             LOG4CXX_WARN(logger, "Unhandled request input. primary=" << primaryString);
+        }
+    }
 	if (primary) {
 		std::string primaryString(primary);
 		if (primaryString == "Authorization Request Message:") {
 			LOG4CXX_INFO(logger, "Authorization Request Message: calling ok_cb(...)");
 			((PurpleRequestInputCb) ok_cb)(user_data, "Please authorize me.");
 			return NULL;
+		}
 		else if (primaryString == "Authorization Request Message:") {
 			LOG4CXX_INFO(logger, "Authorization Request Message: calling ok_cb(...)");
 			((PurpleRequestInputCb) ok_cb)(user_data, "Please authorize me.");
 			return NULL;
+		}
 		else if (primaryString == "Authorization Denied Message:") {
 			LOG4CXX_INFO(logger, "Authorization Deined Message: calling ok_cb(...)");
 			((PurpleRequestInputCb) ok_cb)(user_data, "Authorization denied.");
 			return NULL;
+		}
 		else if (boost::starts_with(primaryString, "https://accounts.google.com/o/oauth2/auth")) {
 			LOG4CXX_INFO(logger, "prpl-hangouts oauth request");
 			np->handleMessage(np->m_accounts[account], np->adminLegacyName, std::string("Please visit the following link and authorize this application: ") + primaryString, "");
 			np->handleMessage(np->m_accounts[account], np->adminLegacyName, std::string("Reply with code provided by Google: "));
 			inputRequest *req = new inputRequest;
 			req->ok_cb = (PurpleRequestInputCb)ok_cb;
 			req->user_data = user_data;
 			req->account = account;
 			req->mainJID = np->m_accounts[account];
 			np->m_inputRequests[req->mainJID] = req;
 			return NULL;
+		}
 		else if (primaryString == "Set your Steam Guard Code") {
 			LOG4CXX_INFO(logger, "prpl-steam-mobile steam guard request");
 			np->handleMessage(np->m_accounts[account], np->adminLegacyName, std::string("Steam Guard code: "));
 			inputRequest *req = new inputRequest;
 			req->ok_cb = (PurpleRequestInputCb)ok_cb;
 			req->user_data = user_data;
 			req->account = account;
 			req->mainJID = np->m_accounts[account];
 			np->m_inputRequests[req->mainJID] = req;
 			return NULL;
+		}
 		else {
 			LOG4CXX_WARN(logger, "Unhandled request input. primary=" << primaryString);
+		}
+	}
     else if (title) {
         std::string titleString(title);
         if (titleString == "Xfire Invitation Message") {

0 comments (0 inline, 0 general)