From: Harvie <tomas@mudrunka.cz>
Date: Sun, 29 Aug 2010 01:22:14 +0000 (+0200)
Subject: Added new ENV value ANSW_PROTOCOL. Now you can securely recognize user by his nick... 
X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=2bcad731832754d3f67219355f1a9878bd38e27d;p=mirrors%2Flibpurple-core-answerscripts.git

Added new ENV value ANSW_PROTOCOL. Now you can securely recognize user by his nick and protocol (eg.: no one can fake your UIN by setting same IRC nick). eg.: [ "$ANSW_PROTOCOL" = "jabber" ] && [ "$ANSW_FROM" = "user@example.com" ] && echo "Access granted!";
---

diff --git a/answerscripts.c b/answerscripts.c
index 44fa0c1..c26d37b 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -8,10 +8,12 @@
 #define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
 #define ANSWERSCRIPTS_LINE_LENGTH 4096
 #define ENV_PREFIX "ANSW_"
+#define PROTOCOL_PREFIX "prpl-"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
 
 #ifndef __WIN32__
 	#include <fcntl.h>
@@ -63,6 +65,10 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	//printf("\nHarvie received: %s: %s\n", who, message); //debug
 	//purple_conv_im_send(purple_conversation_get_im_data(conv), ":-*"); //debug
 
+	//Get protocol ID
+	const char *protocol_id = purple_account_get_protocol_id(account);
+	if(!strncmp(protocol_id,PROTOCOL_PREFIX,strlen(PROTOCOL_PREFIX))) protocol_id += strlen(PROTOCOL_PREFIX); //trim out protocol prefix (eg.: "prpl-irc" => "irc")
+
 	//Get status
 	PurpleStatus *status = purple_account_get_active_status(account);
 	PurpleStatusType *type = purple_status_get_type(status);
@@ -80,8 +86,9 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	}
 
 	//Export variables to environment
-	setenv(ENV_PREFIX "FROM", who, 1);
 	setenv(ENV_PREFIX "MSG", message, 1);
+	setenv(ENV_PREFIX "FROM", who, 1);
+	setenv(ENV_PREFIX "PROTOCOL", protocol_id, 1);
 	setenv(ENV_PREFIX "STATUS", status_id, 1);
 	setenv(ENV_PREFIX "STATUS_MSG", status_msg, 1);
 
diff --git a/purple/answerscripts.d/00-debug.sh b/purple/answerscripts.d/00-debug.sh
index ad2ddb7..5509b65 100755
--- a/purple/answerscripts.d/00-debug.sh
+++ b/purple/answerscripts.d/00-debug.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 #Debug
-echo "<$ANSW_FROM> $ANSW_MSG" >&2;
+echo "<$ANSW_PROTOCOL/$ANSW_FROM> $ANSW_MSG" >&2;
 echo "($ANSW_STATUS: $ANSW_STATUS_MSG)" >&2;
diff --git a/purple/answerscripts.d/00-repeat.sh b/purple/answerscripts.d/00-repeat.sh
index ffd2076..af2520f 100755
--- a/purple/answerscripts.d/00-repeat.sh
+++ b/purple/answerscripts.d/00-repeat.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 #Dumb libpurple core-answerscripts script. Hello world!
-echo "REPEAT:$ANSW_FROM> $ANSW_MSG";
+echo "REPEAT:$ANSW_PROTOCOL:$ANSW_FROM> $ANSW_MSG";
diff --git a/purple/answerscripts.sh b/purple/answerscripts.sh
index dbcb548..4dc0e8a 100755
--- a/purple/answerscripts.sh
+++ b/purple/answerscripts.sh
@@ -2,8 +2,9 @@
 
 #	This file is called for every message received by libpurple clients (pidgin,finch,...)
 #		- Following env values are passed to this script:
-#			- ANSW_FROM	(who sent you message)
 #			- ANSW_MSG	(text of the message)
+#			- ANSW_FROM	(who sent you message)
+#			- ANSW_PROTOCOL	(protocol used to deliver the message. eg.: jabber, irc,...)
 #			- ANSW_STATUS	(unique ID of status. eg.: available, away,...)
 #			- ANSW_STATUS_MSG	(status message set by user)
 #		- WARNING: You should mind security (don't let attackers to execute their messages/nicks!)