X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FDynaConfig.pl;h=f4ba9c3f207fd3d489a62a3672921fa5b480e471;hb=8e78dd0efefd2643925ef2d9fa3836d49edfaa32;hp=5aa38063c38bcee04ba49f1e09ef4a33af74119b;hpb=623fa7b5d1e239a64f1ceee8f3117c3cd0e921af;p=infobot.git

diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl
index 5aa3806..f4ba9c3 100644
--- a/src/DynaConfig.pl
+++ b/src/DynaConfig.pl
@@ -6,19 +6,46 @@
 #	   NOTE: Merged from User.pl
 #
 
-if (&IsParam("useStrict")) { use strict; }
+use strict;
+
+use vars qw(%chanconf %cache %bans %channels %nuh %users %ignore
+	%talkWho %dcc %mask);
+use vars qw($utime_userfile $ucount_userfile $utime_chanfile $who
+	$ucount_chanfile $userHandle $chan $msgType $talkchannel
+	$ident $bot_state_dir $talkWho $flag_quit $wtime_userfile
+	$wcount_userfile $wtime_chanfile $nuh $message);
 
 #####
 ##### USERFILE CONFIGURATION READER/WRITER
 #####
 
 sub readUserFile {
-    if (!open IN,"$bot_misc_dir/blootbot.users") {
-	&ERROR("cannot read userfile.");
+    my $f = "$bot_state_dir/blootbot.users";
+
+    if (! -f $f) {
+	&DEBUG("userfile not found; new fresh run detected.");
+	return;
+    }
+
+    if ( -f $f and -f "$f~") {
+	my $s1 = -s $f;
+	my $s2 = -s "$f~";
+
+	if ($s2 > $s1*3) {
+	    &FIXME("rUF: backup file bigger than current file.");
+	}
+    }
+
+    if (!open IN, $f) {
+	&ERROR("Cannot read userfile ($f): $!");
 	&closeLog();
 	exit 1;
     }
 
+    undef %users;	# clear on reload.
+    undef %bans;	# reset.
+    undef %ignore;	# reset.
+
     my $ver = <IN>;
     if ($ver !~ /^#v1/) {
 	&ERROR("old or invalid user file found.");
@@ -27,6 +54,7 @@ sub readUserFile {
     }
 
     my $nick;
+    my $type;
     while (<IN>) {
 	chop;
 
@@ -36,11 +64,21 @@ sub readUserFile {
 	if (/^--(\S+)[\s\t]+(.*)$/) {		# user: middle entry.
 	    my ($what,$val) = ($1,$2);
 
+	    if (!defined $val or $val eq "") {
+		&WARN("$what: val == NULL.");
+		next;
+	    }
+
+	    if (!defined $nick) {
+		&WARN("DynaConfig: invalid line: $_");
+		next;
+	    }
+
 	    # nice little hack.
 	    if ($what eq "HOSTS") {
-		$users{$nick}{$1}{$2} = 1;
+		$users{$nick}{$what}{$val} = 1;
 	    } else {
-		$users{$nick}{$1} = $2;
+		$users{$nick}{$what} = $val;
 	    }
 
 	} elsif (/^(\S+)$/) {			# user: start entry.
@@ -48,17 +86,24 @@ sub readUserFile {
 
 	} elsif (/^::(\S+) ignore$/) {		# ignore: start entry.
 	    $chan	= $1;
+	    $type	= "ignore";
 
-	} elsif (/^- (\S+):+(\d+):(\S+):(\d+):(.*)$/) {
+	} elsif (/^- (\S+):\+(\d+):\+(\d+):(\S+):(.*)$/ and $type eq "ignore") {
 	    ### ignore: middle entry.
-	    # $mask, $count?, $whoby, $atime, $comment.
+	    my $mask = $1;
 	    my(@array) = ($2,$3,$4,$5);
-	    $ignore{$chan}{$1} = \@array;
+	    ### DEBUG purposes only!
+	    if ($mask !~ /^$mask{nuh}$/) {
+		&WARN("ignore: mask $mask is invalid.");
+		next;
+	    }
+	    $ignore{$chan}{$mask} = \@array;
 
 	} elsif (/^::(\S+) bans$/) {		# bans: start entry.
 	    $chan	= $1;
+	    $type	= "bans";
 
-	} elsif (/^- (\S+):+(\d+):+(\d+):(\d+):(\S+):(.*)$/) {
+	} elsif (/^- (\S+):\+(\d+):\+(\d+):(\d+):(\S+):(.*)$/ and $type eq "bans") {
 	    ### bans: middle entry.
 	    # $btime, $atime, $count, $whoby, $reason.
 	    my(@array) = ($2,$3,$4,$5,$6);
@@ -72,19 +117,24 @@ sub readUserFile {
 
     &status( sprintf("USERFILE: Loaded: %d users, %d bans, %d ignore",
 		scalar(keys %users)-1,
-		scalar(keys %bans),
-		scalar(keys %ignore),
+		scalar(keys %bans),		# ??
+		scalar(keys %ignore),		# ??
 	)
     );
 }
 
 sub writeUserFile {
-    if (!open OUT,">$bot_misc_dir/blootbot.users") {
-	&ERROR("cannot write to userfile.");
+    if (!scalar keys %users) {
+	&DEBUG("wUF: nothing to write.");
+	return;
+    }
+
+    if (!open OUT,">$bot_state_dir/blootbot.users") {
+	&ERROR("Cannot write userfile ($bot_state_dir/blootbot.users): $!");
 	return;
     }
 
-    my $time		= scalar(localtime);
+    my $time		= scalar(gmtime);
 
     print OUT "#v1: blootbot -- $ident -- written $time\n\n";
 
@@ -110,6 +160,8 @@ sub writeUserFile {
 		    print OUT "--$what\t\t$_\n";
 		}
 
+	    } elsif ($_ eq 'FLAGS') {
+		print OUT "--$_\t\t" . join('', sort split('', $val)) . "\n";
 	    } else {
 		print OUT "--$_\t\t$val\n";
 	    }
@@ -125,18 +177,20 @@ sub writeUserFile {
 
 	my $count = scalar keys %{ $bans{$chan} };
 	if (!$count) {
-	    &WARN("bans: chan $chan has no other attributes;
-skipping.");
+	    &WARN("bans: chan $chan has no other attributes; skipping.");
 	    next;
 	}
 
 	print OUT "::$chan bans\n";
-	&DEBUG("::$chan bans");
 	foreach (keys %{ $bans{$chan} }) {
-	    printf OUT "- %s:+%d:+%d:%d:%s:%s\n",
-	    $_, @{ $bans{$chan}{$_} };
-	    &DEBUG( sprintf("- %s:+%d:+%d:%d:%s:%s\n",
-	    $_, @{ $bans{$chan}{$_} } ));
+# format: bans: mask expire time-added count who-added reason
+	    my @array = @{ $bans{$chan}{$_} };
+	    if (scalar @array != 5) {
+		&WARN("bans: $chan/$_ is corrupted.");
+		next;
+	    }
+
+	    printf OUT "- %s:+%d:+%d:%d:%s:%s\n", $_, @array;
 	}
     }
     print OUT "\n" if ($cbans);
@@ -153,13 +207,17 @@ skipping.");
 	    next;
 	}
 
+	### TODO: use hash instead of array for flexibility?
 	print OUT "::$chan ignore\n";
-	&DEBUG("::$chan ignore");
 	foreach (keys %{ $ignore{$chan} }) {
-	    printf OUT "- %s:+%d:%s:%d:%s\n",
-	    $_, @{ $bans{$chan}{$_} };
-	    &DEBUG( sprintf("- %s:+%d:%s:%d:%s\n",
-		    $_, @{ $bans{$chan}{$_} } ));
+# format: ignore: mask expire time-added who-added reason
+	    my @array = @{ $ignore{$chan}{$_} };
+	    if (scalar @array != 4) {
+		&WARN("ignore: $chan/$_ is corrupted.");
+		next;
+	    }
+
+	    printf OUT "- %s:+%d:+%d:%s:%s\n", $_, @array;
 	}
     }
 
@@ -177,18 +235,31 @@ skipping.");
 #####
 
 sub readChanFile {
-    if (!open IN,"$bot_misc_dir/blootbot.chan") {
-	&ERROR("cannot erad chanfile.");
+    my $f = "$bot_state_dir/blootbot.chan";
+    if ( -f $f and -f "$f~") {
+	my $s1 = -s $f;
+	my $s2 = -s "$f~";
+
+	if ($s2 > $s1*3) {
+	    &FIXME("rCF: backup file bigger than current file.");
+	}
+    }
+
+    if (!open IN, $f) {
+	&ERROR("Cannot read chanfile ($f): $!");
 	return;
     }
 
-    $_ = <IN>;	# version string.
+    undef %chanconf;	# reset.
+
+    $_ = <IN>;		# version string.
 
     my $chan;
     while (<IN>) {
 	chop;
 
-	next if /^$/;
+	next if /^\s*$/;
+	next if /^\// or /^\;/;	# / or ; are comment lines.
 
 	if (/^(\S+)\s*$/) {
 	    $chan	= $1;
@@ -200,9 +271,10 @@ sub readChanFile {
 	    $chanconf{$chan}{$1} = 1;
 
 	} elsif (/^[\s\t]+\-(\S+)$/) {		# bool, false.
+	    # although this is supported in run-time configuration.
 	    $chanconf{$chan}{$1} = 0;
 
-	} elsif (/^[\s\t]+(\S+)[\ss\t]+(.*)$/) {# what = val.
+	} elsif (/^[\s\t]+(\S+)[\s\t]+(.*)$/) {# what = val.
 	    $chanconf{$chan}{$1} = $2;
 
 	} else {
@@ -211,18 +283,88 @@ sub readChanFile {
     }
     close IN;
 
+    # verify configuration
+    ### TODO: check against valid params.
+    foreach $chan (keys %chanconf) {
+	foreach (keys %{ $chanconf{$chan} }) {
+	    next unless /^[+-]/;
+
+	    &WARN("invalid param: chanconf{$chan}{$_}; removing.");
+	    delete $chanconf{$chan}{$_};
+	    undef $chanconf{$chan}{$_};
+	}
+    }
+
     &status("CHANFILE: Loaded: ".(scalar(keys %chanconf)-1)." chans");
 }
 
 sub writeChanFile {
-    if (!open OUT,">$bot_misc_dir/blootbot.chan") {
-	&ERROR("cannot write chanfile.");
+    if (!scalar keys %chanconf) {
+	&DEBUG("wCF: nothing to write.");
 	return;
     }
 
-    my $time		= scalar(localtime);
+    if (!open OUT,">$bot_state_dir/blootbot.chan") {
+	&ERROR("Cannot write chanfile ($bot_state_dir/blootbot.chan): $!");
+	return;
+    }
+
+    my $time		= scalar(gmtime);
     print OUT "#v1: blootbot -- $ident -- written $time\n\n";
 
+    if ($flag_quit) {
+
+	### Process 1: if defined in _default, remove same definition
+	###		from non-default channels.
+	foreach (keys %{ $chanconf{_default} }) {
+	    my $opt	= $_;
+	    my $val	= $chanconf{_default}{$opt};
+	    my @chans;
+
+	    foreach (keys %chanconf) {
+		$chan = $_;
+
+		next if ($chan eq "_default");
+		next unless (exists $chanconf{$chan}{$opt});
+		next unless ($val eq $chanconf{$chan}{$opt});
+
+		push(@chans,$chan);
+		delete $chanconf{$chan}{$opt};
+	    }
+
+	    if (scalar @chans) {
+		&DEBUG("Removed config $opt to @chans since it's defiend in '_default'");
+	    }
+	}
+
+	### Process 2: if defined in all chans but _default, set in
+	###		_default and remove all others.
+	my (%optsval, %opts);
+	foreach (keys %chanconf) {
+	    $chan = $_;
+	    next if ($chan eq "_default");
+	    my $opt;
+
+	    foreach (keys %{ $chanconf{$chan} }) {
+		$opt = $_;
+		if (exists $optsval{$opt} and $optsval{$opt} eq $chanconf{$chan}{$opt}) {
+		    $opts{$opt}++;
+		    next;
+		}
+		$optsval{$opt}	= $chanconf{$chan}{$opt};
+		$opts{$opt}	= 1;
+	    }
+	}
+
+	foreach (keys %opts) {
+	    next unless ($opts{$_} > 2);
+	    &DEBUG("  opts{$_} => $opts{$_}");
+	}
+
+	### other optimizations are in UserDCC.pl
+    }
+
+    ### lets do it...
     foreach (sort keys %chanconf) {
 	$chan	= $_;
 
@@ -261,10 +403,14 @@ sub writeChanFile {
 ##### USER COMMANDS.
 #####
 
+# TODO: support multiple flags.
+# TODO: return all flags for opers
 sub IsFlag {
     my $flags = shift;
     my ($ret, $f, $o) = "";
 
+    &verifyUser($who, $nuh);
+
     foreach $f (split //, $users{$userHandle}{FLAGS}) {
 	foreach $o ( split //, $flags ) {
 	    next unless ($f eq $o);
@@ -279,22 +425,28 @@ sub IsFlag {
 
 sub verifyUser {
     my ($nick, $lnuh) = @_;
-    my ($user,$m);
+    my ($user, $m);
+
+    if ($userHandle = $dcc{'CHATvrfy'}{$who}) {
+	&VERB("vUser: cached auth for $who.",2);
+	return $userHandle;
+    }
 
     $userHandle = "";
 
     foreach $user (keys %users) {
 	next if ($user eq "_default");
 
-	foreach $m (keys %{$users{$user}{HOSTS}}) {
+	foreach $m (keys %{ $users{$user}{HOSTS} }) {
 	    $m =~ s/\?/./g;
 	    $m =~ s/\*/.*?/g;
 	    $m =~ s/([\@\(\)\[\]])/\\$1/g;
 
 	    next unless ($lnuh =~ /^$m$/i);
 
-	    if ($user !~ /^\Q$nick\E$/i) {
+	    if ($user !~ /^\Q$nick\E$/i and !exists $cache{VUSERWARN}{$user}) {
 		&status("vU: host matched but diff nick ($nick != $user).");
+		$cache{VUSERWARN}{$user} = 1;
 	    }
 
 	    $userHandle = $user;
@@ -303,12 +455,14 @@ sub verifyUser {
 
 	last if ($userHandle ne "");
 
-	if ($user =~ /^\Q$nick\E$/i) {
+	if ($user =~ /^\Q$nick\E$/i and !exists $cache{VUSERWARN}{$user}) {
 	    &status("vU: nick matched but host is not in list ($lnuh).");
+	    $cache{VUSERWARN}{$user} = 1;
 	}
     }
 
     $userHandle ||= "_default";
+    # what's talkchannel for?
     $talkWho{$talkchannel} = $who if (defined $talkchannel);
     $talkWho = $who;
 
@@ -324,9 +478,14 @@ sub ckpasswd {
     return 0 unless ($plain ne "" and $encrypted ne "");
 
     # MD5 // DES. Bobby Billingsley++.
-    my $salt = substr($encrypted, 0, 2);
-    if ($encrypted =~ /^\$\d\$(\w\w)\$/) {
+    my $salt;
+    if ($encrypted =~ /^(\S{2})/ and length $encrypted == 13) {
+	$salt = $1;
+    } elsif ($encrypted =~ /^\$\d\$(\w\w)\$/) {
 	$salt = $1;
+    } else {
+	&DEBUG("unknown salt from $encrypted.");
+	return 0;
     }
 
     return ($encrypted eq crypt($plain, $salt));
@@ -345,6 +504,7 @@ sub hasFlag {
     }
 }
 
+# expire is time in minutes
 sub ignoreAdd {
     my($mask,$chan,$expire,$comment) = @_;
 
@@ -354,19 +514,29 @@ sub ignoreAdd {
     my $count	||= 0;
 
     if ($expire > 0) {
-	$expire		= $expire*60 + time();
+	$expire		= ($expire*60) + time();
     } else {
 	$expire		= 0;
     }
 
-    $ignore{$chan}{$mask} = [$expire, $count, $who, time(), $comment];
+    my $exist	= 0;
+    $exist++ if (exists $ignore{$chan}{$mask});
 
-    if (exists $ignore{$chan}{$mask}) {
-	return 0;
+    $ignore{$chan}{$mask} = [$expire, time(), $who, $comment];
+
+    # TODO: improve this.
+    if ($expire == 0) {
+	&status("ignore: Added $mask for $chan to NEVER expire, by $who, for $comment");
     } else {
+	&status("ignore: Added $mask for $chan to expire $expire mins, by $who, for $comment");
+    }
+
+    if ($exist) {
 	$utime_userfile = time();
 	$ucount_userfile++;
 
+	return 2;
+    } else {
 	return 1;
     }
 }
@@ -405,8 +575,12 @@ sub userAdd {
     $utime_userfile = time();
     $ucount_userfile++;
 
-    $users{$nick}{HOSTS}{$mask} = 1;
-    $users{$nick}{FLAGS}	= $users{_default}{FLAGS};
+    if (defined $mask and $mask !~ /^\s*$/) {
+	&DEBUG("userAdd: mask => $mask");
+	$users{$nick}{HOSTS}{$mask} = 1;
+    }
+
+    $users{$nick}{FLAGS}	||= $users{_default}{FLAGS};
 
     return 1;
 }
@@ -438,8 +612,21 @@ sub banAdd {
 
     my $exist	= 1;
     $exist++ if (exists $bans{$chan}{$mask} or
-		exists $bans{_default}{$mask});
-    $bans{$chan}{$mask} = [$expire, 0, $who, time(), $reason];
+		exists $bans{'*'}{$mask});
+    $bans{$chan}{$mask} = [$expire, time(), 0, $who, $reason];
+
+    my @chans	= ($chan eq "*") ? keys %channels : $chan;
+    my $m	= $mask;
+    $m		=~ s/\?/\\./g;
+    $m		=~ s/\*/\\S*/g;
+    foreach (@chans) {
+	my $chan = $_;
+	foreach (keys %{ $channels{$chan}{''} }) {
+	    next unless (exists $nuh{lc $_});
+	    next unless ($nuh{lc $_} =~ /^$m$/i);
+	    &FIXME("nuh{$_} =~ /$m/");
+	}
+    }
 
     if ($exist == 1) {
 	$utime_userfile = time();
@@ -503,16 +690,155 @@ sub getUser {
     }
 }
 
-my @regFlagsChan = (
-	"autojoin",
-	"freshmeat",
-	"limitcheckInterval",
-	"limitcheckPlus",
-	"allowConv",
-	"allowDNS",
-### TODO: finish off this list.
-);
+sub chanSet {
+    my($cmd, $chan, $what, $val) = @_;
+
+    if ($cmd eq "+chan") {
+	if (exists $chanconf{$chan}) {
+	    &performStrictReply("chan $chan already exists.");
+	    return;
+	}
+	$chanconf{$chan}{_time_added}	= time();
+	$chanconf{$chan}{autojoin}	= $conn->nick();
+
+	&performStrictReply("Joining $chan...");
+	&joinchan($chan);
+
+	return;
+    }
+
+    if (!exists $chanconf{$chan}) {
+	&performStrictReply("no such channel $chan");
+	return;
+    }
+
+    my $update	= 0;
+
+    if (defined $what and $what =~ s/^([+-])(\S+)/$2/) {
+	### ".chanset +blah"
+	### ".chanset +blah 10"		-- error.
+
+	my $set	= ($1 eq "+") ? 1 : 0;
+	my $was		= $chanconf{$chan}{$what};
+
+	if ($set) {			# add/set.
+	    if (defined $was and $was eq "1") {
+		&performStrictReply("setting $what for $chan already 1.");
+		return;
+	    }
+
+	    $val	= 1;
+
+	} else {			# delete/unset.
+	    if (!defined $was) {
+		&performStrictReply("setting $what for $chan is not set.");
+		return;
+	    }
+
+	    $val	= 0;
+	}
+
+	# alter for cosmetic (print out) reasons only.
+	$was	= (defined $was) ? "; was '$was'" : "";
+
+	if ($val eq "0") {
+	    &performStrictReply("Unsetting $what for $chan$was.");
+	    delete $chanconf{$chan}{$what};
+	} else {
+	    &performStrictReply("Setting $what for $chan to '$val'$was.");
+	    $chanconf{$chan}{$what}	= $val;
+	}
+
+	$update++;
 
-my @regFlagsUser = ("mno");	# todo...
+    } elsif (defined $val) {
+	### ".chanset blah testing"
+
+	my $was	= $chanconf{$chan}{$what};
+	if (defined $was and $was eq $val) {
+	    &performStrictReply("setting $what for $chan already '$val'.");
+	    return;
+	}
+	$was	= ($was) ? "; was '$was'" : "";
+	&performStrictReply("Setting $what for $chan to '$val'$was.");
+
+	$chanconf{$chan}{$what} = $val;
+
+	$update++;
+
+    } else {				# read only.
+	### ".chanset"
+	### ".chanset blah"
+
+	if (!defined $what) {
+	    &WARN("chanset/DC: what == undefine.");
+	    return;
+	}
+
+	if (exists $chanconf{$chan}{$what}) {
+	    &performStrictReply("$what for $chan is '$chanconf{$chan}{$what}'");
+	} else {
+	    &performStrictReply("$what for $chan is not set.");
+	}
+    }
+
+    if ($update) {
+	$utime_chanfile = time();
+	$ucount_chanfile++;
+    }
+
+    return;
+}
+
+sub rehashConfVars {
+    # this is an attempt to fix where an option is enabled but the module
+    # has been not loaded. it also can be used for other things.
+
+    foreach (keys %{ $cache{confvars} }) {
+	my $i = $cache{confvars}{$_};
+	&DEBUG("rehashConfVars: _ => $_");
+
+	if (/^news$/ and $i) {
+	    &loadMyModule('News');
+	    delete $cache{confvars}{$_};
+	}
+
+	if (/^uptime$/ and $i) {
+	    &loadMyModule('Uptime');
+	    delete $cache{confvars}{$_};
+	}
+
+	if (/^rootwarn$/i and $i) {
+	    &loadMyModule('RootWarn');
+	    delete $cache{confvars}{$_};
+	}
+
+	if (/^onjoin$/i and $i) {
+	    &loadMyModule('OnJoin');
+	    delete $cache{confvars}{$_};
+	}
+    }
+
+    &DEBUG("end of rehashConfVars");
+
+    delete $cache{confvars};
+}
+
+my @regFlagsUser = (
+	# possible chars to include in FLAG
+	"A",	# bot administration over /msg
+			# default is only via DCC CHAT
+	"O",	# dynamic ops (as on channel). (automatic +o)
+	"T",	# add topics.
+	"a",	# ask/request factoid.
+	"m",	# modify factoid. (includes renaming)
+	"n",	# bot owner, can "reload"
+	"o",	# master of bot (automatic +amrt)
+			# can search on factoid strings shorter than 2 chars
+			# can tell bot to join new channels
+			# can [un]lock factoids
+	"r",	# remove factoid.
+	"t",	# teach/add factoid.
+);
 
 1;