X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FDynaConfig.pl;h=f4ba9c3f207fd3d489a62a3672921fa5b480e471;hb=748d5127824d8a9de7d6fd59d6dbb05607cc107a;hp=0a83d217a2393e4821340e8ca14b9be2935e9766;hpb=f6e661b58c45065e76cc82381745fd96dacb72f2;p=infobot.git

diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl
index 0a83d21..f4ba9c3 100644
--- a/src/DynaConfig.pl
+++ b/src/DynaConfig.pl
@@ -6,22 +6,45 @@
 #	   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 %ingore;	# reset.
+    undef %ignore;	# reset.
 
     my $ver = <IN>;
     if ($ver !~ /^#v1/) {
@@ -46,6 +69,11 @@ sub readUserFile {
 		next;
 	    }
 
+	    if (!defined $nick) {
+		&WARN("DynaConfig: invalid line: $_");
+		next;
+	    }
+
 	    # nice little hack.
 	    if ($what eq "HOSTS") {
 		$users{$nick}{$what}{$val} = 1;
@@ -96,12 +124,17 @@ sub readUserFile {
 }
 
 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";
 
@@ -127,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";
 	    }
@@ -200,8 +235,18 @@ sub writeUserFile {
 #####
 
 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;
     }
 
@@ -213,7 +258,8 @@ sub readChanFile {
     while (<IN>) {
 	chop;
 
-	next if /^$/;
+	next if /^\s*$/;
+	next if /^\// or /^\;/;	# / or ; are comment lines.
 
 	if (/^(\S+)\s*$/) {
 	    $chan	= $1;
@@ -225,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 {
@@ -240,7 +287,8 @@ sub readChanFile {
     ### TODO: check against valid params.
     foreach $chan (keys %chanconf) {
 	foreach (keys %{ $chanconf{$chan} }) {
-	    next unless (/^[+-]/);
+	    next unless /^[+-]/;
+
 	    &WARN("invalid param: chanconf{$chan}{$_}; removing.");
 	    delete $chanconf{$chan}{$_};
 	    undef $chanconf{$chan}{$_};
@@ -251,12 +299,17 @@ sub readChanFile {
 }
 
 sub writeChanFile {
-    if (!open OUT,">$bot_misc_dir/blootbot.chan") {
-	&ERROR("cannot write chanfile.");
+    if (!scalar keys %chanconf) {
+	&DEBUG("wCF: nothing to write.");
+	return;
+    }
+
+    if (!open OUT,">$bot_state_dir/blootbot.chan") {
+	&ERROR("Cannot write chanfile ($bot_state_dir/blootbot.chan): $!");
 	return;
     }
 
-    my $time		= scalar(localtime);
+    my $time		= scalar(gmtime);
     print OUT "#v1: blootbot -- $ident -- written $time\n\n";
 
     if ($flag_quit) {
@@ -274,6 +327,7 @@ sub writeChanFile {
 		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};
 	    }
@@ -302,8 +356,8 @@ sub writeChanFile {
 	    }
 	}
 
-	&DEBUG("chans => ".scalar(keys %chanconf)." - 1");
 	foreach (keys %opts) {
+	    next unless ($opts{$_} > 2);
 	    &DEBUG("  opts{$_} => $opts{$_}");
 	}
 
@@ -349,6 +403,8 @@ sub writeChanFile {
 ##### USER COMMANDS.
 #####
 
+# TODO: support multiple flags.
+# TODO: return all flags for opers
 sub IsFlag {
     my $flags = shift;
     my ($ret, $f, $o) = "";
@@ -369,7 +425,7 @@ 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);
@@ -381,7 +437,7 @@ sub verifyUser {
     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;
@@ -422,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));
@@ -443,6 +504,7 @@ sub hasFlag {
     }
 }
 
+# expire is time in minutes
 sub ignoreAdd {
     my($mask,$chan,$expire,$comment) = @_;
 
@@ -452,7 +514,7 @@ sub ignoreAdd {
     my $count	||= 0;
 
     if ($expire > 0) {
-	$expire		= $expire*60 + time();
+	$expire		= ($expire*60) + time();
     } else {
 	$expire		= 0;
     }
@@ -462,6 +524,13 @@ sub ignoreAdd {
 
     $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++;
@@ -506,7 +575,11 @@ sub userAdd {
     $utime_userfile = time();
     $ucount_userfile++;
 
-    $users{$nick}{HOSTS}{$mask} = 1;
+    if (defined $mask and $mask !~ /^\s*$/) {
+	&DEBUG("userAdd: mask => $mask");
+	$users{$nick}{HOSTS}{$mask} = 1;
+    }
+
     $users{$nick}{FLAGS}	||= $users{_default}{FLAGS};
 
     return 1;
@@ -542,6 +615,19 @@ sub banAdd {
 		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();
 	$ucount_userfile++;
@@ -609,121 +695,150 @@ sub chanSet {
 
     if ($cmd eq "+chan") {
 	if (exists $chanconf{$chan}) {
-	    &pSReply("chan $chan already exists.");
+	    &performStrictReply("chan $chan already exists.");
 	    return;
 	}
 	$chanconf{$chan}{_time_added}	= time();
-	$chanconf{$what}{autojoin}	= 1;
+	$chanconf{$chan}{autojoin}	= $conn->nick();
 
-	&pSReply("Joining $chan...");
+	&performStrictReply("Joining $chan...");
 	&joinchan($chan);
 
 	return;
     }
 
     if (!exists $chanconf{$chan}) {
-	&pSReply("no such channel $chan");
+	&performStrictReply("no such channel $chan");
 	return;
     }
 
     my $update	= 0;
 
-    if (defined $what and $what =~ s/^\+(\S+)/$1/) {
-	my $was	= $chanconf{$chan}{$1};
-	if (defined $was and $was eq "1") {
-	    &pSReply("setting $what for $chan already 1.");
-	    return;
-	}
+    if (defined $what and $what =~ s/^([+-])(\S+)/$2/) {
+	### ".chanset +blah"
+	### ".chanset +blah 10"		-- error.
 
-	$was	= ($was) ? "; was '$was'" : "";
-	&pSReply("Setting $what for $chan to '1'$was.");
+	my $set	= ($1 eq "+") ? 1 : 0;
+	my $was		= $chanconf{$chan}{$what};
 
-	$chanconf{$chan}{$what} = 1;
+	if ($set) {			# add/set.
+	    if (defined $was and $was eq "1") {
+		&performStrictReply("setting $what for $chan already 1.");
+		return;
+	    }
 
-	$update++;
-    } elsif (defined $what and $what =~ s/^\-(\S+)/$1/) {
-	my $was	= $chanconf{$chan}{$1};
-	# hrm...
-	if (!defined $was) {
-	    &pSReply("setting $what for $chan is not set.");
-	    return;
-	}
+	    $val	= 1;
 
-	if ($was eq "0") {
-	    &pSReply("setting $what for $chan already 0.");
-	    return;
+	} else {			# delete/unset.
+	    if (!defined $was) {
+		&performStrictReply("setting $what for $chan is not set.");
+		return;
+	    }
+
+	    $val	= 0;
 	}
 
-	$was	= ($was) ? "; was '$was'" : "";
-	&pSReply("Setting $what for $chan to '0'$was.");
+	# alter for cosmetic (print out) reasons only.
+	$was	= (defined $was) ? "; was '$was'" : "";
 
-	$chanconf{$chan}{$what} = 0;
+	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++;
+
     } elsif (defined $val) {
+	### ".chanset blah testing"
+
 	my $was	= $chanconf{$chan}{$what};
 	if (defined $was and $was eq $val) {
-	    &pSReply("setting $what for $chan already '$val'.");
+	    &performStrictReply("setting $what for $chan already '$val'.");
 	    return;
 	}
 	$was	= ($was) ? "; was '$was'" : "";
-	&pSReply("Setting $what for $chan to '$val'$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}) {
-	    &pSReply("$what for $chan is '$chanconf{$chan}{$what}'");
+	    &performStrictReply("$what for $chan is '$chanconf{$chan}{$what}'");
 	} else {
-	    &pSReply("$what for $chan is not set.");
+	    &performStrictReply("$what for $chan is not set.");
 	}
     }
 
     if ($update) {
 	$utime_chanfile = time();
 	$ucount_chanfile++;
-	return;
     }
 
-    ### TODO: move to UserDCC again.
-    if ($cmd eq "chanset" and !defined $what) {
-	&DEBUG("showing channel conf.");
-
-	foreach $chan ($chan, "_default") {
-	    &pSReply("chan: $chan");
-	    ### TODO: merge 2 or 3 per line.
-	    my @items;
-	    my $str = "";
-	    foreach (sort keys %{ $chanconf{$chan} }) {
-		my $newstr = join(', ', @items);
-		if (length $newstr > 60) {
-		    &pSReply("    $str");
-		    @items = ();
-		}
-		$str = $newstr;
-		push(@items, "$_ => $chanconf{$chan}{$_}");
-	    }
+    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: _ => $_");
 
-	    &pSReply("    $str") if (@items);
+	if (/^news$/ and $i) {
+	    &loadMyModule('News');
+	    delete $cache{confvars}{$_};
 	}
 
-	return;
+	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}{$_};
+	}
     }
 
-    return;
+    &DEBUG("end of rehashConfVars");
+
+    delete $cache{confvars};
 }
 
-my @regFlagsChan = (
-	"autojoin",
-	"freshmeat",
-	"limitcheckInterval",
-	"limitcheckPlus",
-	"allowConv",
-	"allowDNS",
-### TODO: finish off this list.
+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.
 );
 
-my @regFlagsUser = ("mno");	# todo...
-
 1;