From: Vsevolod Stakhov Date: Tue, 5 Feb 2013 08:06:54 +0000 (+0400) Subject: Polish debian copyright, remove unused CGI. X-Git-Tag: 0.5.4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c36423d829c1f04fb40a73fdf7dccbbfcb920710;p=thirdparty%2Frspamd.git Polish debian copyright, remove unused CGI. Update ChangeLog. --- diff --git a/ChangeLog b/ChangeLog index 48f9eae0a2..f036586ff8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +0.5.4: + * Fixed issues with diff algorithm + * Added support of RRD statistics + * Add webui worker for interface interaction + * Fix a lot of issues with dynamic conf + * Fix critical memory leak in settings code + * Improve stability of the system + 0.5.3: * Added dynamic options * Added advanced metaclassfication diff --git a/cgi/rspamd.cgi b/cgi/rspamd.cgi deleted file mode 100644 index b0496691a8..0000000000 --- a/cgi/rspamd.cgi +++ /dev/null @@ -1,486 +0,0 @@ -#!/usr/bin/perl -w - -use strict; -use warnings; - -{ - -package RspamdWebInterface; - -use strict; -use Mail::Rspamd::Client; -use CGI qw/:standard -debug/; -use IO::Socket::INET; -use IO::String; -use Data::Dumper; - -my %cfg = ( - 'hosts' => ['localhost:11333'], - 'timeout' => 1, - 'password' => '', - 'statfiles' => ['WINNOW_HAM', 'WINNOW_SPAM'], -); - -sub new { - my ($class, $args) = @_; - - $class = ref($class) || $class; - - my $self = { - addr => 'localhost', - port => 8080, - standalone => 0, - }; - - if ($args->{'standalone'}) { - $self->{'standalone'} = 1; - } - if ($args->{'port'}) { - $self->{'port'} = $args->{'port'}; - } - if ($args->{'addr'}) { - $self->{'addr'} = $args->{'addr'}; - } - if ($args->{'config'}) { - open CFG, "< $args->{'config'}"; - my $cf; - $cfg{'hosts'} = []; - while () { - chomp; - push (@{$cfg{'hosts'}}, $_); - } - close CFG; - } - - bless($self, $class); - - $self; -} - -sub _handle_ping { - my $self = shift; - my (@servers_alive, @servers_dead); - - my $rspamd = Mail::Rspamd::Client->new({timeout=>$cfg{timeout}}); - my $number = 0; - - # Walk throught selection of servers - foreach (@{ $cfg{'hosts'} }) { - if ($rspamd->ping($_)) { - push(@servers_alive, $_); - } - else { - push(@servers_dead, $_); - } - $number ++; - } - - print header; - print qq!"; - -} - -sub _show_html { - my $self = shift; - - print header, - start_html(-title=>'Rspamd control', -script=>[{-type=>'JAVASCRIPT', -src=>'http://www.google.com/jsapi'}, - {-type=>'JAVASCRIPT', -code=>'google.load("jquery", "1");'}]), - h1('Manage rspamd cluster'), - start_form(-method=>'POST', -enctype=>&CGI::MULTIPART, -action=>$ENV{PATH_INFO}), - "", - "
", - scrolling_list(-name => 'servers', - -multiple=>'true', - -values=>$cfg{'hosts'}, - -id=>'id_servers', - ), - "
", - button(-name=>'ping', - -value=>'Ping', - -onClick=>'$.ajax({ - url: \'/ajax\', - success: function(data) { - $(\'#servers_div\').html(data); - } - });'), - br, - "", - popup_menu (-name=>'command', - -values=>['symbols', 'check', 'stat', 'learn', 'fuzzy_add', 'fuzzy_del', 'weights', 'uptime'], - -labels=> { - 'symbols'=>'Scan symbols for message', - 'check'=>'Check if message is spam', - 'stat'=>'Check statistics', - 'learn'=>'Learn rspamd with message', - 'fuzzy_add'=>'Add fuzzy hash', - 'fuzzy_del'=>'Delete fuzzy hash', - 'weights'=>'Check weights of message', - 'uptime'=>'Get uptime', - }, - -id=>'id_command', - ), - br, - "", - popup_menu(-name=>'statfile', -id=>'id_statfile', -values=>$cfg{'statfiles'}), - br, - "", - filefield(-name=>'upload_file', -id=>'id_file'), - br, - "", - textarea(-name=>'message', -id=>'id_message', -rows=>10, -columns=>80), - br, - "", - textfield(-name=>'weight', -id=>'id_weight'), - br, - submit, - end_form; - - print end_html; -} - -sub _get_file { - my $self = shift; - my $fh = shift; - - my $output; - my $buffer; - - if (! $fh) { - return undef; - } - my $io_handle = $fh->handle; - - while (my $bytesread = $io_handle->read($buffer,1024)) { - $output .= $buffer; - } - - return $output; -} - - -sub _make_rfc822_message { - my $self = shift; - my $msg = shift; - - # Check whether first line is a header line - if ($msg =~ /^[^:]+:\s*\S+$/) { - # Assume that message has all headers - return $msg; - } - else { - my $output = < - -$msg -EOT - return $output; - } -} - -sub _get_message { - my $self = shift; - my $cgi = shift; - - if ($cgi->param('upload_file')) { - return $self->_get_file($cgi->upload('upload_file')); - } - elsif (my $msg = $cgi->param('message')) { - return $self->_make_rfc822_message ($msg); - } - - undef; -} - -sub _show_rspamc_result { - my $self = shift; - my $host = shift; - my $res = shift; - - if (defined($res->{error})) { - print "

Error occured: $res->{error}

"; - } - else { - while (my ($metric, $result) = each (%{ $res })) { - print "

Metric: $metric

"; - print "

Summary: $result->{isspam}, [ $result->{score} / $result->{threshold} ]

"; - print "

Symbols: "; - print join("; ", @{ $result->{symbols} }) . "

"; - print "

Urls: " . join(", ", @{ $result->{urls} }) . "

"; - foreach my $msg (@{ $result->{messages} }) { - print "

Message: $msg

"; - } - print br; - } - } -} - -sub _show_error { - my $self = shift; - my $error = shift; - - print header, - start_html(-title=>'Rspamd control', -script=>[{-type=>'JAVASCRIPT', -src=>'http://www.google.com/jsapi'}, - {-type=>'JAVASCRIPT', -code=>'google.load("jquery", "1");'}]), - h1('Results for rspamd command'), - "

Error occured: $error

", - 'Back to manage', - end_html; -} - -sub _show_control_result { - my $self = shift; - my $host = shift; - my $res = shift; - - if ($res->{error_code} == 0) { - print "

$res->{error}

"; - } - else { - print "

Error occured: $res->{error}

"; - } -} - -sub _show_results { - my $self = shift; - my $rspamd = shift; - my $res = shift; - - if (defined ($res->{error})) { - $self->_print_error($res->{error}); - return; - } - print header, - start_html(-title=>'Rspamd control', -script=>[{-type=>'JAVASCRIPT', -src=>'http://www.google.com/jsapi'}, - {-type=>'JAVASCRIPT', -code=>'google.load("jquery", "1");'}]), - h1('Results for rspamd command: ' . $rspamd->{command}); - - while (my ($host, $result) = each (%{ $res })) { - print h2('Results for host: ' . $host); - if ($rspamd->{control}) { - $self->_show_control_result ($host, $result); - } - else { - $self->_show_rspamc_result ($host, $result); - } - print hr; - } - - print 'Back to manage'; - print end_html; -} - -sub _handle_form { - my $self = shift; - my $cgi = shift; - - my @servers = $cgi->param('servers'); - if (!@servers || scalar(@servers) == 0) { - @servers = @{ $cfg{'hosts'} }; - } - my $rspamd = Mail::Rspamd::Client->new({hosts => \@servers, timeout=>$cfg{timeout}, password=>$cfg{password}}); - my $cmd = $cgi->param('command'); - if (!$cmd) { - return undef; - } - - my $results; - - if($cmd eq 'symbols' || $cmd eq 'check') { - my $msg = $self->_get_message($cgi); - return undef unless $msg; - $results = $rspamd->$cmd($msg); - } - elsif ($cmd eq 'learn') { - my $statfile = $cgi->param('statfile'); - return undef unless $statfile; - my $msg = $self->_get_message($cgi); - return undef unless $msg; - - $rspamd->{'statfile'} = $statfile; - if (my $weight = $cgi->param('weight')) { - $rspamd->{'weight'} = int($weight); - } - - $results = $rspamd->learn($msg); - } - elsif ($cmd eq 'fuzzy_add' || $cmd eq 'fuzzy_del') { - my $msg = $self->_get_message($cgi); - return undef unless $msg; - if (my $weight = $cgi->param('weight')) { - $rspamd->{'weight'} = int($weight); - } - - $results = $rspamd->$cmd($msg); - } - elsif ($cmd eq 'stat' || $cmd eq 'uptime') { - $results = $rspamd->$cmd(); - } - - $self->_show_results($rspamd, $results); - -} - -sub _handle_request { - my $self = shift; - my $cgi = shift; - - my $path = $cgi->path_info(); - unless ($path) { - print "CGI environment missing\n"; - return undef; - } - - print "HTTP/1.0 200 OK\r\n"; - - if ($cgi->request_method() eq 'POST') { - if (!$self->_handle_form($cgi)) { - $self->_show_error("invalid command"); - } - } - else { - if ($path =~ '^/ajax$') { - $self->_handle_ping(); - } - else { - $self->_show_html(); - } - } -} - -sub _run_standalone { - my $self = shift; - my $listen = IO::Socket::INET->new( - Listen => 5, - LocalAddr => $self->{addr}, - LocalPort => $self->{port}, - Proto => 'tcp', - ReuseAddr => 1 - ); - - unless ($listen) { - warn "unable to listen on port $self->{port}: $!\n"; - return undef; - }; - - print STDERR "waiting for connection on port $self->{port}\n"; - while (1) { - my $s = $listen->accept(); - - open(STDOUT, ">&=".fileno($s)); - open(STDIN, "<&=".fileno($s)); - - my ($req, $content); - delete $ENV{CONTENT_LENGTH}; - { - local ($/) = "\r\n"; - while () { - $req .= $_; - chomp; - last unless /\S/; - if (/^GET\s*(\S+)/) { - $ENV{REQUEST_METHOD} = 'GET'; - my ($pi, $qs) = split /\?/, $1, 2; - $ENV{'PATH_INFO'} = $pi; - $ENV{'QUERY_STRING'} = $qs; - } elsif (/^POST\s*(\S+)/) { - $ENV{REQUEST_METHOD} = 'POST'; - my ($pi, $qs) = split /\?/, $1, 2; - $ENV{'PATH_INFO'} = $pi; - $ENV{'QUERY_STRING'} = $qs; - } elsif (/^Content-Type:\s*(.*)/) { - $ENV{CONTENT_TYPE} = $1; - } elsif (/^Content-Length:\s*(.*)/) { - $ENV{CONTENT_LENGTH} = $1; - } - } - } - $ENV{SERVER_PORT} = $self->{port}; - $ENV{SERVER_NAME} = $self->{addr}; - if (my $size = $ENV{CONTENT_LENGTH}) { - $content = ''; - while (length($content) < $size) { - my $nr = read(STDIN, $content, $size-length($content), - length($content)); - warn "read error" unless $nr; - } - } - - - close(STDIN); # n.b.: does not close socket - tie *STDIN, 'IO::String', $content; - - undef @CGI::QUERY_PARAM; - my $q = new CGI(); - $self->_handle_request($q); - - untie *STDIN; - close(STDOUT); - close($s); - } -} - -sub run { - my $self = shift; - - if ($self->{'standalone'} != 0) { - $self->_run_standalone(); - } - else { - my $q = new CGI(); - $self->_handle_request($q); - } -} - -} - -# Parse arguments - -my ($port, $standalone, $cfg, $host); - -while (my $arg = shift @ARGV) { - if ($arg =~ /^-port$/i) { - $port = shift @ARGV; - } - elsif ($arg =~ /^-standalone$/i) { - $standalone = 1; - } - elsif ($arg =~ /^-cfg$/i) { - $cfg = shift @ARGV; - } - elsif ($arg =~ /^-host$/i) { - $host = shift @ARGV; - } - else { - print STDERR <new({port=>$port, standalone=>$standalone, config=>$cfg, addr=>$host})->run(); diff --git a/debian/copyright b/debian/copyright index 07faab3fa3..7658055da6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -57,6 +57,37 @@ License: BSD-3-CLAUSE (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Files: compat/queue.h +Copyright: 1991, 1993 The Regents of the University of California. +License: BSD-3-CLAUSE + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + Files: src/json/* Copyright: 2009 Petri Lehtinen License: Expat