From 98164f29620d794e321f827b9535545ca60c56b2 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 30 Mar 2009 07:38:20 +0000
Subject: [PATCH] new qnet auth

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6357 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 server/rcon2irc/rbiserver.pl          |  4 ++++
 server/rcon2irc/rcon2irc-example.conf |  1 +
 server/rcon2irc/rcon2irc.pl           | 31 +++++++++++++++++++++++----
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/server/rcon2irc/rbiserver.pl b/server/rcon2irc/rbiserver.pl
index 1d9207a44..8b4908865 100644
--- a/server/rcon2irc/rbiserver.pl
+++ b/server/rcon2irc/rbiserver.pl
@@ -98,6 +98,10 @@ sub markmap($$$$;$)
 			next if $l[9] < time() - 60; # too old
 			print "Cleaning up demos: protecting $_\n";
 			chmod 0444, $_;
+			open my $fh, ">", "$_.nick";
+			printf $fh "%s\n", color_dp2none($store{"playernickraw_byid_$id"});
+			close $fh;
+			chmod 0444, "$_.nick";
 		}
 	}
 	else
diff --git a/server/rcon2irc/rcon2irc-example.conf b/server/rcon2irc/rcon2irc-example.conf
index d836287dc..5cc2068b4 100644
--- a/server/rcon2irc/rcon2irc-example.conf
+++ b/server/rcon2irc/rcon2irc-example.conf
@@ -31,6 +31,7 @@ irc_channel = #Nexuiz-Pwayers
 #dp_status_delay = 30
 #irc_reconnect_delay = 300
 #irc_admin_timeout = 3600
+#irc_admin_quote_re =
 #irc_local = 141.2.16.23
 #irc_ping_delay = 120
 #irc_nickserv_identify = PRIVMSG NickServ :IDENTIFY %2$s
diff --git a/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl
index ee664f220..d79562bee 100755
--- a/server/rcon2irc/rcon2irc.pl
+++ b/server/rcon2irc/rcon2irc.pl
@@ -305,7 +305,7 @@ sub new($$)
 		(length($local) ? (LocalAddr => $local) : ()),
 		PeerAddr => $remote,
 		PeerPort => $defaultport
-	) or die "socket $proto/$local/$remote: $!";
+	) or die "socket $proto/$local/$remote/$defaultport: $!";
 	$sock->blocking(0);
 	my $you = {
 		# Mortal fool! Release me from this wretched tomb! I must be set free
@@ -621,7 +621,8 @@ package main;
 use strict;
 use warnings;
 use IO::Select;
-use Digest::MD5;
+use Digest::SHA;
+use Digest::HMAC;
 use Time::HiRes qw/time/;
 
 our @handlers = (); # list of [channel, expression, sub to handle result]
@@ -660,6 +661,7 @@ our %config = (
 
 	irc_admin_password => "",
 	irc_admin_timeout => 3600,
+	irc_admin_quote_re => "",
 
 	irc_reconnect_delay => 300,
 
@@ -940,9 +942,13 @@ sub irc_joinstage($)
 	{
 		if(defined $store{irc_quakenet_challenge})
 		{
-			if($store{irc_quakenet_challenge} =~ /^MD5 (.*)/)
+			if($store{irc_quakenet_challenge} =~ /^([0-9a-f]*)\b.*\bHMAC-SHA-256\b/)
 			{
-				out irc => 1, "$config{irc_quakenet_challengeauth} $config{irc_quakenet_authname} " . Digest::MD5::md5_hex("$config{irc_quakenet_password} $1");
+				my $challenge = $1;
+				my $hash1 = Digest::SHA::sha256_hex(substr $config{irc_quakenet_password}, 0, 10);
+				my $key = Digest::SHA::sha256_hex("@{[lc $config{irc_quakenet_authname}]}:$hash1");
+				my $digest = Digest::HMAC::hmac_hex($challenge, $key, \&Digest::SHA::sha256);
+				out irc => 1, "$config{irc_quakenet_challengeauth} $config{irc_quakenet_authname} $digest HMAC-SHA-256";
 			}
 		}
 		else
@@ -1165,6 +1171,21 @@ sub cond($)
 			return 0;
 		}
 
+		if($command =~ /^quote (.*)$/)
+		{
+			my ($cmd) = ($1);
+			if($cmd =~ /^(??{$config{irc_admin_quote_re}})$/si)
+			{
+				out irc => 0, $cmd;
+				out irc => 0, "PRIVMSG $nick :executed your command";
+			}
+			else
+			{
+				out irc => 0, "PRIVMSG $nick :permission denied";
+			}
+			return 0;
+		}
+
 		out irc => 0, "PRIVMSG $nick :unknown command (supported: status [substring], kick # id reason, kickban # id bantime mask reason, bans, unban banid)";
 
 		return -1;
@@ -1271,6 +1292,7 @@ sub cond($)
 	# chat: Nexuiz server -> IRC channel, nick set
 	[ dp => q{:join:(\d+):(\d+):([^:]*):(.*)} => sub {
 		my ($id, $slot, $ip, $nick) = @_;
+		$store{"playernickraw_byid_$id"} = $nick;
 		$nick = color_dp2irc $nick;
 		$store{"playernick_byid_$id"} = $nick;
 		$store{"playerip_byid_$id"} = $ip;
@@ -1282,6 +1304,7 @@ sub cond($)
 	# chat: Nexuiz server -> IRC channel, nick change/set
 	[ dp => q{:name:(\d+):(.*)} => sub {
 		my ($id, $nick) = @_;
+		$store{"playernickraw_byid_$id"} = $nick;
 		$nick = color_dp2irc $nick;
 		my $oldnick = $store{"playernick_byid_$id"};
 		out irc => 0, "PRIVMSG $config{irc_channel} :* $oldnick\017 is now known as $nick";
-- 
2.39.2