X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=8039198b21707d9c851fc549d133f28029d3f765;hb=3e74e0c6a89cba419cdc0d8713bcf834f6dbc510;hp=ab0be7a2365fab82ac8745ee36c22fa65ef76d9f;hpb=b9dffeff7239952814342dad19db3a51def6fab7;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index ab0be7a2..8039198b 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 1998 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 package DXUser;
@@ -13,13 +13,15 @@ use DB_File;
 use Data::Dumper;
 use Fcntl;
 use IO::File;
-use DXDebug;
 use DXUtil;
 use LRU;
+use File::Copy;
+use JSON;
+use DXDebug;
 
 use strict;
 
-use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3);
+use vars qw(%u $dbm $filename %valid $lastoperinterval $lasttime $lru $lrusize $tooold $v3 $v4);
 
 %u = ();
 $dbm = undef;
@@ -29,6 +31,10 @@ $lasttime = 0;
 $lrusize = 2000;
 $tooold = 86400 * 365;		# this marks an old user who hasn't given enough info to be useful
 $v3 = 0;
+$v4 = 0;
+my $json;
+
+our $maxconnlist = 3;			# remember this many connection time (duration) [start, end] pairs
 
 # hash of valid elements and a simple prompt
 %valid = (
@@ -80,6 +86,7 @@ $v3 = 0;
 		  wantdxcq => '0,Show CQ Zone,yesno',
 		  wantdxitu => '0,Show ITU Zone,yesno',
 		  wantgtk => '0,Want GTK interface,yesno',
+		  wantpc9x => '0,Want PC9X interface,yesno',
 		  lastoper => '9,Last for/oper,cldatetime',
 		  nothere => '0,Not Here Text',
 		  registered => '9,Registered?,yesno',
@@ -88,6 +95,9 @@ $v3 = 0;
 		  build => '1,Build',
 		  believe => '1,Believable nodes,parray',
 		  lastping => '1,Last Ping at,ptimelist',
+		  maxconnect => '1,Max Connections',
+		  startt => '0,Start Time,cldatetime',
+		  connlist => '1,Connections,parraydifft',
 		 );
 
 #no strict;
@@ -113,21 +123,19 @@ sub AUTOLOAD
 #
 sub init
 {
-	my ($pkg, $fn, $mode) = @_;
+	my $mode = shift;
   
-	confess "need a filename in User" if !$fn;
-
 	my $ufn;
 	my $convert;
 	
+	my $fn = "users";
+
 	eval {
 		require Storable;
 	};
 
-#	eval "use Storable qw(nfreeze thaw)";
-	
 	if ($@) {
-		$ufn = "$fn.v2";
+		$ufn = localdata("users.v2");
 		$v3 = $convert = 0;
 		dbg("the module Storable appears to be missing!!");
 		dbg("trying to continue in compatibility mode (this may fail)");
@@ -135,9 +143,9 @@ sub init
 	} else {
 		import Storable qw(nfreeze thaw);
 
-		$ufn = "$fn.v3";
+		$ufn = localdata("users.v3");
 		$v3 = 1;
-		$convert++ if -e "$fn.v2" && !-e $ufn;
+		$convert++ if -e localdata("users.v2") && !-e $ufn;
 	}
 	
 	if ($mode) {
@@ -155,16 +163,21 @@ sub init
 		my ($key, $val, $action, $count, $err) = ('','',0,0,0);
 		
 		my %oldu;
-		dbg("Converting the User File to V3 ");
+		dbg("Converting the User File to V$convert ");
 		dbg("This will take a while, I suggest you go and have cup of strong tea");
-		my $odbm = tie (%oldu, 'DB_File', "$fn.v2", O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
+		my $odbm = tie (%oldu, 'DB_File', localdata("users.v2"), O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
         for ($action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) {
-			my $ref = asc_decode($val);
-			if ($ref) {
-				$ref->put;
-				$count++;
+			my $ref;
+			eval { $ref = asc_decode($val) };
+			unless ($@) {
+				if ($ref) {
+					$ref->put;
+					$count++;
+				} else {
+					$err++
+				}
 			} else {
-				$err++
+				Log('err', "DXUser: error decoding $@");
 			}
 		} 
 		undef $odbm;
@@ -176,11 +189,9 @@ sub init
 
 sub del_file
 {
-	my ($pkg, $fn) = @_;
-  
-	confess "need a filename in User" if !$fn;
-	$fn .= $v3 ? ".v3" : ".v2";
-	unlink $fn;
+	# with extreme prejudice
+	unlink "$main::data/users.v3";
+	unlink "$main::local_data/users.v3";
 }
 
 #
@@ -189,7 +200,7 @@ sub del_file
 sub process
 {
 	if ($main::systime > $lasttime + 15) {
-		$dbm->sync;
+		$dbm->sync if $dbm;
 		$lasttime = $main::systime;
 	}
 }
@@ -236,17 +247,31 @@ sub new
 
 sub get
 {
-	my $pkg = shift;
 	my $call = uc shift;
 	my $data;
 	
 	# is it in the LRU cache?
 	my $ref = $lru->get($call);
-	return $ref if $ref;
+	return $ref if $ref && ref $ref eq 'DXUser';
 	
 	# search for it
 	unless ($dbm->get($call, $data)) {
-		$ref = decode($data);
+		eval { $ref = decode($data); };
+		
+		if ($ref) {
+			if (!UNIVERSAL::isa($ref, 'DXUser')) {
+				dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
+				return undef;
+			}
+			# we have a reference and it *is* a DXUser
+		} else {
+			if ($@) {
+				LogDbg('err', "DXUser::get decode error on $call '$@'");
+			} else {
+				dbg("DXUser::get: no reference returned from decode of $call $!");
+			}
+			return undef;
+		}
 		$lru->put($call, $ref);
 		return $ref;
 	}
@@ -263,14 +288,16 @@ sub get
 
 sub get_current
 {
-	my $pkg = shift;
 	my $call = uc shift;
   
 	my $dxchan = DXChannel::get($call);
-	return $dxchan->user if $dxchan;
-	my $rref = Route::get($call);
-	return $rref->user if $rref && exists $rref->{user};
-	return $pkg->get($call);
+	if ($dxchan) {
+		my $ref = $dxchan->user;
+		return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
+
+		dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+	}
+	return get($call);
 }
 
 #
@@ -291,13 +318,11 @@ sub put
 	my $self = shift;
 	confess "Trying to put nothing!" unless $self && ref $self;
 	my $call = $self->{call};
-	# delete all instances of this 
-#	for ($dbm->get_dup($call)) {
-#		$dbm->del_dup($call, $_);
-#	}
+
 	$dbm->del($call);
 	delete $self->{annok} if $self->{annok};
 	delete $self->{dxok} if $self->{dxok};
+
 	$lru->put($call, $self);
 	my $ref = $self->encode;
 	$dbm->put($call, $ref);
@@ -306,6 +331,7 @@ sub put
 # freeze the user
 sub encode
 {
+	goto &json_encode if $v4;
 	goto &asc_encode unless $v3;
 	my $self = shift;
 	return nfreeze($self);
@@ -314,8 +340,11 @@ sub encode
 # thaw the user
 sub decode
 {
+	goto &json_dncode if $v4;
 	goto &asc_decode unless $v3;
-	return thaw(shift);
+	my $ref;
+	$ref = thaw(shift);
+	return $ref;
 }
 
 # 
@@ -324,7 +353,20 @@ sub decode
 sub asc_encode
 {
 	my $self = shift;
-	return dd($self);
+	my $strip = shift;
+	my $p;
+
+	if ($strip) {
+		my $ref = bless {}, ref $self;
+		foreach my $k (qw(qth lat long qra sort call homenode node lastoper lastin)) {
+			$ref->{$k} = $self->{$k} if exists $self->{$k};
+		}
+		$ref->{name} = $self->{name} if exists $self->{name} && $self->{name} !~ /selfspot/i;
+		$p = dd($ref);
+	} else {
+		$p = dd($self);
+	}
+	return $p;
 }
 
 #
@@ -337,12 +379,22 @@ sub asc_decode
 	$s =~ s/\%([0-9A-F][0-9A-F])/chr(hex($1))/eg;
 	eval '$ref = ' . $s;
 	if ($@) {
-		LogDbg('err', $@);
+		LogDbg('err', "DXUser::asc_decode: on '$s' $@");
 		$ref = undef;
 	}
 	return $ref;
 }
 
+sub json_decode
+{
+
+}
+
+sub json_encode
+{
+
+}
+	
 #
 # del - delete a user
 #
@@ -351,10 +403,6 @@ sub del
 {
 	my $self = shift;
 	my $call = $self->{call};
-	# delete all instances of this 
-#	for ($dbm->get_dup($call)) {
-#		$dbm->del_dup($call, $_);
-#	}
 	$lru->remove($call);
 	$dbm->del($call);
 }
@@ -366,7 +414,14 @@ sub del
 sub close
 {
 	my $self = shift;
-	$self->{lastin} = time;
+	my $startt = shift;
+	my $ip = shift;
+	$self->{lastin} = $main::systime;
+	# add a record to the connect list
+	my $ref = [$startt || $self->{startt}, $main::systime];
+	push @$ref, $ip if $ip;
+	push @{$self->{connlist}}, $ref;
+	shift @{$self->{connlist}} if @{$self->{connlist}} > $maxconnlist;
 	$self->put();
 }
 
@@ -395,14 +450,17 @@ sub fields
 
 sub export
 {
-	my $fn = shift;
+	my $name = shift || 'user_asc';
+	my $basic_info_only = shift;
+
+	my $fn = $name ne 'user_asc' ? $name : "$main::local_data/$name";                       # force use of local
 	
 	# save old ones
-        rename "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
-        rename "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
-        rename "$fn.oo", "$fn.ooo" if -e "$fn.oo";
-        rename "$fn.o", "$fn.oo" if -e "$fn.o";
-        rename "$fn", "$fn.o" if -e "$fn";
+	move "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
+	move "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
+	move "$fn.oo", "$fn.ooo" if -e "$fn.oo";
+	move "$fn.o", "$fn.oo" if -e "$fn.o";
+	move "$fn", "$fn.o" if -e "$fn";
 
 	my $count = 0;
 	my $err = 0;
@@ -436,7 +494,7 @@ BEGIN {
 	
 	# try to detect a lockfile (this isn't atomic but 
 	# should do for now
-	$lockfn = "$root/local/cluster.lck";       # lock file name
+	$lockfn = "$root/local_data/cluster.lck";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -446,9 +504,7 @@ BEGIN {
 	}
 }
 
-package DXUser;
-
-use DXVars;
+use SysVar;
 use DXUser;
 
 if (@ARGV) {
@@ -456,8 +512,10 @@ if (@ARGV) {
 	print "user filename now $userfn\n";
 }
 
-DXUser->del_file($main::userfn);
-DXUser->init($main::userfn, 1);
+package DXUser;
+
+del_file();
+init(1);
 %u = ();
 my $count = 0;
 my $err = 0;
@@ -468,12 +526,13 @@ while (<DATA>) {
 	if ($ref) {
 		$ref->put();
 		$count++;
+        DXUser::sync() unless $count % 10000;
 	} else {
 		print "# Error: $f[0]\t$f[1]\n";
 		$err++
 	}
 }
-DXUser->sync; DXUser->finish;
+DXUser::sync(); DXUser::finish();
 print "There are $count user records and $err errors\n";
 };
 		print $fh "__DATA__\n";
@@ -490,10 +549,11 @@ print "There are $count user records and $err errors\n";
 				++$err;
 				next;
 			}
-			my $ref = decode($val);
+			my $ref;
+			eval {$ref = decode($val); };
 			if ($ref) {
 				my $t = $ref->{lastin} || 0;
-				if ($ref->{sort} eq 'U' && !$ref->{priv} && $main::systime > $t + $tooold) {
+				if ($ref->is_user && !$ref->{priv} && $main::systime > $t + $tooold) {
 					unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
 						eval {$dbm->del($key)};
 						dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
@@ -503,18 +563,163 @@ print "There are $count user records and $err errors\n";
 					}
 				}
 				# only store users that are reasonably active or have useful information
-				print $fh "$key\t" . $ref->asc_encode . "\n";
+				print $fh "$key\t" . $ref->asc_encode($basic_info_only) . "\n";
 				++$count;
 			} else {
-				LogDbg('DXCommand', "Export Error3: $key\t$val");
+				LogDbg('DXCommand', "Export Error3: $key\t" . carp($val) ."\n$@");
 				eval {$dbm->del($key)};
 				dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
 				++$err;
 			}
 		} 
         $fh->close;
-    } 
-	return "$count Users $del Deleted $err Errors ('sh/log Export' for details)";
+    }
+	my $s = qq{Exported users to $fn - $count Users $del Deleted $err Errors ('sh/log Export' for details)};
+	LogDbg('command', $s);
+	return $s;
+}
+
+sub export_json
+{
+	use Data::Structure::Util qw(unbless);
+	
+	my $name = shift || 'user_json';
+	my $basic_info_only = shift;
+
+	my $fn = $name ne 'user_json' ? $name : "$main::local_data/$name";                       # force use of local
+	
+	# save old ones
+	move "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
+	move "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
+	move "$fn.oo", "$fn.ooo" if -e "$fn.oo";
+	move "$fn.o", "$fn.oo" if -e "$fn.o";
+	move "$fn", "$fn.o" if -e "$fn";
+
+	my $json = JSON->new;
+	$json->canonical(1);
+	$json->allow_blessed(1);
+	
+	my $count = 0;
+	my $err = 0;
+	my $del = 0;
+	my $fh = new IO::File ">$fn" or return "cannot open $fn ($!)";
+	if ($fh) {
+		my $key = 0;
+		my $val = undef;
+		my $action;
+		my $t = scalar localtime;
+		print $fh q{#!/usr/bin/perl
+#
+# The exported userfile for a DXSpider System
+#
+# Input file: $filename
+#       Time: $t
+#
+			
+package main;
+			
+# search local then perl directories
+BEGIN {
+	umask 002;
+				
+	# root of directory tree for this system
+	$root = "/spider"; 
+	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+	
+	unshift @INC, "$root/perl";	# this IS the right way round!
+	unshift @INC, "$root/local";
+	
+	# try to detect a lockfile (this isn't atomic but 
+	# should do for now
+	$lockfn = "$root/local_data/cluster.lck";       # lock file name
+	if (-e $lockfn) {
+		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
+		my $pid = <CLLOCK>;
+		chomp $pid;
+		die "Lockfile ($lockfn) and process $pid exists - cluster must be stopped first\n" if kill 0, $pid;
+		close CLLOCK;
+	}
+}
+
+use SysVar;
+use DXUser;
+
+if (@ARGV) {
+	$main::userfn = shift @ARGV;
+	print "user filename now $userfn\n";
+}
+
+package DXUser;
+
+use JSON;
+my $json = JSON->new;
+
+del_file();
+init(1);
+%u = ();
+my $count = 0;
+my $err = 0;
+while (<DATA>) {
+	chomp;
+	my @f = split /\t/;
+	my $ref;
+    eval { $ref = $json->decode($f[1]); };
+	if ($ref && !$@) {
+        $ref = bless $ref, 'DXUser';
+		$ref->put();
+		$count++;
+        DXUser::sync() unless $count % 10000;
+	} else {
+		print "# Error: $f[0]\t$f[1]\n";
+		$err++
+	}
+}
+DXUser::sync(); DXUser::finish();
+print "There are $count user records and $err errors\n";
+};
+		print $fh "__DATA__\n";
+
+        for ($action = R_FIRST; !$dbm->seq($key, $val, $action); $action = R_NEXT) {
+			if (!is_callsign($key) || $key =~ /^0/) {
+				my $eval = $val;
+				my $ekey = $key;
+				$eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
+				$ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
+				LogDbg('DXCommand', "Export Error1: $ekey\t$eval");
+				eval {$dbm->del($key)};
+				dbg(carp("Export Error1: $ekey\t$eval\n$@")) if $@;
+				++$err;
+				next;
+			}
+			my $ref;
+			eval {$ref = decode($val); };
+			if ($ref) {
+				my $t = $ref->{lastin} || 0;
+				if ($ref->is_user && !$ref->{priv} && $main::systime > $t + $tooold) {
+					unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
+						eval {$dbm->del($key)};
+						dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
+						LogDbg('DXCommand', "$ref->{call} deleted, too old");
+						$del++;
+						next;
+					}
+				}
+				# only store users that are reasonably active or have useful information
+				unbless($ref);
+				print $fh "$key\t" . $json->encode($ref) . "\n";
+				++$count;
+			} else {
+				LogDbg('DXCommand', "Export Error3: $key\t" . carp($val) ."\n$@");
+				eval {$dbm->del($key)};
+				dbg(carp("Export Error3: $key\t$val\n$@")) if $@;
+				++$err;
+			}
+		} 
+        $fh->close;
+    }
+	my $s = qq{Exported users to $fn - $count Users $del Deleted $err Errors ('sh/log Export' for details)};
+	LogDbg('command', $s);
+	return $s;
 }
 
 #
@@ -716,6 +921,11 @@ sub wantgtk
 	return _want('gtk', @_);
 }
 
+sub wantpc9x
+{
+	return _want('pc9x', @_);
+}
+
 sub wantlogininfo
 {
 	my $self = shift;
@@ -727,7 +937,7 @@ sub wantlogininfo
 sub is_node
 {
 	my $self = shift;
-	return $self->{sort} =~ /[ACRSX]/;
+	return $self->{sort} =~ /^[ACRSX]$/;
 }
 
 sub is_local_node
@@ -739,7 +949,13 @@ sub is_local_node
 sub is_user
 {
 	my $self = shift;
-	return $self->{sort} eq 'U';
+	return $self->{sort} =~ /^[UW]$/;
+}
+
+sub is_web
+{
+	my $self = shift;
+	return $self->{sort} eq 'W';
 }
 
 sub is_bbs