#!/usr/bin/perl
+
package C4::SIP::SIPServer;
use strict;
require UNIVERSAL::require;
use C4::Context;
-use C4::SIP::Sip qw(syslog);
+use C4::SIP::Sip qw(siplog);
use C4::SIP::Sip::Constants qw(:all);
use C4::SIP::Sip::Configuration;
use C4::SIP::Sip::Checksum qw(checksum verify_cksum);
use C4::SIP::Sip::MsgType qw( handle login_core );
+use C4::SIP::Logger qw(set_logger);
+use Koha::Caches;
use Koha::Logger;
+
use C4::SIP::Trapper;
tie *STDERR, "C4::SIP::Trapper";
use constant LOG_SIP => "local6"; # Local alias for the logging facility
+
+set_logger( Koha::Logger->get( { interface => 'sip' } ) );
+
#
-# Main # not really, since package SIPServer
+# Main # not really, since package SIPServer
#
# FIXME: Is this a module or a script?
# A script with no MAIN namespace?
#
if (defined($config->{'server-params'})) {
while (my ($key, $val) = each %{$config->{'server-params'}}) {
- push @parms, $key . '=' . $val;
+ push @parms, $key . '=' . $val;
}
}
# Child
#
-my $activeSIPServer;
-my $activeLogger;
-
# process_request is the callback used by Net::Server to handle
# an incoming connection request.
$self->{config} = $config;
+ # Flushing L1 to make sure the request will be processed using the correct data
+ Koha::Caches->flush_L1_caches();
+
$self->{account} = undef; # Clear out the account from the last request, it may be different
- $self->{logger} = _set_logger( Koha::Logger->get( { interface => 'sip' } ) );
+ $self->{logger} = set_logger( Koha::Logger->get( { interface => 'sip' } ) );
# Flush previous MDCs to prevent accidentally leaking incorrect MDC-entries
- Log::Log4perl::MDC->put( "accountid", undef );
- Log::Log4perl::MDC->put( "peeraddr", undef );
+ Koha::Logger->clear_mdc();
my $sockname = getsockname(STDIN);
$self->{service} = $config->find_service($sockaddr, $port, $proto);
if (!defined($self->{service})) {
- syslog("LOG_ERR", "process_request: Unknown recognized server connection: %s:%s/%s", $sockaddr, $port, $proto);
- die "process_request: Bad server connection";
+ siplog("LOG_ERR", "process_request: Unknown recognized server connection: %s:%s/%s", $sockaddr, $port, $proto);
+ die "process_request: Bad server connection";
}
$transport = $transports{$self->{service}->{transport}};
if (!defined($transport)) {
- syslog("LOG_WARNING", "Unknown transport '%s', dropping", $service->{transport});
- return;
+ siplog("LOG_WARNING", "Unknown transport '%s', dropping", $service->{transport});
+ return;
} else {
- &$transport($self);
+ &$transport($self);
}
return;
}
# In practice it should only iterate once but be prepared
local $SIG{ALRM} = sub { die 'raw transport Timed Out!' };
my $timeout = $self->get_timeout({ transport => 1 });
- syslog('LOG_DEBUG', "raw_transport: timeout is $timeout");
+ siplog('LOG_DEBUG', "raw_transport: timeout is $timeout");
alarm $timeout;
while (!$self->{account}) {
$input = read_request();
if (!$input) {
# EOF on the socket
- syslog("LOG_INFO", "raw_transport: shutting down: EOF during login");
+ siplog("LOG_INFO", "raw_transport: shutting down: EOF during login");
return;
}
$input =~ s/[\r\n]+$//sm; # Strip off trailing line terminator(s)
}
alarm 0;
- $self->{logger} = _set_logger(
+ $self->{logger} = set_logger(
Koha::Logger->get(
{
interface => 'sip',
);
# Set MDCs after properly authenticating
- Log::Log4perl::MDC->put( "accountid", $self->{account}->{id} );
- Log::Log4perl::MDC->put( "peeraddr", $self->{server}->{peeraddr} );
+ Koha::Logger->put_mdc( "accountid", $self->{account}->{id} );
+ Koha::Logger->put_mdc( "peeraddr", $self->{server}->{peeraddr} );
- syslog("LOG_DEBUG", "raw_transport: uname/inst: '%s/%s'",
+ siplog("LOG_DEBUG", "raw_transport: uname/inst: '%s/%s'",
$self->{account}->{id},
$self->{account}->{institution});
if (! $self->{account}->{id}) {
- syslog("LOG_ERR","Login failed shutting down");
+ siplog("LOG_ERR","Login failed shutting down");
return;
}
$self->sip_protocol_loop();
- syslog("LOG_INFO", "raw_transport: shutting down");
+ siplog("LOG_INFO", "raw_transport: shutting down");
return;
}
sub get_clean_string {
- my $string = shift;
- if (defined $string) {
- syslog("LOG_DEBUG", "get_clean_string pre-clean(length %s): %s", length($string), $string);
- chomp($string);
- $string =~ s/^[^A-z0-9]+//;
- $string =~ s/[^A-z0-9]+$//;
- syslog("LOG_DEBUG", "get_clean_string post-clean(length %s): %s", length($string), $string);
- } else {
- syslog("LOG_INFO", "get_clean_string called on undefined");
- }
- return $string;
+ my $string = shift;
+ if (defined $string) {
+ siplog("LOG_DEBUG", "get_clean_string pre-clean(length %s): %s", length($string), $string);
+ chomp($string);
+ $string =~ s/^[^A-z0-9]+//;
+ $string =~ s/[^A-z0-9]+$//;
+ siplog("LOG_DEBUG", "get_clean_string post-clean(length %s): %s", length($string), $string);
+ } else {
+ siplog("LOG_INFO", "get_clean_string called on undefined");
+ }
+ return $string;
}
sub get_clean_input {
- local $/ = "\012";
- my $in = <STDIN>;
- $in = get_clean_string($in);
- while (my $extra = <STDIN>){
- syslog("LOG_ERR", "get_clean_input got extra lines: %s", $extra);
- }
- return $in;
+ local $/ = "\012";
+ my $in = <STDIN>;
+ $in = get_clean_string($in);
+ while (my $extra = <STDIN>){
+ siplog("LOG_ERR", "get_clean_input got extra lines: %s", $extra);
+ }
+ return $in;
}
sub telnet_transport {
my $input;
my $config = $self->{config};
my $timeout = $self->get_timeout({ transport => 1 });
- syslog("LOG_DEBUG", "telnet_transport: timeout is $timeout");
+ siplog("LOG_DEBUG", "telnet_transport: timeout is $timeout");
eval {
- local $SIG{ALRM} = sub { die "telnet_transport: Timed Out ($timeout seconds)!\n"; };
- local $| = 1; # Unbuffered output
- $/ = "\015"; # Internet Record Separator (lax version)
+ local $SIG{ALRM} = sub { die "telnet_transport: Timed Out ($timeout seconds)!\n"; };
+ local $| = 1; # Unbuffered output
+ $/ = "\015"; # Internet Record Separator (lax version)
# Until the terminal has logged in, we don't trust it
# so use a timeout to protect ourselves from hanging.
- while ($strikes--) {
- print "login: ";
- alarm $timeout;
- # $uid = &get_clean_input;
- $uid = <STDIN>;
- print "password: ";
- # $pwd = &get_clean_input || '';
- $pwd = <STDIN>;
- alarm 0;
-
- syslog("LOG_DEBUG", "telnet_transport 1: uid length %s, pwd length %s", length($uid), length($pwd));
- $uid = get_clean_string ($uid);
- $pwd = get_clean_string ($pwd);
- syslog("LOG_DEBUG", "telnet_transport 2: uid length %s, pwd length %s", length($uid), length($pwd));
-
- if (exists ($config->{accounts}->{$uid})
- && ($pwd eq $config->{accounts}->{$uid}->{password})) {
- $account = $config->{accounts}->{$uid};
- if ( C4::SIP::Sip::MsgType::login_core($self,$uid,$pwd) ) {
+ while ($strikes--) {
+ print "login: ";
+ alarm $timeout;
+ # $uid = &get_clean_input;
+ $uid = <STDIN>;
+ print "password: ";
+ # $pwd = &get_clean_input || '';
+ $pwd = <STDIN>;
+ alarm 0;
+
+ siplog("LOG_DEBUG", "telnet_transport 1: uid length %s, pwd length %s", length($uid), length($pwd));
+ $uid = get_clean_string ($uid);
+ $pwd = get_clean_string ($pwd);
+ siplog("LOG_DEBUG", "telnet_transport 2: uid length %s, pwd length %s", length($uid), length($pwd));
+
+ if (exists ($config->{accounts}->{$uid})
+ && ($pwd eq $config->{accounts}->{$uid}->{password})) {
+ $account = $config->{accounts}->{$uid};
+ if ( C4::SIP::Sip::MsgType::login_core($self,$uid,$pwd) ) {
last;
}
- }
- syslog("LOG_WARNING", "Invalid login attempt: '%s'", ($uid||''));
- print("Invalid login$CRLF");
- }
+ }
+ siplog("LOG_WARNING", "Invalid login attempt: '%s'", ($uid||''));
+ print("Invalid login$CRLF");
+ }
}; # End of eval
if ($@) {
- syslog("LOG_ERR", "telnet_transport: Login timed out");
- die "Telnet Login Timed out";
+ siplog("LOG_ERR", "telnet_transport: Login timed out");
+ die "Telnet Login Timed out";
} elsif (!defined($account)) {
- syslog("LOG_ERR", "telnet_transport: Login Failed");
- die "Login Failure";
+ siplog("LOG_ERR", "telnet_transport: Login Failed");
+ die "Login Failure";
} else {
- print "Login OK. Initiating SIP$CRLF";
+ print "Login OK. Initiating SIP$CRLF";
}
$self->{account} = $account;
- syslog("LOG_DEBUG", "telnet_transport: uname/inst: '%s/%s'", $account->{id}, $account->{institution});
+ siplog("LOG_DEBUG", "telnet_transport: uname/inst: '%s/%s'", $account->{id}, $account->{institution});
$self->sip_protocol_loop();
- syslog("LOG_INFO", "telnet_transport: shutting down");
+ siplog("LOG_INFO", "telnet_transport: shutting down");
return;
}
# In short, we'll take any valid message here.
eval {
local $SIG{ALRM} = sub {
- syslog( 'LOG_DEBUG', 'Inactive: timed out' );
+ siplog( 'LOG_DEBUG', 'Inactive: timed out' );
die "Timed Out!\n";
};
my $previous_alarm = alarm($timeout);
alarm($timeout);
unless ($inputbuf) {
- syslog( "LOG_ERR", "sip_protocol_loop: empty input skipped" );
+ siplog( "LOG_ERR", "sip_protocol_loop: empty input skipped" );
print("96$CR");
next;
}
my $status = C4::SIP::Sip::MsgType::handle( $inputbuf, $self, q{} );
if ( !$status ) {
- syslog(
+ siplog(
"LOG_ERR",
"sip_protocol_loop: failed to handle %s",
substr( $inputbuf, 0, 2 )
my $raw_length;
local $/ = "\015";
+ # SIP connections might be active for weeks, clear L1 cache on every request
+ Koha::Caches->flush_L1_caches();
+
# proper SPEC: (octal) \015 = (hex) x0D = (dec) 13 = (ascii) carriage return
my $buffer = <STDIN>;
if ( defined $buffer ) {
# treat as one line to include the extra linebreaks we are trying to remove!
}
else {
- syslog( 'LOG_DEBUG', 'EOF returned on read' );
+ siplog( 'LOG_DEBUG', 'EOF returned on read' );
return;
}
my $len = length $buffer;
if ( $len != $raw_length ) {
my $trim = $raw_length - $len;
- syslog( 'LOG_DEBUG', "read_request trimmed $trim character(s) " );
+ siplog( 'LOG_DEBUG', "read_request trimmed $trim character(s) " );
}
- syslog( 'LOG_INFO', "INPUT MSG: '$buffer'" );
+ siplog( 'LOG_INFO', "INPUT MSG: '$buffer'" );
return $buffer;
}
my $policy = $server->{policy} // {};
my $rv = sprintf( "%03d", $policy->{timeout} // 0 );
if( length($rv) != 3 ) {
- syslog( "LOG_ERR", "Policy timeout has wrong size: '%s'", $rv );
+ siplog( "LOG_ERR", "Policy timeout has wrong size: '%s'", $rv );
return '000';
}
return $rv;
}
}
-=head2 get_SIPServer
-
- my $sipServer = C4::SIP::SIPServer::get_SIPServer()
-
-@RETURNS C4::SIP::SIPServer, the current server's child-process used to handle this SIP-transaction
-
-=cut
-
-sub get_SIPServer {
- unless($activeSIPServer) {
- my @cc = caller(1);
- die "$cc[3]() asks for \$activeSIPServer, but he is not defined yet";
- }
- return $activeSIPServer;
-}
-
-sub _set_SIPServer {
- my ($sipServer) = @_;
- unless (blessed($sipServer) && $sipServer->isa('C4::SIP::SIPServer')) {
- my @cc = caller(0);
- die "$cc[3]():> \$sipServer '$sipServer' is not a C4::SIP::SIPServer-object";
- }
- $activeSIPServer = $sipServer;
- return $activeSIPServer;
-}
-
-=head2 get_logger
-
- my $logger = C4::SIP::SIPServer::get_logger()
-
-@RETURNS Koha::Logger, the logger used to log this SIP-transaction
-
-=cut
-
-sub get_logger {
- unless($activeLogger) {
- my @cc = caller(1);
- die "$cc[3]() asks for \$activeLogger, but he is not defined yet";
- }
- return $activeLogger;
-}
-
-sub _set_logger {
- my ($logger) = @_;
- unless (blessed($logger) && $logger->isa('Koha::Logger')) {
- my @cc = caller(0);
- die "$cc[3]():> \$logger '$logger' is not a Koha::Logger-object";
- }
- $activeLogger = $logger;
- return $activeLogger;
-}
-
1;
__END__
projects / koha-ffzg.git / blobdiff