Import Upstream version 1.13

diff --git a/Changes b/Changes
index edb8650..901e269 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,12 @@
+2007-09-10:
+       - Fix: config file permission check did not allow read only file (Andrej Mikus)
+       - Fix: authentication to Google Talk server (Andrej Mikus)
+       - Feature: added a -l/--headline option to sendxmpp, to allow to send
+         a headline type message(Jerome Sautret <jerome.sautret@process-one.net>)
+
+2007-03-25:
+       - Fix: groupchat message doesn't has subject attribute. Thanks to Jakub Tucek <public AT otaznik.net>
+
 2006-10-17:
        - Added support for raw XML messages. Thanks to David Ammouial <da AT weeno.net>
        - Documentation enhancement. Thanks to David Ammouial <da AT weeno.net>
@@ -5,7 +14,7 @@
 2006-10-04:
        - Fixed sending of UTF-8 messages: patch from Denis Shaposhnikov <dsh AT vlink.ru> [2006-03-31]
        - Print error message on connect error. Patch from Jean-Baptiste Quenot <jbq AT caraldi.com> [2006-07-17]
-       - Added multiple recipient patch by Lubomir Host 'rajo' <rjao AT platon.sk> [2006-08-30]
+       - Added multiple recipient patch by Lubomir Host 'rajo' <rajo AT platon.sk> [2006-08-30]
        - Fixed bug with -message parameter. Thanks to Thomas Warnick <thwarnick AT gmail.com> [2005-09-06]
        - Homepage URL changed to http://sendxmpp.platon.sk
 

diff --git a/sendxmpp b/sendxmpp
index 4954cec..3959ffb 100755 (executable)
--- a/sendxmpp
+++ b/sendxmpp
@@ -7,15 +7,19 @@ if 0; # not running under some shell
 # script to send message using xmpp (aka jabber), 
 # somewhat resembling mail(1)
 #
-# Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-# Copyright (c) 2004, 2005 Dirk-Jan C. Binnema
-#
+# Author:     Dirk-Jan C. Binnema <djcb AT djcbsoftware.nl>
 # Maintainer: Lubomir Host 'rajo' <rajo AT platon.sk>
+# Copyright (c) 2004 - 2005 Dirk-Jan C. Binnema
+# Copyright (c) 2006 - 2007 Lubomir Host 'rajo'
+#
 # Homepage: http://sendxmpp.platon.sk
 #
 # Released under the terms of the GNU General Public License v2
 #
+# $Platon: sendxmpp/sendxmpp,v 1.13 2007-09-10 19:08:35 rajo Exp $
+# $Id: $
 
+use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed
 use Net::XMPP;
 use Getopt::Long;
 use strict;
@@ -24,10 +28,10 @@ use open ':utf8';
 use open ':std';                                                                                                                                                                     
 
 # subroutines decls
-sub xmpp_login($$$$$$$);
-sub xmpp_send ($$$);
+sub xmpp_login($$$$$$$$);
+sub xmpp_send ($$$$);
 sub xmpp_send_raw_xml($$);
-sub xmpp_send_message($$$$);
+sub xmpp_send_message($$$$$$);
 sub xmpp_send_chatroom_message($$$$$);
 sub xmpp_logout($);
 sub xmpp_check_result;
@@ -40,7 +44,7 @@ sub terminate();
 sub main();
 
 my # MakeMaker
-$VERSION     = '0.0.8';
+$VERSION       = [ q$Revision: 1.13 $ =~ m/(\S+)\s*$/g ]->[0];
 my $RESOURCE = 'sendxmpp';
 my $VERBOSE  = 0;
 my $DEBUG    = 0;
@@ -68,6 +72,7 @@ sub main () {
                           $$cmdline{'port'}     || $$config{'port'},
                           $$cmdline{'username'} || $$config{'username'},
                           $$cmdline{'password'} || $$config{'password'},
+                          $$cmdline{'component'}|| $$config{'component'},
                           $$cmdline{'resource'},
                           $$cmdline{'tls'},
                           $$cmdline{'debug'})
@@ -89,7 +94,7 @@ sub main () {
            $txt.=$_ while (<STDIN>);
        }
        
-       xmpp_send ($cnx,$cmdline,$txt);
+       xmpp_send ($cnx,$cmdline,$config,$txt);
     
     } else {
        # the interactive case, read stdin line by line
@@ -101,7 +106,7 @@ sub main () {
        # line by line...
        while (<STDIN>) {
            chomp;
-           xmpp_send ($cnx,$cmdline,$_);
+           xmpp_send ($cnx,$cmdline,$config,$_);
        }
     }
 
@@ -122,42 +127,47 @@ sub read_config_file ($) {
     my $cfg_file = shift;
     error_exit ("cannot read $cfg_file: $!") 
        unless (-r $cfg_file);    
-    my $owner  = (stat($cfg_file))[4];
+    my $owner  = (stat _ )[4];
     error_exit ("you must own $cfg_file")
       unless ($owner == $>); 
-    my $mode = (stat($cfg_file))[2] & 07777;
-    error_exit ("$cfg_file must have mode 0600")
-      unless ($mode == 0600);
+    my $mode = (stat _ )[2] & 07777;
+    error_exit ("$cfg_file must not be accessible by others")
+      if ($mode & 0077);
     
     open (CFG,"<$cfg_file")
       or error_exit("cannot open $cfg_file for reading: $!");
 
     my %config;
     my $line = 0;
-    while (<CFG>) {
-       
-       ++$line;
-       
-       next if (/^\s*$/);     # ignore empty lines
-       next if (/^\s*\#.*/);  # ignore comment lines
-       
-       s/\#.*$//; # ignore comments in lines
-       
-       if (/([-\.\w]+)@([-\.\w:]+)\s+(\S+)\s*$/) {
-           %config = ('username' => $1,
-                      'jserver'  => $2, 
-                      'port'     => 0,
-                      'password' => $3);
-
-           if ($config{'jserver'} =~ /(.*):(\d+)/) {
-               $config{'jserver'} = $1;
-               $config{'port'}    = $2;
-           }
-       } else {
-           close CFG;
-           error_exit ("syntax error in line $line of $cfg_file");
+       while (<CFG>) {
+
+               ++$line;
+
+               next if (/^\s*$/);     # ignore empty lines
+               next if (/^\s*\#.*/);  # ignore comment lines
+
+               #s/\#.*$//; # ignore comments in lines
+
+               # Hugo van der Kooij <hvdkooij AT vanderkooij.org> has ccount with '#' as username
+               if (/([\.\w_#-]+)@([-\.\w:]+)\s+(\S+)\s*(\S+)?$/) {
+                       %config = (
+                               'username'      => $1,
+                               'jserver'       => $2, 
+                               'port'          => 0,
+                               'password'      => $3,
+                               'component'     => $4,
+                       );
+
+                       if ($config{'jserver'} =~ /(.*):(\d+)/) {
+                               $config{'jserver'} = $1;
+                               $config{'port'}    = $2;
+                       }
+               }
+               else {
+                       close CFG;
+                       error_exit ("syntax error in line $line of $cfg_file");
+               }
        }
-    }
     
     close CFG;
     
@@ -183,15 +193,17 @@ sub parse_cmdline () {
     
     usage() unless (scalar(@ARGV));
     
-    my ($subject,$file,$resource,$jserver,$port,$username,$password,
-       $message, $chatroom, $debug, $tls, $interactive, $help, $raw, $verbose);
+       my ($subject,$file,$resource,$jserver,$port,$username,$password,$component,
+       $message, $chatroom, $headline, $debug, $tls, $interactive, $help, $raw, $verbose);
     my $res = GetOptions ('subject|s=s'    => \$subject,
                          'file|f=s'       => \$file,
                          'resource|r=s'   => \$resource,
                          'jserver|j=s'    => \$jserver,
+                         'component|o=s'  => \$component,
                          'username|u=s'   => \$username,
                          'password|p=s'   => \$password,
                          'message|m=s'    => \$message,
+                         'headline|l'     => \$headline,
                          'chatroom|c'     => \$chatroom,
                          'tls|t'          => \$tls,
                          'interactive|i'  => \$interactive,
@@ -226,10 +238,12 @@ sub parse_cmdline () {
                'message'       => ($message or ''),
                'resource'    => ($resource or $RESOURCE),
                'jserver'     => ($jserver or ''),
+               'component'   => ($component or ''),
                'port'        => ($port or 0),
                'username'    => ($username or ''),
                'password'    => ($password or ''),
                'chatroom'    => ($chatroom or 0),
+               'headline'    => ($headline or 0),
                'interactive' => ($interactive or 0),
                'tls'         => ($tls or 0),
                'debug'       => ($debug or 0),
@@ -253,25 +267,37 @@ sub parse_cmdline () {
 # input: hostname,port,username,password,resource,tls,debug
 # output: an XMPP connection object
 #
-sub xmpp_login ($$$$$$$) {
+sub xmpp_login ($$$$$$$$) {
 
-    my ($host,$port,$user,$pw,$res,$tls,$debug) = @_;
+    my ($host, $port, $user, $pw, $comp, $res, $tls, $debug) = @_;
     my $cnx = new Net::XMPP::Client(debuglevel=>($debug?2:0));
     error_exit "could not create XMPP client object: $!"
        unless ($cnx);    
 
     my @res;
+       my $arghash = {
+               hostname                => $host,
+               tls                             => $tls,
+               connectiontype  => 'tcpip',
+               componentname   => $comp
+       };
+       $arghash->{port} = $port if (!$port);
        if (!$port) {
-               @res = $cnx->Connect(hostname => $host, tls => $tls);
+               @res = $cnx->Connect(%$arghash);
                error_exit ("Could not connect to server '$host': $@") unless @res;
        } else {
-               @res = $cnx->Connect(hostname => $host, port => $port, tls => $tls);
+               @res = $cnx->Connect(%$arghash);
                error_exit ("Could not connect to '$host' on port $port: $@") unless @res;
        }
 
     xmpp_check_result("Connect",\@res,$cnx);
 
-    @res = $cnx->AuthSend('hostname' => $host,
+       if ($comp) {
+               my $sid = $cnx->{SESSION}->{id};
+               $cnx->{STREAM}->{SIDS}->{$sid}->{hostname} = $comp
+       }
+
+    @res = $cnx->AuthSend(#'hostname' => $host,
                          'username' => $user,
                          'password' => $pw,
                          'resource' => $res);
@@ -287,16 +313,18 @@ sub xmpp_login ($$$$$$$) {
 # xmmp_send: send the message, determine from cmdline
 # whether it's to individual or chatroom
 #
-sub xmpp_send ($$$) {
+sub xmpp_send ($$$$) {
     
-    my ($cnx, $cmdline, $txt) = @_;
+       my ($cnx, $cmdline, $config, $txt) = @_;
     
        unless ($$cmdline{'chatroom'}) {
        unless ($$cmdline{'raw'}) {
                        map {
                                xmpp_send_message ($cnx,
                                        $_, #$$cmdline{'recipient'},
+                                       $$cmdline{'component'} || $$config{'component'},
                                        $$cmdline{'subject'},
+                                       $$cmdline{'headline'},
                                        $txt)
                        } @{$$cmdline{'recipient'}};
        }
@@ -335,14 +363,20 @@ sub xmpp_send_raw_xml ($$) {
 # xmpp_send_message: send a message to some xmpp user
 # input: connection,recipient,subject,msg
 #
-sub xmpp_send_message ($$$$) {
+sub xmpp_send_message ($$$$$$) {
     
-    my ($cnx,$rcpt,$subject,$msg) = @_;
+    my ($cnx,$rcpt,$comp,$subject,$headline,$msg) = @_;
+
+       my $type = 'message';
+       if ($headline) {
+               $type='headline';
+       }
  
     # for some reason, MessageSend does not return anything
-    $cnx->MessageSend('to'      => $rcpt,
-                     'subject' => $subject,
-                     'body'    => $msg);
+    $cnx->MessageSend('to'      => $rcpt . ( $comp ? "\@$comp" : '' ),
+               'type'          => $type,
+               'subject'       => $subject,
+               'body'          => $msg);
     
     xmpp_check_result('MessageSend',0,$cnx);
 }
@@ -366,7 +400,6 @@ sub xmpp_send_chatroom_message ($$$$$) {
     my $groupmsg = new Net::XMPP::Message;
     $groupmsg->SetMessage(to      => $rcpt, 
                          body    => $msg,
-                         subject => $subject,
                          type    => 'groupchat');
 
     $res = $cnx->Send($groupmsg);
@@ -398,24 +431,26 @@ sub xmpp_logout($) {
 # xmpp_check_result: check the return value from some xmpp function execution
 # input: text, result, [connection]                   
 #
-sub xmpp_check_result {
-
-    my ($txt,$res,$cnx)=@_;
+sub xmpp_check_result
+{
+    my ($txt, $res, $cnx)=@_;
     
     error_exit ("Error '$txt': result undefined")
        unless (defined $res);
   
     # res may be 0
-    if ($res == 0) {
-       debug_print "$txt";
-    # result can be true or 'ok' 
-    } elsif ((@$res == 1 && $$res[0]) || $$res[0] eq 'ok') {   
-       debug_print "$txt: " .  $$res[0];
-    # otherwise, there is some error
-    } else {   
-       my $errmsg = $cnx->GetErrorCode() || '?';
-       error_exit ("Error '$txt': " . join (': ',@$res) . "[$errmsg]", $cnx);
-    }
+       if ($res == 0) {
+               debug_print "$txt";
+               # result can be true or 'ok' 
+       }
+       elsif ((@$res == 1 && $$res[0]) || $$res[0] eq 'ok') {  
+               debug_print "$txt: " .  $$res[0];
+               # otherwise, there is some error
+       }
+       else {  
+               my $errmsg = $cnx->GetErrorCode() || '?';
+               error_exit ("Error '$txt': " . join (': ',@$res) . "[$errmsg]", $cnx);
+       }
 }
 
 
@@ -461,7 +496,9 @@ sub error_exit {
 sub usage () {
    
     print STDERR 
-       "sendxmpp version $VERSION, Copyright (c) 2004, 2005 Dirk-Jan C. Binnema\n" .
+       "sendxmpp version $VERSION\n" .
+       "Copyright (c) 2004 - 2005 Dirk-Jan C. Binnema\n" .
+       "Copyright (c) 2006 - 2007 Lubomir Host 'rajo'\n" .
        "usage: sendxmpp [options] <recipient1> [<recipient2> ...]\n" .
        "or refer to the the sendxmpp manpage\n";
     
@@ -508,6 +545,10 @@ Use I<password> instead of the one in the configuration file
 
 Use jabber I<server> instead of the one in the configuration file.
 
+=item B<-o>,B<--component> I<componentname>
+
+Use componentname in connect call. Seems needed for Google talk.
+
 =item B<-r>,B<--resource> I<res>
 
 Use resource I<res> for the sender [default: 'sendxmpp']; when sending to a chatroom, this determines the 'alias'
@@ -516,6 +557,10 @@ Use resource I<res> for the sender [default: 'sendxmpp']; when sending to a chat
 
 Connect securely, using TLS
 
+=item B<-l>,B<--headline>
+
+Send a headline type message (not stored in offline messages)
+
 =item B<-c>,B<--chatroom>
 
 Send the message to a chatroom 
@@ -557,7 +602,7 @@ xmpp-account, with a line of the format:
 
 =over
 
-I<user>@I<server> I<password>
+I<user>@I<server> I<password> I<componentname>
 
 =back
 
@@ -582,7 +627,7 @@ Of course, you may also mix the two:
     alice@myjabberserver.com;foo.com:1234 secret
 
 B<NOTE>: for your security, sendxmpp demands that the configuration
-file is owned by you and has file permissions 600.
+file is owned by you and readable only to you (permissions 600).
 
 =head1 EXAMPLE