Changeset 2204 for trunk/auto-reply

Timestamp:

08/16/00 08:39:45 (8 years ago)

Author:

graham

Message:

Try sending direct first, if that fails then send through the server.
Added "Arguments" option to allow passing the user alias/uin etc to the
command.
Added "PassMessage?" option to allow passing the actual event text to the
standard input of the command.

Location:

trunk/auto-reply

Files:

• configure.in (modified) (2 diffs)
• licq_autoreply.conf (modified) (1 diff)
• src/autoreply.cpp (modified) (8 diffs)
• src/autoreply.h (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)

trunk/auto-reply/configure.in

@@ -6 +6 @@
 
 dnl All versioning is done via the following line
-AM_INIT_AUTOMAKE(Licq-AutoReply, 0.17)
+AM_INIT_AUTOMAKE(Licq-AutoReply, 1.0)
 AM_CONFIG_HEADER(config.h)
 
@@ -36 +36 @@
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(errno.h pwd.h sys/time.h)
+AC_CHECK_HEADERS(errno.h pwd.h sys/time.h paths.h)
 AC_HEADER_TIME
 LICQ_SYS_ERRLIST

trunk/auto-reply/licq_autoreply.conf

@@ -2 +2 @@
 # Edit and copy to ~/.licq
 
-# the program to run for output to send in the message
 [Reply]
-Program=/usr/games/fortune
+# The program to run for output to send in the message.
+# "talkback" might be any program or script.
+Program = talkback
 
+# This is a string which will be parsed for user % symbols
+# and then appended to the above command.
+# This example passes the uin and then the alias in quotes
+# So the final command might be:
+#   talkback -u 3456789 -a 'coolguy'
+# WARNING: be careful passing the alias, name etc as they could
+#          contain exploits such as "evil_alias; rm -rf ~".
+#          Always quote anything that could contain text.
+Arguments = -u %u -a '%a'
+
+# This flag tells the plugin whether or not the command
+# expects the incoming message as standard input
+# If set to 1 then the program will be fed the incoming
+# message to standard input.
+PassMessage = 0
+
+
+# Here is a simple example which will bounce the event
+# right back to the user:
+#
+# Program = cat
+# Arguments = 
+# PassMessage = 1
+#
+#
+# Here is an example which simply sends a fortune back to
+# the user:
+#
+# Program = /usr/games/fortune
+# Arguments =
+# PassMessage = 0
+#
+

trunk/auto-reply/src/autoreply.cpp

@@ -7 +7 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <signal.h>
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
@@ -12 +15 @@
 extern int errno;
 #endif
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#else
+#define _PATH_BSHELL "/bin/sh"
+#endif
+
 
 #include "autoreply.h"
@@ -74 +83 @@
   conf.SetSection("Reply");
   conf.ReadStr("Program", m_szProgram);
+  conf.ReadStr("Arguments", m_szArguments, "");
+  conf.ReadBool("PassMessage", m_bPassMessage, false);
   conf.CloseFile();
 
@@ -194 +205 @@
 void CLicqAutoReply::ProcessEvent(ICQEvent *e)
 {
+  CUserEvent *user_event;
+
+  if (e->Result() != EVENT_ACKED)
+  {
+    if (e->Command() == ICQ_CMDxTCP_START &&
+        (e->SubCommand() != ICQ_CMDxSUB_CHAT &&
+         e->SubCommand() != ICQ_CMDxSUB_FILE))
+    {
+        user_event = e->UserEvent();
+      CICQEventTag *tag = licqDaemon->icqSendMessage(e->Uin(), user_event->Text(), false,
+        ICQ_TCPxMSG_URGENT); //urgent, because, hey, he asked us, right?
+        delete tag;
+    }
+  }
+
   delete e;
 }
@@ -216 +242 @@
   else
   {
-    bool r = AutoReplyEvent(nUin);
+    bool r = AutoReplyEvent(nUin, e);
     if (m_bDelete && r)
     {
@@ -227 +253 @@
 
 
-bool CLicqAutoReply::AutoReplyEvent(unsigned long nUin)
-{
-  FILE *output;
-  char m_szMessage[4096];
+bool CLicqAutoReply::AutoReplyEvent(unsigned long nUin, CUserEvent *event)
+{
+  char m_szMessage[4096], szCommand[4096];
   char c;
   int pos = 0;
@@ -238 +263 @@
     m_szMessage[i] = '\0';
   }
-  output = popen (m_szProgram, "r");
-  if (!output)
-  {
-    gLog.Warn("%sCould not execute %s\n", L_AUTOREPxSTR, m_szProgram);
+
+  char *buf = szCommand;
+  buf += sprintf(buf, "%s ", m_szProgram);
+  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  u->usprintf(buf, m_szArguments);
+  gUserManager.DropUser(u);
+
+  if (!POpen(szCommand))
+  {
+    gLog.Warn("%sCould not execute %s\n", L_AUTOREPxSTR, szCommand);
     return false;
   }
-  while (((c = fgetc(output)) != EOF) && (pos < 4096))
+  if (m_bPassMessage)
+  {
+    fprintf(fStdIn, "%s\n", event->Text());
+    fclose(fStdIn);
+    fStdIn = NULL;
+  }
+
+  while (((c = fgetc(fStdOut)) != EOF) && (pos < 4096))
   {
     m_szMessage[pos++] = c;
   }
-  pclose (output);
+  PClose();
+
   char *szText = new char[4096 + 256];
   sprintf(szText, "%s", m_szMessage);
-  CICQEventTag *tag = licqDaemon->icqSendMessage(nUin, szText, false,
-     ICQ_TCPxMSG_NORMAL);
+  CICQEventTag *tag = licqDaemon->icqSendMessage(nUin, szText, true,
+     ICQ_TCPxMSG_URGENT);
   delete []szText;
 
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  u = gUserManager.FetchUser(nUin, LOCK_R);
   if (u == NULL) return false;
 
@@ -274 +313 @@
 }
 
+
+
+bool CLicqAutoReply::POpen(const char *cmd)
+{
+  int pdes_out[2], pdes_in[2];
+
+  if (pipe(pdes_out) < 0) return false;
+  if (pipe(pdes_in) < 0) return false;
+
+  switch (pid = fork())
+  {
+    case -1:                        /* Error. */
+    {
+      close(pdes_out[0]);
+      close(pdes_out[1]);
+      close(pdes_in[0]);
+      close(pdes_in[1]);
+      return false;
+      /* NOTREACHED */
+    }
+    case 0:                         /* Child. */
+    {
+      if (pdes_out[1] != STDOUT_FILENO)
+      {
+        dup2(pdes_out[1], STDOUT_FILENO);
+        close(pdes_out[1]);
+      }
+      close(pdes_out[0]);
+      if (pdes_in[0] != STDIN_FILENO)
+      {
+        dup2(pdes_in[0], STDIN_FILENO);
+        close(pdes_in[0]);
+      }
+      close(pdes_in[1]);
+      execl(_PATH_BSHELL, "sh", "-c", cmd, NULL);
+      _exit(127);
+      /* NOTREACHED */
+    }
+  }
+
+  /* Parent; assume fdopen can't fail. */
+  fStdOut = fdopen(pdes_out[0], "r");
+  close(pdes_out[1]);
+  fStdIn = fdopen(pdes_in[1], "w");
+  close(pdes_in[0]);
+
+  // Set both streams to line buffered
+  setvbuf(fStdOut, (char*)NULL, _IOLBF, 0);
+  setvbuf(fStdIn, (char*)NULL, _IOLBF, 0);
+
+  return true;
+}
+
+
+void CLicqAutoReply::PClose()
+{
+   int r, pstat;
+
+   // Close the file descriptors
+   if (fStdOut != NULL) fclose(fStdOut);
+   if (fStdIn != NULL) fclose(fStdIn);
+   fStdOut = fStdIn = NULL;
+
+   // See if the child is still there
+   r = waitpid(pid, &pstat, WNOHANG);
+   // Return if child has exited or there was an inor
+   if (r == pid || r == -1) return;
+
+   // Give the process another .2 seconds to die
+   struct timeval tv = { 0, 200000 };
+   select(0, NULL, NULL, NULL, &tv);
+
+   // Still there?
+   r = waitpid(pid, &pstat, WNOHANG);
+   if (r == pid || r == -1) return;
+
+   // Try and kill the process
+   if (kill(pid, SIGTERM) == -1) return;
+
+   // Give it 1 more second to die
+   tv.tv_sec = 1;
+   tv.tv_usec = 0;
+   select(0, NULL, NULL, NULL, &tv);
+
+   // See if the child is still there
+   r = waitpid(pid, &pstat, WNOHANG);
+   if (r == pid || r == -1) return;
+
+   // Kill the bastard
+   kill(pid, SIGKILL);
+   // Now he will die for sure
+   waitpid(pid, &pstat, 0);
+}
+
+

trunk/auto-reply/src/autoreply.h

@@ -26 +26 @@
   bool m_bExit, m_bEnabled, m_bDelete;
   char *m_szStatus;
-  char m_szProgram[512];
+  char m_szProgram[512], m_szArguments[512];
+  bool m_bPassMessage;
 
   CICQDaemon *licqDaemon;
@@ -37 +38 @@
 
   void ProcessUserEvent(unsigned long, unsigned long);
-  bool AutoReplyEvent(unsigned long);
+  bool AutoReplyEvent(unsigned long, CUserEvent *);
+
+  bool POpen(const char *cmd);
+  void PClose();
+
+protected:
+  int pid;
+  FILE *fStdOut;
+  FILE *fStdIn;
 
 };

trunk/auto-reply/src/main.cpp

@@ -42 +42 @@
 const char *LP_Version()
 {
-  static const char version[] = "0.17";
+  static const char version[] = "1.00";
   return version;
 }