@@ -1,4 +1,4 @@ -CGI:IRC - http://cgiirc.sourceforge.net/ +CGI:IRC - http://cgiirc.org/ ---------------------------------------- CGI:IRC is a Perl/CGI program that lets you access IRC from a web browser, it README @@ -1,5 +1,8 @@ +fcgi_socket = /tmp/cgiirc-fcgi +prerequire_interfaces = 1 +default_server = 192.168.1.1 # This is the default configuration file for CGI:IRC 0.5 -# See http://cgiirc.sourceforge.net/docs/config.php for help editing it. +# See http://cgiirc.org/docs/config.php for help editing it. # If you want to allow the use of multiple servers or enable more # advanced options please copy cgiirc.config.full over this file, @@ -7,7 +10,7 @@ # Set the server(s) that access is allowed to, to allow more than one entry # seperate the servers with commas. -default_server = irc.blitzed.org +#default_server = irc.blitzed.org default_port = 6667 # Channel(s) to allow access to, a comma seperated list default_channel = #cgiirc cgiirc.config @@ -1,6 +1,6 @@ # This is the full access CGI:IRC 0.5 config file # It will allow access to *all* servers and channels -# See http://cgiirc.sourceforge.net/docs/config.php for help editing it. +# See http://cgiirc.org/docs/config.php for help editing it. # ----- # These are the default settings to show on the login form @@ -159,7 +159,7 @@ session_timeout = 18000 #dnsbl = opm.blitzed.org # Redirect to a different URL (eg. custom login form) instead of the default. -#form_redirect = http://cgiirc.sourceforge.net/docs/custom.php +#form_redirect = http://cgiirc.org/docs/custom.php # List of URLs (seperated with ,) which this copy of CGI:IRC should # balance requests over. All the URLs should be within the domain set for cgiirc.config.full @@ -1,5 +1,5 @@ #! /usr/bin/perl -w -# CGI:IRC - http://cgiirc.sourceforge.net/ +# CGI:IRC - http://cgiirc.org/ # Copyright (C) 2000-2006 David Leadbeater <cgiirc@dgl.cx> # vim:set ts=3 expandtab shiftwidth=3 cindent: @@ -25,7 +25,7 @@ use vars qw($VERSION $PREFIX); $PREFIX = "/tmp/cgiirc-"; ($VERSION = -'$Name: $ 0_5_CVS $Id: client-perl.cgi,v 1.10 2006/04/30 16:09:28 dgl Exp $' +'$Name: $ 0_5_CVS $Id: client-perl.cgi,v 1.11 2007/05/06 01:05:35 dgl Exp $' ) =~ s/^.*?(\d\S+) .*$/$1/; $VERSION =~ s/_/./g; client-perl.cgi @@ -48,4 +48,4 @@ There are several shortcuts to help make using CGI:IRC nicer. <h3>About CGI:IRC</h3> CGI:IRC is written in Perl by David Leadbeater with help from lots of people. See the <a - href="http://cgiirc.sourceforge.net/" target="cgiirc-web">website</a> for more information. + href="http://cgiirc.org/" target="cgiirc-web">website</a> for more information. docs/help.html @@ -50,5 +50,5 @@ <h3>О программе CGI:IRC</h3> CGI:IRC написан на Perl David'ом Leadbeater'ом в соавторстве с другими. Смотрите <a - href="http://cgiirc.sourceforge.net/" target="cgiirc-web">эту страничку</a> для дополнительной + href="http://cgiirc.org/" target="cgiirc-web">эту страничку</a> для дополнительной информации. docs/help.ru.html @@ -1,5 +1,5 @@ #!/usr/bin/perl -# CGI:IRC - http://cgiirc.sourceforge.net/ +# CGI:IRC - http://cgiirc.org/ # Copyright (C) 2000-2002 David Leadbeater <http://contact.dgl.cx/> # vim:set ts=3 expandtab shiftwidth=3 cindent: @@ -22,7 +22,7 @@ use vars qw($VERSION); use Socket; ($VERSION = - '$Name: $ 0_5_CVS $Id: viewconnects.pl,v 1.4 2005/01/06 00:44:18 dgl Exp $' + '$Name: $ 0_5_CVS $Id: viewconnects.pl,v 1.5 2007/05/06 01:05:35 dgl Exp $' ) =~ s/^.*?(\d\S+) .*$/$1/; $VERSION =~ s/_/./g; docs/viewconnects.pl @@ -3,7 +3,7 @@ use vars qw/$standardheader/; use strict; $standardheader = <<EOF;  interfaces/default.pm @@ -5,7 +5,7 @@ use strict; use vars qw/@ISA $standardheader/; $standardheader = <<EOF;  @@ -436,7 +436,7 @@ print q~ <script language="JavaScript">  interfaces/interface-make/main.pm @@ -5,7 +5,7 @@ use strict; use vars qw/@ISA $standardheader/; $standardheader = <<EOF;  @@ -437,7 +437,7 @@ print q~ <script language="JavaScript">  @@ -437,7 +437,7 @@ print q~ <script language="JavaScript">  @@ -167,7 +167,7 @@ sub error { sub help { my($self) = shift; - $self->line("Full help can be found at http://cgiirc.sourceforge.net/docs/usage.php"); + $self->line("Full help can be found at http://cgiirc.org/docs/usage.php"); } sub frameset { interfaces/nonjs.pm @@ -4,7 +4,7 @@ use vars qw/@ISA $standardheader/; $standardheader = <<EOF;  interfaces/opera.pm @@ -5,7 +5,7 @@ use strict; use vars qw/@ISA $standardheader/; $standardheader = <<EOF;  @@ -437,7 +437,7 @@ print q~ <script language="JavaScript"> <!-- // This javascript code is released under the same terms as CGI:IRC itself -// http://cgiirc.sourceforge.net/ +// http://cgiirc.org/ // Copyright (C) 2000-2003 David Leadbeater <cgiirc\@dgl.cx> // none joins talk directed talk interfaces/opera7.pm @@ -1,5 +1,5 @@ #!/usr/bin/perl -# CGI:IRC - http://cgiirc.sourceforge.net/ +# CGI:IRC - http://cgiirc.org/ # Copyright (C) 2000-2006 David Leadbeater <http://contact.dgl.cx/> # vim:set ts=3 expandtab shiftwidth=3 cindent: @@ -26,7 +26,7 @@ use lib qw/modules interfaces/; no warnings 'uninitialized'; ($VERSION = - '$Name: $ 0_5_CVS $Id: irc.cgi,v 1.42 2007/02/05 13:43:17 dgl Exp $' + '$Name: $ 0_5_CVS $Id: irc.cgi,v 1.43 2007/05/06 01:05:35 dgl Exp $' ) =~ s/^.*?(\d\S+) .*?(\d{4}\/\S+) .*$/$1/; $VERSION .= " ($2)"; $VERSION =~ s/_/./g; @@ -63,7 +63,7 @@ print join("\r\n", # Please leave this. my $copy = <<EOF; -<a href="http://cgiirc.sourceforge.net/">CGI:IRC</a> $VERSION<br /> +<a href="http://cgiirc.org/">CGI:IRC</a> $VERSION<br /> EOF my $scriptname = $config->{script_login} || 'irc.cgi'; irc.cgi @@ -1,5 +1,5 @@ #!/usr/bin/perl -# CGI:IRC - http://cgiirc.sourceforge.net/ +# CGI:IRC - http://cgiirc.org/ # Copyright (C) 2000-2006 David Leadbeater <http://contact.dgl.cx/> # vim:set ts=3 expandtab shiftwidth=3 cindent: @@ -32,7 +32,7 @@ use vars qw( ); ($VERSION = -'$Name: $ 0_5_CVS $Id: nph-irc.cgi,v 1.121 2006/09/26 22:14:48 dgl Exp $' +'$Name: $ 0_5_CVS $Id: nph-irc.cgi,v 1.122 2007/05/06 01:05:35 dgl Exp $' ) =~ s/^.*?(\d\S+) .*?(\d{4}\/\S+) .*$/$1/; $VERSION .= " ($2)"; $VERSION =~ s/_/./g; @@ -69,13 +69,6 @@ for('docs/', '/usr/share/doc/cgiirc/') { } my $needtodie = 0; -$SIG{HUP} = $SIG{INT} = $SIG{TERM} = sub { $needtodie = 1 }; -# Pipe isn't bad.. -$SIG{PIPE} = 'IGNORE'; - -$SIG{__DIE__} = sub { - error("Program ending: @_"); -}; # DEBUG #use Carp; @@ -1098,10 +1091,11 @@ sub error { #### Init -sub init { +sub global_init { $timer = new Timer; $event = new Event; $timer->addforever(interval => 15, code => \&interface_keepalive); + $timer->addforever(interval => 30, code => \&session_timeout); $event->add('irc out', code => \&irc_out); $event->add('unhandled', code => \&irc_event); $event->add('server connected', code => \&irc_connected); @@ -1113,10 +1107,30 @@ sub init { $config->{access_command} = '!quote' unless exists $config->{access_command}; $config->{format} ||= 'default'; - $timer->addforever(interval => 30, code => \&session_timeout); + format_init_smilies(); + + if(config_set('login secret')) { + require Digest::MD5; + } + + if(config_set('prerequire_interfaces')) { + for my $iface(<./interfaces/*.pm>) { + require($iface); + } + } +} + +sub init { + # Set up some sig handlers.. + $SIG{HUP} = $SIG{INT} = $SIG{TERM} = sub { $needtodie = 1 }; + # Pipe isn't bad.. + $SIG{PIPE} = 'IGNORE'; + + $SIG{__DIE__} = sub { + error("Program ending: @_"); + }; $cgi = parse_query($ENV{QUERY_STRING}); - format_init_smilies(); $format = load_format($cgi->{format}); $cookie = parse_cookie(); @@ -1141,7 +1155,6 @@ sub init { $interface = load_interface(); if(config_set('login secret')) { - require Digest::MD5; my $token = Digest::MD5::md5_hex($cgi->{time} . $config->{'login secret'} . $cgi->{R}); if($token ne $cgi->{token}) { @@ -1295,6 +1308,91 @@ sub main_loop { } } -init(); -main_loop(); +global_init(); + +if(config_set('fcgi_socket')) { + # FastCGI external server mode + my $running = 1; + + require FCGI; + die "FCGI module required for FCGI mode\n" if $@; + + my $fcgi = FCGI::OpenSocket($config->{fcgi_socket}, 10); + die "FCGI open failed: $!\n" unless $fcgi; + + # Just so the child can get rid of it easily. + my $fcgi_fh; + open($fcgi_fh, "<&=$fcgi") or die "FCGI re-open() failed\n"; + + my $request = FCGI::Request(\*STDIN, \*STDOUT, \*STDERR, \%ENV, $fcgi); + + # This isn't great, as we'll accept once more, but this is good enough for + # now, hopefully. + $SIG{USR1} = sub { + $request->LastCall; + $running = 0; + }; + + $SIG{HUP} = sub { + $config = parse_config($config_path . 'cgiirc.config'); + }; + + # XXX: need to do this properly for non-Linux + $SIG{CHLD} = 'IGNORE'; + + # Due to the FCGI API sucking we can't easily call accept in the parent and + # then fork, so we do it in a child. This probably gives us a tiny speed + # increase due to pre-forking too. + + my($parentfh, $childfh); + pipe($parentfh, $childfh); + + while($running) { + my $pid = fork; + if($pid) { + # parent - wait for child to accept a connection + my $tmp; + my $ret = sysread($parentfh, $tmp, 1); + if($ret != 1) { + # Really shouldn't happen, just delay things to hopefully make this + # less of a fork bomb. + print STDERR "Read returned $ret ($!) from child, sleeping 10s\n"; + sleep 10; + } else { + my $accept_ret = unpack("c", $tmp); + if($accept_ret < 0) { + # XXX: maybe try to reopen socket or something? + print STDERR "Child accept got $accept_ret, sleeping 10s\n"; + sleep 10; + } else { + #print "Accepted new client..\n"; + } + } + } elsif($pid == 0) { + # child + close $parentfh; + + # Wait to accept something + my $ret = $request->Accept; + syswrite($childfh, pack("c", $ret)); + # up to here should be fast, as the write limits the speed of the + # accept loop + exit if $ret < 0; + close $fcgi_fh; + close $childfh; + + init(); + main_loop(); + exit(1); + } else { + # uh-oh, failed, wait a bit for things to calm down + print STDERR "Fork failed\n"; + sleep 10; + } + } +} else { + # Normal CGI + init(); + main_loop(); +} nph-irc.cgi 1144032f8403f3f851584002273b3d4262e44438 dgl dgl http://github.com/dgl/cgiirc/commit/d659ba117bda5aafc92172608c62be5e5f4064d2 d659ba117bda5aafc92172608c62be5e5f4064d2

2007-05-05T18:05:35-07:00

Update stuff to point at cgiirc.org d36556696d20fa5fde499d00bd72cad9a933f399 dgl dgl