From 3bb82e8e2df8cd341c3da4935473c0d7dd862d2c Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Fri, 11 Aug 2017 19:35:31 -0300 Subject: [PATCH] Import Upstream version 1.24 --- Changes | 9 +- META.yml | 2 +- Makefile.PL | 2 +- README | 6 +- sendxmpp | 352 +++++++++++++++++++++++++++++----------------------- 5 files changed, 205 insertions(+), 166 deletions(-) diff --git a/Changes b/Changes index ccd9c72..504d9ee 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ +2014-09-13: + - released version 1.24 + - new config format supported - key: value 2012-10-28: - - release version 1.23 + - released version 1.23 - added options --no-tls-verify and --tls-ca-path, thanks to Alexander Weidinger 2012-10-20: @@ -32,12 +35,12 @@ 2006-10-04: - Fixed sending of UTF-8 messages: patch from Denis Shaposhnikov [2006-03-31] - Print error message on connect error. Patch from Jean-Baptiste Quenot [2006-07-17] - - Added multiple recipient patch by Lubomir Host 'rajo' [2006-08-30] + - Added multiple recipient patch by Lubomir Host [2006-08-30] - Fixed bug with -message parameter. Thanks to Thomas Warnick [2005-09-06] - Homepage URL changed to http://sendxmpp.platon.sk 2006-09-25: maintainer change - - New maintainer is Lubomir Host 'rajo' , jabber: + - New maintainer is Lubomir Host 2005-05-07: version 0.0.8 released. - add options to specify non-default ports diff --git a/META.yml b/META.yml index 35c0dba..83d4c45 100644 --- a/META.yml +++ b/META.yml @@ -1,5 +1,5 @@ name: sendxmpp -version: 1.23 +version: 1.24 version_from: sendxmpp installdirs: site requires: diff --git a/Makefile.PL b/Makefile.PL index 4b19bc2..89618ae 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -9,7 +9,7 @@ $ENV{'PREFIX'}='/usr/local/' unless ($ENV{'PREFIX'}); WriteMakefile (NAME => 'sendxmpp', - AUTHOR => 'Lubomir Host \'rajo\' ', + AUTHOR => 'Lubomir Host ', ABSTRACT => 'Script for sending xmpp messages', PREREQ_PM => {'Getopt::Long'=>2.00, 'Net::XMPP'=>1.0}, diff --git a/README b/README index 6db4c75..403d73a 100644 --- a/README +++ b/README @@ -8,8 +8,7 @@ for instant messaging. See www.jabber.org for more information. sendxmpp was written by me, Dirk-Jan C. Binnema, and is available under the term of the GNU General Public License v2. The hard work is done by Ryan Eatmon's Net::XMPP-modules, and you need have them installed for -sendxmpp to work. Current maintainer is Lubomir Host 'rajo' +sendxmpp to work. Current maintainer is Lubomir Host Obviously, you also need a jabber account; they are freely available at jabber.org, but you can also install your own servers. @@ -23,6 +22,5 @@ I am interested in hearing about other uses. Homepage: http://sendxmpp.hostname.sk -Lubomir Host 'rajo' -Jabber: (IM) +Lubomir Host diff --git a/sendxmpp b/sendxmpp index 8348398..91ae1ef 100755 --- a/sendxmpp +++ b/sendxmpp @@ -8,9 +8,9 @@ if 0; # not running under some shell # somewhat resembling mail(1) # # Author: Dirk-Jan C. Binnema -# Maintainer: Lubomir Host 'rajo' +# Maintainer: Lubomir Host # Copyright (c) 2004 - 2005 Dirk-Jan C. Binnema -# Copyright (c) 2006 - 2012 Lubomir Host 'rajo' +# Copyright (c) 2006 - 2014 Lubomir Host # # Homepage: http://sendxmpp.hostname.sk # @@ -19,14 +19,16 @@ if 0; # not running under some shell use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed use Net::XMPP; +use Net::Domain; use Getopt::Long; + use strict; use open ':utf8'; use open ':std'; # subroutines decls -sub xmpp_login($$$$$$$$$$$); +sub xmpp_login($$$$$$$$$$$$); sub xmpp_send ($$$$); sub xmpp_send_raw_xml($$); sub xmpp_send_message($$$$$$); @@ -42,7 +44,7 @@ sub terminate(); sub main(); my # MakeMaker -$VERSION = [ q$Revision: 1.23 $ =~ m/(\S+)\s*$/g ]->[0]; +$VERSION = 1.24; my $RESOURCE = 'sendxmpp'; my $VERBOSE = 0; my $DEBUG = 0; @@ -56,7 +58,7 @@ my $message_type = 'chat'; # default message type # # main: main routine # -sub main () { +sub main () { # {{{ my $cmdline = parse_cmdline(); @@ -66,67 +68,67 @@ sub main () { $VERBOSE = 1 if ($$cmdline{'verbose'}); my $config = read_config_file ($$cmdline{'file'}) - unless ($$cmdline{'jserver'} && $$cmdline{'username'} && $$cmdline{'password'}); + unless ($$cmdline{'sso'} || ($$cmdline{'username'} && $$cmdline{'password'})); # login to xmpp - my $cnx = xmpp_login ($$cmdline{'jserver'} || $$config{'jserver'}, - $$cmdline{'port'} || $$config{'port'} || ($$cmdline{'ssl'} ? 5223 : 5222), - $$cmdline{'username'} || $$config{'username'}, - $$cmdline{'password'} || $$config{'password'}, - $$cmdline{'component'}|| $$config{'component'}, - $$cmdline{'resource'}, - $$cmdline{'tls'} || $$config{'tls'}, - $$cmdline{'no-tls-verify'} || $$config{'no-tls-verify'}, - $$cmdline{'tls-ca-path'} || $$config{'tls-ca-path'} || '', - $$cmdline{'ssl'}, - $$cmdline{'debug'}) - or error_exit("cannot login: $!"); - - - # read message from STDIN or or from -m/--message parameter + my $cnx = xmpp_login ( + $$cmdline{'jserver'} || $$config{'jserver'}, + $$cmdline{'port'} || $$config{'port'} || ($$cmdline{'ssl'} ? 5223 : 5222), + $$cmdline{'username'} || $$config{'username'}, + $$cmdline{'password'} || $$config{'password'}, + $$cmdline{'component'}|| $$config{'component'}, + $$cmdline{'resource'}, + $$cmdline{'tls'} || $$config{'tls'} || 0, + $$cmdline{'no-tls-verify'} || $$config{'no-tls-verify'}, + $$cmdline{'tls-ca-path'} || $$config{'tls-ca-path'} || '', + $$cmdline{'ssl'}, + $$cmdline{'debug'}, + $$cmdline{'sso'} + ) or error_exit("cannot login: $!"); + + + # read message from STDIN or from -m/--message parameter if (!$$cmdline{interactive}) { + # the non-interactive case + my $txt; + my $message = $$cmdline{'message'}; + if ($message) { + open (MSG, "<$message") + or error_exit ("cannot open message file '$message': $!"); + while () { $txt .= $_ }; + close(MSG); + } + else { + $txt .= $_ while (); + } - # the non-interactive case - my $txt; - my $message = $$cmdline{'message'}; - if ($message) { - open (MSG, "<$message") - or error_exit ("cannot open message file '$message': $!"); - while () { $txt .= $_ }; - close(MSG); - } - else { - $txt .= $_ while (); - } - - xmpp_send ($cnx,$cmdline,$config,$txt); - - } else { - # the interactive case, read stdin line by line - - # deal with TERM - $main::CNX = $cnx; - $SIG{INT}=\&terminate; + xmpp_send ($cnx,$cmdline,$config,$txt); - # line by line... - while () { - chomp; - xmpp_send ($cnx,$cmdline,$config,$_); - } } + else { + # the interactive case, read stdin line by line - xmpp_logout($cnx); - exit 0; -} + # deal with TERM + $main::CNX = $cnx; + $SIG{INT}=\&terminate; + # line by line... + while () { + chomp; + xmpp_send ($cnx,$cmdline,$config,$_); + } + } + xmpp_logout($cnx); + exit 0; +} # }}} # # read_config_file: read the configuration file # input: filename # output: hash with 'user', 'jserver' and 'password' keys # -sub read_config_file ($) { +sub read_config_file ($) { # {{{ # check permissions my $cfg_file = shift; @@ -153,8 +155,11 @@ sub read_config_file ($) { #s/\#.*$//; # ignore comments in lines + if (/^([a-z]+):\s*(.*)$/) { + $config{$1} = $2; + } # Hugo van der Kooij has account with '#' as username - if (/([\.\w_#-]+)@([-\.\w:;]+)\s+(\S+)\s*(\S+)?$/) { + elsif (/([\.\w_#-]+)@([-\.\w:;]+)\s+(\S+)\s*(\S+)?$/) { %config = ( 'username' => $1, 'jserver' => $2, @@ -170,13 +175,13 @@ sub read_config_file ($) { } # account with weird port number - if ($config{'jserver'} =~ /(.*):(\d+)/) { + if (defined($config{'jserver'}) and $config{'jserver'} =~ /(.*):(\d+)/) { $config{'jserver'} = $1; $config{'port'} = $2; } # account with specific connection host - if ($config{'jserver'} =~ /(.*);([-\.\w]+)/) { + if (defined($config{'jserver'}) and $config{'jserver'} =~ /(.*);([-\.\w]+)/) { $config{'jserver'} = $2; $config{'username'} .= "\@$1" unless $config{'component'}; } @@ -187,50 +192,54 @@ sub read_config_file ($) { error_exit ("no correct config found in $cfg_file") unless (scalar(%config)); - if ($DEBUG || $VERBOSE) { - while (my ($key,$val) = each %config) { - debug_print ("config: '$key' => '$val'"); - } - } + if ($DEBUG || $VERBOSE) { + while (my ($key,$val) = each %config) { + debug_print ("config: '$key' => '$val'"); + } + } return \%config; -} - - +} # }}} # # parse_cmdline: parse commandline options # output: hash with commandline options # -sub parse_cmdline () { +sub parse_cmdline () { # {{{ usage() unless (scalar(@ARGV)); - my ($subject,$file,$resource,$jserver,$port,$username,$password,$component, - $message, $chatroom, $headline, $debug, $tls, $ssl, - $no_tls_verify, $tls_ca_path, - $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, - 'message-type=s' => \$message_type, - 'chatroom|c' => \$chatroom, - 'tls|t' => \$tls, - 'no-tls-verify|n' => \$no_tls_verify, - 'tls-ca-path|a=s' => \$tls_ca_path, - 'ssl|e' => \$ssl, - 'interactive|i' => \$interactive, - 'help|usage|h' => \$help, - 'debug|d' => \$debug, - 'raw|w' => \$raw, - 'verbose|v' => \$verbose); - usage () if ($help); + my ($subject, $file, $resource, $jserver, $port, $username, $password, $sso, $component, + $message, $chatroom, $headline, $debug, $tls, $ssl, + $no_tls_verify, $tls_ca_path, + $interactive, $help, $raw, $verbose + ); + $debug = 0; + 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, + 'sso' => \$sso, + 'message|m=s' => \$message, + 'headline|l' => \$headline, + 'message-type=s' => \$message_type, + 'chatroom|c' => \$chatroom, + 'tls|t' => \$tls, + 'no-tls-verify|n' => \$no_tls_verify, + 'tls-ca-path|a=s' => \$tls_ca_path, + 'ssl|e' => \$ssl, + 'interactive|i' => \$interactive, + 'help|usage|h' => \$help, + 'debug|d:i' => sub { $debug = $_[1] ? $_[1] : $debug + 1 }, + 'raw|w' => \$raw, + 'verbose|v' => \$verbose + ); + + usage () if ($help); my @rcpt = @ARGV; @@ -256,9 +265,13 @@ sub parse_cmdline () { error_exit("Connect securely wether using -e (--ssl) or -t (--tls)"); } + if ($sso && $username) { + error_exit("When using --sso, user should not be specified"); + } + if ($headline) { # --headline withouth --message-type - if ($message_type eq 'message') { + if ($message_type eq 'message' or $message_type eq 'chat') { $message_type = 'headline' } else { @@ -271,26 +284,29 @@ sub parse_cmdline () { $port = $2; } - my %dict = ('subject' => ($subject or ''), - '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), - 'message-type' => $message_type, - 'interactive' => ($interactive or 0), - 'tls' => ($tls or 0), - 'no-tls-verify' => ($no_tls_verify or 0), - 'tls-ca-path' => ($tls_ca_path or ''), - 'ssl' => ($ssl or 0), - 'debug' => ($debug or 0), - 'verbose' => ($verbose or 0), - 'raw' => ($raw or 0), - 'file' => ($file or ($ENV{'HOME'}.'/.sendxmpprc')), - 'recipient' => \@rcpt); + my %dict = ( + 'subject' => ($subject or ''), + 'message' => ($message or ''), + 'resource' => ($resource or $RESOURCE), + 'jserver' => ($jserver or ''), + 'component' => ($component or ''), + 'port' => ($port or 0), + 'username' => ($username or ''), + 'password' => ($password or ''), + 'sso' => ($sso or 0), + 'chatroom' => ($chatroom or 0), + 'message-type' => $message_type, + 'interactive' => ($interactive or 0), + 'tls' => ($tls or 0), + 'no-tls-verify' => ($no_tls_verify or 0), + 'tls-ca-path' => ($tls_ca_path or ''), + 'ssl' => ($ssl or 0), + 'debug' => ($debug or 0), + 'verbose' => ($verbose or 0), + 'raw' => ($raw or 0), + 'file' => ($file or ($ENV{'HOME'}.'/.sendxmpprc')), + 'recipient' => \@rcpt + ); if ($DEBUG || $VERBOSE) { while (my ($key,$val) = each %dict) { @@ -299,18 +315,17 @@ sub parse_cmdline () { } return \%dict; -} - +} # }}} # # xmpp_login: login to the xmpp (jabber) server # input: hostname,port,username,password,resource,tls,ssl,debug # output: an XMPP connection object # -sub xmpp_login ($$$$$$$$$$$) { +sub xmpp_login ($$$$$$$$$$$$) { # {{{ - my ($host, $port, $user, $pw, $comp, $res, $tls, $no_tls_verify, $tls_ca_path, $ssl, $debug) = @_; - my $cnx = new Net::XMPP::Client(debuglevel=>($debug?2:0)); + my ($host, $port, $user, $pw, $comp, $res, $tls, $no_tls_verify, $tls_ca_path, $ssl, $debug, $sso) = @_; + my $cnx = new Net::XMPP::Client(debuglevel=>$debug); error_exit "could not create XMPP client object: $!" unless ($cnx); @@ -332,13 +347,31 @@ sub xmpp_login ($$$$$$$$$$$) { componentname => $comp }; + if ($sso) { + $user = join('@', scalar getpwuid($<), Net::Domain::hostdomain()); + debug_print "using SSO user $user"; + } + + # use the xmpp domain as the host and enable SRV lookups + if (!$host) { + if ($user =~ /@(.*)/) { + $arghash->{hostname} = $host = $1; + $arghash->{srv} = 1; + debug_print "enabling SRV lookups"; + + } else { + error_exit "unable to determine a host to connect to (no cmdline, no config, no SRV possible)"; + } + + } + delete $arghash->{port} unless $port; if ($arghash->{port}) { @res = $cnx->Connect(%$arghash); - error_exit ("Could not connect to '$host' on port $port: $@") unless @res; + error_exit ("Could not connect to '$host' on port $port: ".($cnx->GetErrorCode()||$@)) unless @res; } else { @res = $cnx->Connect(%$arghash); - error_exit ("Could not connect to server '$host': $@") unless @res; + error_exit ("Could not connect to server '$host': ".($cnx->GetErrorCode()||$@)) unless @res; } xmpp_check_result("Connect",\@res,$cnx); @@ -355,16 +388,13 @@ sub xmpp_login ($$$$$$$$$$$) { xmpp_check_result('AuthSend',\@res,$cnx); return $cnx; -} - - - +} # }}} # # xmmp_send: send the message, determine from cmdline # whether it's to individual or chatroom # -sub xmpp_send ($$$$) { +sub xmpp_send ($$$$) { # {{{ my ($cnx, $cmdline, $config, $txt) = @_; @@ -392,29 +422,26 @@ sub xmpp_send ($$$$) { $txt) } @{$$cmdline{'recipient'}}; } -} - - +} # }}} # # xmpp_send_raw_xml: send a raw XML packet # input: connection,packet # -sub xmpp_send_raw_xml ($$) { +sub xmpp_send_raw_xml ($$) { # {{{ my ($cnx,$packet) = @_; # for some reason, Send does not return anything $cnx->Send($packet); xmpp_check_result('Send',0,$cnx); -} - +} # }}} # # 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, $comp, $subject, $message_type, $msg) = @_; @@ -426,14 +453,13 @@ sub xmpp_send_message ($$$$$$) { 'body' => $msg); xmpp_check_result('MessageSend',0,$cnx); -} - +} # }}} # # xmpp_send_chatroom_message: send a message to a chatroom # input: connection,resource,subject,recipient,message # -sub xmpp_send_chatroom_message ($$$$$) { +sub xmpp_send_chatroom_message ($$$$$) { # {{{ my ($cnx,$resource,$subject,$rcpt,$msg) = @_; @@ -454,14 +480,13 @@ sub xmpp_send_chatroom_message ($$$$$) { # leave the group $pres->SetPresence (Type=>'unavailable',To=>$rcpt); -} - +} # }}} # # xmpp_logout: log out from the xmpp server # input: connection # -sub xmpp_logout($) { +sub xmpp_logout($) { # {{{ # HACK # messages may not be received if we log out too quickly... @@ -470,16 +495,13 @@ sub xmpp_logout($) { my $cnx = shift; $cnx->Disconnect(); xmpp_check_result ('Disconnect',0); # well, nothing to check, really -} - - +} # }}} # # xmpp_check_result: check the return value from some xmpp function execution # input: text, result, [connection] # -sub xmpp_check_result -{ +sub xmpp_check_result { # {{{ my ($txt, $res, $cnx)=@_; error_exit ("Error '$txt': result undefined") @@ -498,35 +520,32 @@ sub xmpp_check_result my $errmsg = $cnx->GetErrorCode() || '?'; error_exit ("Error '$txt': " . join (': ',@$res) . "[$errmsg]", $cnx); } -} - +} # }}} # # terminate; exit the program upon TERM sig reception # -sub terminate () { +sub terminate () { # {{{ debug_print "caught TERM"; xmpp_logout($main::CNX); exit 0; -} - +} # }}} # # debug_print: print the data if defined and DEBUG || VERBOSE is TRUE # input: [array of strings] # -sub debug_print { +sub debug_print { # {{{ print STDERR "sendxmpp: " . (join ' ', @_) . "\n" if (@_ && ($DEBUG ||$VERBOSE)); -} - +} # }}} # # error_exit: print error message and exit the program # logs out if there is a connection # input: error, [connection] # -sub error_exit { +sub error_exit { # {{{ my ($err,$cnx) = @_; print STDERR "$err\n"; @@ -534,24 +553,22 @@ sub error_exit { if ($cnx); exit 1; -} - +} # }}} # # usage: print short usage message and exit # -sub usage () { +sub usage () { # {{{ print STDERR "sendxmpp version $VERSION\n" . "Copyright (c) 2004 - 2005 Dirk-Jan C. Binnema\n" . - "Copyright (c) 2006 - 2007 Lubomir Host 'rajo'\n" . + "Copyright (c) 2006 - 2014 Lubomir Host\n" . "usage: sendxmpp [options] [ ...]\n" . "or refer to the the sendxmpp manpage\n"; exit 0; -} - +} # }}} # # the fine manual @@ -589,6 +606,10 @@ Use I instead of the one in the configuration file Use I instead of the one in the configuration file +=item B<--sso> + +Instead of specifying username or password, attempt to use system level SSO (e.g. kerberos) if supported. + =item B<-j>,B<--jserver> I Use jabber I instead of the one in the configuration file. @@ -655,14 +676,30 @@ Show a 'Usage' message =item B<-d>,B<--debug> -Show debugging info while running. B: This will include passwords etc. so be careful with the output! +Show debugging info while running. B: This will include passwords etc. so be careful with the output! Specify multiple times to increase debug level. =back =head1 CONFIGURATION FILE You may define a 'F<~/.sendxmpprc>' file with the necessary data for your -xmpp-account, with a line of the format: +xmpp-account. Since version 1.24 the following format is supported: + + username: I + jserver: I + port: I + password: I + component: I + + +Example for Google Talk servers: + + username: I + jserver: I + password: I + component: I + +With version 1.23 and older only one-line format is supported: =over @@ -719,6 +756,7 @@ The sendxmpp homepage: L sendxmpp has been written by Dirk-Jan C. Binnema , and uses the L modules written by Ryan Eatmon. Current maintainer is -Lubomir Host 'rajo' , L +Lubomir Host , L =cut +# vim: fdm=marker fdl=0 fdc=3 -- 2.20.1