From 072b1c2a79025d93f0a0c4843e609653258de938 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 10 Jul 2002 17:17:25 +0000 Subject: Support seperate rlists for rsa, dsa and plaintext pings --- Echolot/Config.pm | 11 +++++++-- Echolot/Stats.pm | 27 +++++++++++++++++++- NEWS | 2 ++ pingd | 4 ++- pingd.conf | 18 ++++++++------ templates/mlist.html | 31 +++++++++++++++++++++-- templates/mlist2.html | 31 +++++++++++++++++++++-- templates/rlist-clear.html | 60 +++++++++++++++++++++++++++++++++++++++++++++ templates/rlist-dsa.html | 60 +++++++++++++++++++++++++++++++++++++++++++++ templates/rlist-rsa.html | 60 +++++++++++++++++++++++++++++++++++++++++++++ templates/rlist.html | 31 +++++++++++++++++++++-- templates/rlist2-clear.html | 60 +++++++++++++++++++++++++++++++++++++++++++++ templates/rlist2-dsa.html | 60 +++++++++++++++++++++++++++++++++++++++++++++ templates/rlist2-rsa.html | 60 +++++++++++++++++++++++++++++++++++++++++++++ templates/rlist2.html | 31 +++++++++++++++++++++-- 15 files changed, 526 insertions(+), 20 deletions(-) create mode 100644 templates/rlist-clear.html create mode 100644 templates/rlist-dsa.html create mode 100644 templates/rlist-rsa.html create mode 100644 templates/rlist2-clear.html create mode 100644 templates/rlist2-dsa.html create mode 100644 templates/rlist2-rsa.html diff --git a/Echolot/Config.pm b/Echolot/Config.pm index 789ccac..8761631 100644 --- a/Echolot/Config.pm +++ b/Echolot/Config.pm @@ -1,7 +1,7 @@ package Echolot::Config; # (c) 2002 Peter Palfrader -# $Id: Config.pm,v 1.19 2002/07/10 13:01:03 weasel Exp $ +# $Id: Config.pm,v 1.20 2002/07/10 17:16:45 weasel Exp $ # =pod @@ -69,6 +69,7 @@ sub init($) { ping_new => 1, show_new => 1, + seperate_rlists => 0, thesaurus => 1, processmail => 60, # process incomng mail every minute @@ -114,8 +115,14 @@ sub init($) { 'thesaurusindexfile' => 'templates/thesaurusindex.html', 'mlist' => 'templates/mlist.html', 'mlist2' => 'templates/mlist2.html', - 'rlist2' => 'templates/rlist2.html', 'rlist' => 'templates/rlist.html', + 'rlist-rsa' => 'templates/rlist-rsa.html', + 'rlist-dsa' => 'templates/rlist-dsa.html', + 'rlist-clear' => 'templates/rlist-clear.html', + 'rlist2' => 'templates/rlist2.html', + 'rlist2-rsa' => 'templates/rlist2-rsa.html', + 'rlist2-dsa' => 'templates/rlist2-dsa.html', + 'rlist2-clear' => 'templates/rlist2-clear.html', }, homedir => undef, diff --git a/Echolot/Stats.pm b/Echolot/Stats.pm index 96776a4..438c07e 100644 --- a/Echolot/Stats.pm +++ b/Echolot/Stats.pm @@ -1,7 +1,7 @@ package Echolot::Stats; # (c) 2002 Peter Palfrader -# $Id: Stats.pm,v 1.12 2002/07/06 20:15:12 weasel Exp $ +# $Id: Stats.pm,v 1.13 2002/07/10 17:16:45 weasel Exp $ # =pod @@ -275,6 +275,7 @@ sub write_file($$;$) { $template->param ( list => $output ); $template->param ( CURRENT_TIMESTAMP => scalar gmtime() ); $template->param ( SITE_NAME => Echolot::Config::get()->{'sitename'} ); + $template->param ( seperate_rlist => Echolot::Config::get()->{'seperate_rlists'} ); $filename = $filebasename.'.html'; open(F, '>'.$filename) or @@ -320,6 +321,7 @@ sub build_rlist1($$;$) { #$output .= sprintf "Broken type-I remailer chains:\n\n"; #$output .= sprintf "Broken type-II remailer chains:\n\n"; + $output .= sprintf "\n"; $output .= sprintf "Last update: %s\n", makeDate(); $output .= sprintf "remailer email address history latency uptime\n"; $output .= sprintf "-----------------------------------------------------------------------\n"; @@ -424,6 +426,29 @@ sub build_lists() { @$rems = grep { $_->{'showit'} } @$rems; build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist', Echolot::Config::get()->{'templates'}->{'rlist'}); build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2', Echolot::Config::get()->{'templates'}->{'rlist2'}); + + if (Echolot::Config::get()->{'seperate_rlists'}) { + $rems = build_rems(['cpunk-rsa']); + build_rlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist-rsa', Echolot::Config::get()->{'templates'}->{'rlist-rsa'}); + build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist2-rsa', Echolot::Config::get()->{'templates'}->{'rlist2-rsa'}); + @$rems = grep { $_->{'showit'} } @$rems; + build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist-rsa', Echolot::Config::get()->{'templates'}->{'rlist-rsa'}); + build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2-rsa', Echolot::Config::get()->{'templates'}->{'rlist2-rsa'}); + + $rems = build_rems(['cpunk-dsa']); + build_rlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist-dsa', Echolot::Config::get()->{'templates'}->{'rlist-dsa'}); + build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist2-dsa', Echolot::Config::get()->{'templates'}->{'rlist2-dsa'}); + @$rems = grep { $_->{'showit'} } @$rems; + build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist-dsa', Echolot::Config::get()->{'templates'}->{'rlist-dsa'}); + build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2-dsa', Echolot::Config::get()->{'templates'}->{'rlist2-dsa'}); + + $rems = build_rems(['cpunk-clear']); + build_rlist1( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist-clear', Echolot::Config::get()->{'templates'}->{'rlist-clear'}); + build_list2( $rems, Echolot::Config::get()->{'private_resultdir'}.'/'.'rlist2-clear', Echolot::Config::get()->{'templates'}->{'rlist2-clear'}); + @$rems = grep { $_->{'showit'} } @$rems; + build_rlist1( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist-clear', Echolot::Config::get()->{'templates'}->{'rlist-clear'}); + build_list2( $rems, Echolot::Config::get()->{'resultdir'}.'/'.'rlist2-clear', Echolot::Config::get()->{'templates'}->{'rlist2-clear'}); + } }; diff --git a/NEWS b/NEWS index fdb0240..6bacbef 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ Changes in Use the change-thesaurus-filenames script in the tools directory to convert your current thesaurus if you wish to keep the data. + * Seperate rlists for rsa, dsa and plaintext pings are + supported now. Enable seperate_rlists in pingd.conf. Changes in version 2.0 beta4 - 2002-07-10 * Minor documentation fixes diff --git a/pingd b/pingd index 8586ec5..2d83569 100755 --- a/pingd +++ b/pingd @@ -1,7 +1,9 @@ #!/usr/bin/perl -wT +$| = 1; + # (c) 2002 Peter Palfrader -# $Id: pingd,v 1.27 2002/07/10 13:21:40 weasel Exp $ +# $Id: pingd,v 1.28 2002/07/10 17:16:45 weasel Exp $ # =pod diff --git a/pingd.conf b/pingd.conf index 7bef62f..31fc381 100644 --- a/pingd.conf +++ b/pingd.conf @@ -1,14 +1,16 @@ # vim:set syntax=perl: $CONFIG = { - 'homedir' => '/home/pinger/echolot', - 'sitename' => 'unconfigured', + 'homedir' => '/home/pinger/echolot', + 'sitename' => 'unconfigured', - 'my_localpart' => 'pinger', - 'my_domain' => 'example.com', + 'my_localpart' => 'pinger', + 'my_domain' => 'example.com', - 'Pinger::Mix' => { - 'mix' => '/home/pinger/Mix/mix', - 'mixdir' => '/home/pinger/Mix' - } + 'Pinger::Mix' => { + 'mix' => '/home/pinger/Mix/mix', + 'mixdir' => '/home/pinger/Mix' + }, + + 'seperate_rlists' => 0, }; diff --git a/templates/mlist.html b/templates/mlist.html index fd4c90d..81e7ee3 100644 --- a/templates/mlist.html +++ b/templates/mlist.html @@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability statistics.

-v2 and cpunk v1 and -v2 stats are also available. +Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2

Up diff --git a/templates/mlist2.html b/templates/mlist2.html index 4362096..c0345c9 100644 --- a/templates/mlist2.html +++ b/templates/mlist2.html @@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability statistics.

-v1 and cpunk v1 and -v2 stats are also available. +Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2

Up diff --git a/templates/rlist-clear.html b/templates/rlist-clear.html new file mode 100644 index 0000000..f0a98a1 --- /dev/null +++ b/templates/rlist-clear.html @@ -0,0 +1,60 @@ + + + Thesaurus [<TMPL_VAR NAME="SITE_NAME">] + + +

Remailer Reliability Stats []

+ +

Cypherpunk Remailers (cleartext only)

+ +

+This is an automatically generated list of remailer reliability +statistics. + +

+Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2
+ +

+Up + +

+

+
+
+ +
+Created by Echolot.
+Last update: . + + + + + diff --git a/templates/rlist-dsa.html b/templates/rlist-dsa.html new file mode 100644 index 0000000..e2f3a7c --- /dev/null +++ b/templates/rlist-dsa.html @@ -0,0 +1,60 @@ + + + Thesaurus [<TMPL_VAR NAME="SITE_NAME">] + + +

Remailer Reliability Stats []

+ +

Cypherpunk Remailers (DSA only)

+ +

+This is an automatically generated list of remailer reliability +statistics. + +

+Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2
+ +

+Up + +

+

+
+
+ +
+Created by Echolot.
+Last update: . + + + + + diff --git a/templates/rlist-rsa.html b/templates/rlist-rsa.html new file mode 100644 index 0000000..6bceedb --- /dev/null +++ b/templates/rlist-rsa.html @@ -0,0 +1,60 @@ + + + Thesaurus [<TMPL_VAR NAME="SITE_NAME">] + + +

Remailer Reliability Stats []

+ +

Cypherpunk Remailers (RSA only)

+ +

+This is an automatically generated list of remailer reliability +statistics. + +

+Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2
+ +

+Up + +

+

+
+
+ +
+Created by Echolot.
+Last update: . + + + + + diff --git a/templates/rlist.html b/templates/rlist.html index 1a609cb..7987736 100644 --- a/templates/rlist.html +++ b/templates/rlist.html @@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability statistics.

-v2 and mixmaster v1 and -v2 stats are also available. +Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2

Up diff --git a/templates/rlist2-clear.html b/templates/rlist2-clear.html new file mode 100644 index 0000000..11dd3ff --- /dev/null +++ b/templates/rlist2-clear.html @@ -0,0 +1,60 @@ + + + Thesaurus [<TMPL_VAR NAME="SITE_NAME">] + + +

Remailer Reliability Stats []

+ +

Cypherpunk Remailers (v2, cleartext only)

+ +

+This is an automatically generated list of remailer reliability +statistics. + +

+Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2
+ +

+Up + +

+

+
+
+ +
+Created by Echolot.
+Last update: . + + + + + diff --git a/templates/rlist2-dsa.html b/templates/rlist2-dsa.html new file mode 100644 index 0000000..7b60c44 --- /dev/null +++ b/templates/rlist2-dsa.html @@ -0,0 +1,60 @@ + + + Thesaurus [<TMPL_VAR NAME="SITE_NAME">] + + +

Remailer Reliability Stats []

+ +

Cypherpunk Remailers (v2, DSA only)

+ +

+This is an automatically generated list of remailer reliability +statistics. + +

+Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2
+ +

+Up + +

+

+
+
+ +
+Created by Echolot.
+Last update: . + + + + + diff --git a/templates/rlist2-rsa.html b/templates/rlist2-rsa.html new file mode 100644 index 0000000..cdb4650 --- /dev/null +++ b/templates/rlist2-rsa.html @@ -0,0 +1,60 @@ + + + Thesaurus [<TMPL_VAR NAME="SITE_NAME">] + + +

Remailer Reliability Stats []

+ +

Cypherpunk Remailers (v2, RSA only)

+ +

+This is an automatically generated list of remailer reliability +statistics. + +

+Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2
+ +

+Up + +

+

+
+
+ +
+Created by Echolot.
+Last update: . + + + + + diff --git a/templates/rlist2.html b/templates/rlist2.html index 177b1e3..df1689f 100644 --- a/templates/rlist2.html +++ b/templates/rlist2.html @@ -12,8 +12,35 @@ This is an automatically generated list of remailer reliability statistics.

-v1 and mixmaster v1 and -v2 stats are also available. +Available Stats: + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Cypherpunk (Type I)Cypherpunk (Type I)Mixmaster (Type II)
v1(rsa)(dsa)(cleartext)v1
v2(rsa)(dsa)(cleartext)v2

Up -- cgit v1.2.3