# the same terms as Perl itself.
use strict;
-use subs qw(pick_server);
+use subs qw(suidsetup pick_server);
use CGI;
use CGI::Carp qw(fatalsToBrowser);
-use Digest::MD5;
+use Digest::MD5 qw(md5_hex);
+use DBI;
use Net::SSH qw(ssh);
+suidsetup();
+
# pull in configuration
use vars qw($dsn $user $pass $mp3path $port);
use vars qw($override_query $fileno_query);
$dbh->disconnect;
#generate a mountpoint
-my $mountpoint = md5_hex($cgi->remote_host. $$. time. int(rand(4294967296)));
+md5_hex($cgi->remote_host. $$. time. int(rand(4294967296))) =~ /^(\w+)$/;
+my $mountpoint = $1;
#signal encoder to start streaming to mountpoint & wait for confirmation
-ssh($server, 'yashout', $filename, $mountpoint );
+warn "ssh $server yashout $filename $mountpoint $port\n";
+ssh($server, 'yashout', $filename, $mountpoint, $port );
#send file back to client browser
print $cgi->header( -type => $extension2type{$extension} );
-print "[playlist]\nNumberOfEntries=1\n" if $extension eq 'pls';
+print "[playlist]\nNumberOfEntries=1\nFile1=" if $extension eq 'pls';
print "http://$server:$port/$mountpoint\n";
###
# subroutiens
###
+sub suidsetup {
+ $ENV{'PATH'} ='/usr/local/bin:/usr/bin:/usr/ucb:/bin';
+ $ENV{'SHELL'} = '/bin/sh';
+ $ENV{'IFS'} = " \t\n";
+ $ENV{'CDPATH'} = '';
+ $ENV{'ENV'} = '';
+ $ENV{'BASH_ENV'} = '';
+
+ $< = $>; #correct uid for spawned ssh process
+}
+
sub pick_server {
my $sth = $dbh->prepare(
"SELECT servername FROM iceplex_servers ".