use strict;
use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
- $usernamemax $passwordmin $username_letter $username_letterfirst
+ $usernamemax $passwordmin $passwordmax
+ $username_ampersand $username_letter $username_letterfirst
+ $username_noperiod $username_uppercase
$shellmachine $useradd $usermod $userdel $mydomain
- @saltset @pw_set);
+ $cyrus_server $cyrus_admin_user $cyrus_admin_pass
+ $cp_server $cp_user $cp_pass $cp_workgroup
+ $dirhash
+ $icradius_dbh
+ @saltset @pw_set
+ $rsync $ssh $exportdir $vpopdir);
use Carp;
+use File::Path;
+use Fcntl qw(:flock);
+use FS::UID qw( datasrc );
use FS::Conf;
use FS::Record qw( qsearch qsearchs fields dbh );
use FS::svc_Common;
-use Net::SSH qw(ssh);
+use Net::SSH;
use FS::part_svc;
use FS::svc_acct_pop;
use FS::svc_acct_sm;
use FS::cust_main_invoice;
use FS::svc_domain;
+use FS::raddb;
+use FS::queue;
@ISA = qw( FS::svc_Common );
#ask FS::UID to run this stuff for us later
$FS::UID::callback{'FS::svc_acct'} = sub {
+ $rsync = "rsync";
+ $ssh = "ssh";
$conf = new FS::Conf;
$dir_prefix = $conf->config('home');
@shells = $conf->config('shells');
$usernamemin = $conf->config('usernamemin') || 2;
$usernamemax = $conf->config('usernamemax');
$passwordmin = $conf->config('passwordmin') || 6;
+ $passwordmax = $conf->config('passwordmax') || 8;
if ( $shellmachine ) {
if ( $conf->exists('shellmachine-useradd') ) {
$useradd = join("\n", $conf->config('shellmachine-useradd') )
}
$username_letter = $conf->exists('username-letter');
$username_letterfirst = $conf->exists('username-letterfirst');
+ $username_noperiod = $conf->exists('username-noperiod');
+ $username_uppercase = $conf->exists('username-uppercase');
+ $username_ampersand = $conf->exists('username-ampersand');
$mydomain = $conf->config('domain');
+ if ( $conf->exists('cyrus') ) {
+ ($cyrus_server, $cyrus_admin_user, $cyrus_admin_pass) =
+ $conf->config('cyrus');
+ eval "use Cyrus::IMAP::Admin;"
+ } else {
+ $cyrus_server = '';
+ $cyrus_admin_user = '';
+ $cyrus_admin_pass = '';
+ }
+ if ( $conf->exists('cp_app') ) {
+ ($cp_server, $cp_user, $cp_pass, $cp_workgroup) =
+ $conf->config('cp_app');
+ eval "use Net::APP;"
+ } else {
+ $cp_server = '';
+ $cp_user = '';
+ $cp_pass = '';
+ $cp_workgroup = '';
+ }
+ if ( $conf->exists('icradiusmachines') ) {
+ if ( $conf->exists('icradius_secrets') ) {
+ #need some sort of late binding so it's only connected to when
+ # actually used, hmm
+ $icradius_dbh = DBI->connect($conf->config('icradius_secrets'))
+ or die $DBI::errstr;
+ } else {
+ $icradius_dbh = dbh;
+ }
+ } else {
+ $icradius_dbh = '';
+ }
+ $dirhash = $conf->config('dirhash') || 0;
+ $exportdir = "/usr/local/etc/freeside/export." . datasrc;
+ if ( $conf->exists('vpopmailmachines') ) {
+ my (@vpopmailmachines) = $conf->config('vpopmailmachines');
+ my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
+ $vpopdir = $dir;
+ } else {
+ $vpopdir = '';
+ }
};
@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
#not needed in 5.004 #srand($$|time);
+sub _cache {
+ my $self = shift;
+ my ( $hashref, $cache ) = @_;
+ if ( $hashref->{'svc_acct_svcnum'} ) {
+ $self->{'_domsvc'} = FS::svc_domain->new( {
+ 'svcnum' => $hashref->{'domsvc'},
+ 'domain' => $hashref->{'svc_acct_domain'},
+ 'catchall' => $hashref->{'svc_acct_catchall'},
+ } );
+ }
+}
+
=head1 NAME
FS::svc_acct - Object methods for svc_acct records
%hash = $record->radius_check;
+ $domain = $record->domain;
+
+ $svc_domain = $record->svc_domain;
+
+ $email = $record->email;
+
+ $seconds_since = $record->seconds_since($timestamp);
+
=head1 DESCRIPTION
An FS::svc_acct object represents an account. FS::svc_acct inherits from
=item slipip - IP address
+=item seconds -
+
+=item domsvc - svcnum from svc_domain
+
=item radius_I<Radius_Attribute> - I<Radius-Attribute>
=item domsvc - service number of svc_domain with which to associate
If the configuration value (see L<FS::Conf>) shellmachine exists, and the
username, uid, and dir fields are defined, the command(s) specified in
-the shellmachine-useradd configuration are exectued on shellmachine via ssh.
+the shellmachine-useradd configuration are added to the job queue (see
+L<FS::queue> and L<freeside-queued>) to be exectued on shellmachine via ssh.
This behaviour can be surpressed by setting $FS::svc_acct::nossh_hack true.
If the shellmachine-useradd configuration file does not exist,
a double-quoted perl string, with the following variables available:
$username, $uid, $gid, $dir, and $shell.
+(TODOC: cyrus config file, L<FS::queue> and L<freeside-queued>)
+
=cut
sub insert {
local $SIG{TSTP} = 'IGNORE';
local $SIG{PIPE} = 'IGNORE';
+ my $oldAutoCommit = $FS::UID::AutoCommit;
+ local $FS::UID::AutoCommit = 0;
+ my $dbh = dbh;
+
+ my $amount = 0;
+
$error = $self->check;
return $error if $error;
'domsvc' => $self->domsvc,
} );
+ if ( $self->svcnum ) {
+ my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$self->svcnum});
+ unless ( $cust_svc ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "no cust_svc record found for svcnum ". $self->svcnum;
+ }
+ $self->pkgnum($cust_svc->pkgnum);
+ $self->svcpart($cust_svc->svcpart);
+ }
+
my $part_svc = qsearchs( 'part_svc', { 'svcpart' => $self->svcpart } );
return "Unknown svcpart" unless $part_svc;
return "uid in use"
;
$error = $self->SUPER::insert;
- return $error if $error;
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error;
+ }
my( $username, $uid, $gid, $dir, $shell ) = (
$self->username,
$self->shell,
);
if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
- ssh("root\@$shellmachine", eval qq("$useradd") );
+ my $queue = new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'Net::SSH::ssh_cmd',
+ };
+ $error = $queue->insert("root\@$shellmachine", eval qq("$useradd") );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+ if ( $cyrus_server ) {
+ my $queue = new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'FS::svc_acct::cyrus_insert',
+ };
+ $error = $queue->insert($self->username, $self->quota);
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+ if ( $cp_server ) {
+ my $queue = new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'FS::svc_acct::cp_insert'
+ };
+ $error = $queue->insert($self->username, $self->_password);
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+ if ( $icradius_dbh ) {
+
+ my $radcheck_queue =
+ new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'FS::svc_acct::icradius_rc_insert'
+ };
+ $error = $radcheck_queue->insert( $self->username,
+ $self->_password,
+ $self->radius_check
+ );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+
+ my $radreply_queue =
+ new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'FS::svc_acct::icradius_rr_insert'
+ };
+ $error = $radreply_queue->insert( $self->username,
+ $self->_password,
+ $self->radius_reply
+ );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+ if ( $vpopdir ) {
+
+ my $vpopmail_queue =
+ new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'FS::svc_acct::vpopmail_insert'
+ };
+ $error = $vpopmail_queue->insert( $self->username,
+ crypt($self->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]),
+ $self->domain,
+ $vpopdir,
+ );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+
}
+
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
''; #no error
}
+sub cyrus_insert {
+ my( $username, $quota ) = @_;
+
+ warn "cyrus_insert: starting for user $username, quota $quota\n";
+
+ warn "cyrus_insert: connecting to $cyrus_server\n";
+ my $client = Cyrus::IMAP::Admin->new($cyrus_server);
+
+ warn "cyrus_insert: authentication as $cyrus_admin_user\n";
+ $client->authenticate(
+ -user => $cyrus_admin_user,
+ -mechanism => "login",
+ -password => $cyrus_admin_pass
+ );
+
+ warn "cyrus_insert: creating user.$username\n";
+ my $rc = $client->create("user.$username");
+ my $error = $client->error;
+ die "cyrus_insert: error creating user.$username: $error" if $error;
+
+ warn "cyrus_insert: setacl user.$username, $username => all\n";
+ $rc = $client->setacl("user.$username", $username => 'all' );
+ $error = $client->error;
+ die "cyrus_insert: error setacl user.$username: $error" if $error;
+
+ if ( $quota ) {
+ warn "cyrus_insert: setquota user.$username, STORAGE => $quota\n";
+ $rc = $client->setquota("user.$username", 'STORAGE' => $quota );
+ $error = $client->error;
+ die "cyrus_insert: error setquota user.$username: $error" if $error;
+ }
+
+ 1;
+}
+
+sub cp_insert {
+ my( $username, $password ) = @_;
+
+ my $app = new Net::APP ( $cp_server,
+ User => $cp_user,
+ Password => $cp_pass,
+ Domain => $mydomain,
+ Timeout => 60,
+ #Debug => 1,
+ ) or die "$@\n";
+
+ $app->create_mailbox(
+ Mailbox => $username,
+ Password => $password,
+ Workgroup => $cp_workgroup,
+ Domain => $mydomain,
+ );
+
+ die $app->message."\n" unless $app->ok;
+}
+
+sub icradius_rc_insert {
+ my( $username, $password, %radcheck ) = @_;
+
+ my $sth = $icradius_dbh->prepare(
+ "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
+ join(", ", map { $icradius_dbh->quote($_) } (
+ '',
+ $username,
+ "Password",
+ $password,
+ ) ). " )"
+ );
+ $sth->execute or die "can't insert into radcheck table: ". $sth->errstr;
+
+ foreach my $attribute ( keys %radcheck ) {
+ my $sth = $icradius_dbh->prepare(
+ "INSERT INTO radcheck ( id, UserName, Attribute, Value ) VALUES ( ".
+ join(", ", map { $icradius_dbh->quote($_) } (
+ '',
+ $username,
+ $attribute,
+ $radcheck{$attribute},
+ ) ). " )"
+ );
+ $sth->execute or die "can't insert into radcheck table: ". $sth->errstr;
+ }
+
+ 1;
+}
+
+sub icradius_rr_insert {
+ my( $username, $password, %radreply ) = @_;
+
+ foreach my $attribute ( keys %radreply ) {
+ my $sth = $icradius_dbh->prepare(
+ "INSERT INTO radreply ( id, UserName, Attribute, Value ) VALUES ( ".
+ join(", ", map { $icradius_dbh->quote($_) } (
+ '',
+ $username,
+ $attribute,
+ $radreply{$attribute},
+ ) ). " )"
+ );
+ $sth->execute or die "can't insert into radreply table: ". $sth->errstr;
+ }
+
+ 1;
+}
+
+
+sub vpopmail_insert {
+ my( $username, $password, $domain, $vpopdir ) = @_;
+
+ (open(VPASSWD, ">>$exportdir/domains/$domain/vpasswd")
+ and flock(VPASSWD,LOCK_EX)
+ ) or die "can't open vpasswd file for $username\@$domain: $exportdir/domains/$domain/vpasswd";
+ print VPASSWD join(":",
+ $username,
+ $password,
+ '1',
+ '0',
+ $username,
+ "$vpopdir/domains/$domain/$username",
+ 'NOQUOTA',
+ ), "\n";
+
+ flock(VPASSWD,LOCK_UN);
+ close(VPASSWD);
+
+ mkdir "$exportdir/domains/$domain/$username", 0700 or die "can't create Maildir";
+ mkdir "$exportdir/domains/$domain/$username/Maildir", 0700 or die "can't create Maildir";
+ mkdir "$exportdir/domains/$domain/$username/Maildir/cur", 0700 or die "can't create Maildir";
+ mkdir "$exportdir/domains/$domain/$username/Maildir/new", 0700 or die "can't create Maildir";
+ mkdir "$exportdir/domains/$domain/$username/Maildir/tmp", 0700 or die "can't create Maildir";
+
+ my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
+ my $error = $queue->insert;
+ die $error if $error;
+
+ 1;
+}
+
+sub vpopmail_sync {
+
+ my (@vpopmailmachines) = $conf->config('vpopmailmachines');
+ my ($machine, $dir, $uid, $gid) = split (/\s+/, $vpopmailmachines[0]);
+
+ chdir $exportdir;
+ my @args = ("$rsync", "-rlpt", "-e", "$ssh", "domains/", "vpopmail\@$machine:$vpopdir/domains/");
+ system {$args[0]} @args;
+
+}
+
=item delete
Deletes this account from the database. If there is an error, returns the
If the configuration value (see L<FS::Conf>) shellmachine exists, the
command(s) specified in the shellmachine-userdel configuration file are
-executed on shellmachine via ssh. This behavior can be surpressed by setting
+added to the job queue (see L<FS::queue> and L<freeside-queued>) to be executed
+on shellmachine via ssh. This behavior can be surpressed by setting
$FS::svc_acct::nossh_hack true. If the shellmachine-userdel configuration
file does not exist,
double-quoted perl string, with the following variables available:
$username and $dir.
+(TODOC: cyrus config file)
+
=cut
sub delete {
my $self = shift;
- return "Can't delete an account which has (svc_acct_sm) mail aliases!"
- if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
+ if ( defined( $FS::Record::dbdef->table('svc_acct_sm') ) ) {
+ return "Can't delete an account which has (svc_acct_sm) mail aliases!"
+ if $self->uid && qsearch( 'svc_acct_sm', { 'domuid' => $self->uid } );
+ }
return "Can't delete an account which is a (svc_forward) source!"
if qsearch( 'svc_forward', { 'srcsvc' => $self->svcnum } );
foreach my $cust_main_invoice (
qsearch( 'cust_main_invoice', { 'dest' => $self->svcnum } )
) {
+ unless ( defined($cust_main_invoice) ) {
+ warn "WARNING: something's wrong with qsearch";
+ next;
+ }
my %hash = $cust_main_invoice->hash;
$hash{'dest'} = $self->email;
my $new = new FS::cust_main_invoice \%hash;
return $error;
}
- $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-
my( $username, $dir ) = (
$self->username,
$self->dir,
);
if ( $username && $shellmachine && ! $nossh_hack ) {
- ssh("root\@$shellmachine", eval qq("$userdel") );
+ my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };
+ $error = $queue->insert("root\@$shellmachine", eval qq("$userdel") );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+
+ }
+
+ if ( $cyrus_server ) {
+ my $queue = new FS::queue { 'job' => 'FS::svc_acct::cyrus_delete' };
+ $error = $queue->insert($self->username);
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+ if ( $cp_server ) {
+ my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_delete' };
+ $error = $queue->insert($self->username);
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
}
+ if ( $icradius_dbh ) {
+
+ my $radcheck_queue =
+ new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_delete' };
+ $error = $radcheck_queue->insert( $self->username );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+
+ my $radreply_queue =
+ new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_delete' };
+ $error = $radreply_queue->insert( $self->username );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+ if ( $vpopdir ) {
+ my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
+ $error = $queue->insert( $self->username, $self->domain );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+
+ }
+
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
'';
}
+sub cyrus_delete {
+ my $username = shift;
+
+ my $client = Cyrus::IMAP::Admin->new($cyrus_server);
+ $client->authenticate(
+ -user => $cyrus_admin_user,
+ -mechanism => "login",
+ -password => $cyrus_admin_pass
+ );
+
+ my $rc = $client->setacl("user.$username", $cyrus_admin_user => 'all' );
+ my $error = $client->error;
+ die $error if $error;
+
+ $rc = $client->delete("user.$username");
+ $error = $client->error;
+ die $error if $error;
+
+ 1;
+}
+
+sub cp_delete {
+ my( $username ) = @_;
+ my $app = new Net::APP ( $cp_server,
+ User => $cp_user,
+ Password => $cp_pass,
+ Domain => $mydomain,
+ Timeout => 60,
+ #Debug => 1,
+ ) or die "$@\n";
+
+ $app->delete_mailbox(
+ Mailbox => $username,
+ Domain => $mydomain,
+ );
+
+ die $app->message."\n" unless $app->ok;
+}
+
+sub icradius_rc_delete {
+ my $username = shift;
+
+ my $sth = $icradius_dbh->prepare(
+ 'DELETE FROM radcheck WHERE UserName = ?'
+ );
+ $sth->execute($username)
+ or die "can't delete from radcheck table: ". $sth->errstr;
+
+ 1;
+}
+
+sub icradius_rr_delete {
+ my $username = shift;
+
+ my $sth = $icradius_dbh->prepare(
+ 'DELETE FROM radreply WHERE UserName = ?'
+ );
+ $sth->execute($username)
+ or die "can't delete from radreply table: ". $sth->errstr;
+
+ 1;
+}
+
+sub vpopmail_delete {
+ my( $username, $domain ) = @_;
+
+ (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+ and flock(VPASSWD,LOCK_EX)
+ ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+ open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+ or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ while (<VPASSWD>) {
+ my ($mailbox, $rest) = split(':', $_);
+ print VPASSWDTMP $_ unless $username eq $mailbox;
+ }
+
+ close(VPASSWDTMP);
+
+ rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
+ or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ flock(VPASSWD,LOCK_UN);
+ close(VPASSWD);
+
+ rmtree "$exportdir/domains/$domain/$username" or die "can't destroy Maildir";+
+ 1;
+}
+
=item replace OLD_RECORD
Replaces OLD_RECORD with this one in the database. If there is an error,
If the configuration value (see L<FS::Conf>) shellmachine exists, and the
dir field has changed, the command(s) specified in the shellmachine-usermod
-configuraiton file are executed on shellmachine via ssh. This behavior can
+configuraiton file are added to the job queue (see L<FS::queue> and
+L<freeside-queued>) to be executed on shellmachine via ssh. This behavior can
be surpressed by setting $FS::svc-acct::nossh_hack true. If the
-shellmachine-userdel configuration file does not exist or is empty, :
+shellmachine-userdel configuration file does not exist or is empty,
[ -d $old_dir ] && mv $old_dir $new_dir || (
chmod u+t $old_dir;
rm -rf $old_dir
)
-is executed on shellmachine via ssh. This behaviour can be surpressed by
-setting $FS::svc_acct::nossh_hack true.
+is the default. This behaviour can be surpressed by setting
+$FS::svc_acct::nossh_hack true.
=cut
return "Username in use"
if $old->username ne $new->username &&
- qsearchs( 'svc_acct', { 'username' => $new->username } );
+ qsearchs( 'svc_acct', { 'username' => $new->username,
+ 'domsvc' => $new->domsvc,
+ } );
+ {
+ #no warnings 'numeric'; #alas, a 5.006-ism
+ local($^W) = 0;
+ return "Can't change uid!" if $old->uid != $new->uid;
+ }
- return "Can't change uid!" if $old->uid != $new->uid;
+ return "can't change username using Cyrus"
+ if $cyrus_server && $old->username ne $new->username;
#change homdir when we change username
$new->setfield('dir', '') if $old->username ne $new->username;
local $SIG{TSTP} = 'IGNORE';
local $SIG{PIPE} = 'IGNORE';
+ my $oldAutoCommit = $FS::UID::AutoCommit;
+ local $FS::UID::AutoCommit = 0;
+ my $dbh = dbh;
+
$error = $new->SUPER::replace($old);
- return $error if $error;
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return $error if $error;
+ }
my ( $old_dir, $new_dir, $uid, $gid ) = (
$old->getfield('dir'),
$new->getfield('gid'),
);
if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
- ssh("root\@$shellmachine", eval qq("$usermod") );
+ my $queue = new FS::queue {
+ 'svcnum' => $new->svcnum,
+ 'job' => 'Net::SSH::ssh_cmd'
+ };
+ $error = $queue->insert("root\@$shellmachine", eval qq("$usermod") );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+ if ( $cp_server && $old->username ne $new->username ) {
+ my $queue = new FS::queue {
+ 'svcnum' => $new->svcnum,
+ 'job' => 'FS::svc_acct::cp_rename'
+ };
+ $error = $queue->insert( $old->username, $new->username );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+ if ( $cp_server && $old->_password ne $new->_password ) {
+ my $queue = new FS::queue {
+ 'svcnum' => $new->svcnum,
+ 'job' => 'FS::svc_acct::cp_change'
+ };
+ $error = $queue->insert( $new->username, $new->_password );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
}
+ if ( $icradius_dbh ) {
+ my $queue = new FS::queue {
+ 'svcnum' => $new->svcnum,
+ 'job' => 'FS::svc_acct::icradius_rc_replace'
+ };
+ $error = $queue->insert( $new->username,
+ $new->_password,
+ );
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+ if ( $vpopdir ) {
+ my $cpassword = crypt(
+ $new->_password,$saltset[int(rand(64))].$saltset[int(rand(64))]
+ );
+
+ if ($old->username ne $new->username || $old->domain ne $new->domain ) {
+ my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_delete' };
+ $error = $queue->insert( $old->username, $old->domain );
+ my $queue2 = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_insert' };
+ $error = $queue2->insert( $new->username,
+ $cpassword,
+ $new->domain,
+ $vpopdir,
+ )
+ unless $error;
+ } elsif ($old->_password ne $new->_password) {
+ my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_replace_password' };
+ $error = $queue->insert( $new->username, $cpassword, $new->domain );
+ }
+ if ( $error ) {
+ $dbh->rollback if $oldAutoCommit;
+ return "queueing job (transaction rolled back): $error";
+ }
+ }
+
+
+ $dbh->commit or die $dbh->errstr if $oldAutoCommit;
''; #no error
}
+sub icradius_rc_replace {
+ my( $username, $new_password ) = @_;
+
+ my $sth = $icradius_dbh->prepare(
+ "UPDATE radcheck SET Value = ? WHERE UserName = ? and Attribute = ?"
+ );
+ $sth->execute($new_password, $username, 'Password' )
+ or die "can't update radcheck table: ". $sth->errstr;
+
+ 1;
+}
+
+sub cp_rename {
+ my ( $old_username, $new_username ) = @_;
+
+ my $app = new Net::APP ( $cp_server,
+ User => $cp_user,
+ Password => $cp_pass,
+ Domain => $mydomain,
+ Timeout => 60,
+ #Debug => 1,
+ ) or die "$@\n";
+
+ $app->rename_mailbox(
+ Domain => $mydomain,
+ Old_Mailbox => $old_username,
+ New_Mailbox => $new_username,
+ );
+
+ die $app->message."\n" unless $app->ok;
+
+}
+
+sub cp_change {
+ my ( $username, $password ) = @_;
+
+ my $app = new Net::APP ( $cp_server,
+ User => $cp_user,
+ Password => $cp_pass,
+ Domain => $mydomain,
+ Timeout => 60,
+ #Debug => 1,
+ ) or die "$@\n";
+
+ if ( $password =~ /^\*SUSPENDED\* (.*)$/ ) {
+ $password = $1;
+ $app->set_mailbox_status(
+ Domain => $mydomain,
+ Mailbox => $username,
+ Other => 'T',
+ Other_Bounce => 'T',
+ );
+ } else {
+ $app->set_mailbox_status(
+ Domain => $mydomain,
+ Mailbox => $username,
+ Other => 'F',
+ Other_Bounce => 'F',
+ );
+ }
+ die $app->message."\n" unless $app->ok;
+
+ $app->change_mailbox(
+ Domain => $mydomain,
+ Mailbox => $username,
+ Password => $password,
+ );
+ die $app->message."\n" unless $app->ok;
+
+}
+
+sub vpopmail_replace_password {
+ my( $username, $password, $domain ) = @_;
+
+ (open(VPASSWD, "$exportdir/domains/$domain/vpasswd")
+ and flock(VPASSWD,LOCK_EX)
+ ) or die "can't open $exportdir/domains/$domain/vpasswd: $!";
+
+ open(VPASSWDTMP, ">$exportdir/domains/$domain/vpasswd.tmp")
+ or die "Can't open $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ while (<VPASSWD>) {
+ my ($mailbox, $pw, @rest) = split(':', $_);
+ print VPASSWDTMP $_ unless $username eq $mailbox;
+ print VPASSWDTMP join (':', ($mailbox, $password, @rest))
+ if $username eq $mailbox;
+ }
+
+ close(VPASSWDTMP);
+
+ rename "$exportdir/domains/$domain/vpasswd.tmp", "$exportdir/domains/$domain/vpasswd"
+ or die "Can't rename $exportdir/domains/$domain/vpasswd.tmp: $!";
+
+ flock(VPASSWD,LOCK_UN);
+ close(VPASSWD);
+
+ my $queue = new FS::queue { 'job' => 'FS::svc_acct::vpopmail_sync' };
+ my $error = $queue->insert;
+ die $error if $error;
+
+ 1;
+}
+
+
=item suspend
Suspends this account by prefixing *SUSPENDED* to the password. If there is an
sub suspend {
my $self = shift;
my %hash = $self->hash;
- unless ( $hash{_password} =~ /^\*SUSPENDED\* / ) {
+ unless ( $hash{_password} =~ /^\*SUSPENDED\* /
+ || $hash{_password} eq '*'
+ ) {
$hash{_password} = '*SUSPENDED* '.$hash{_password};
my $new = new FS::svc_acct ( \%hash );
$new->replace($self);
return $error if $error;
my $ulen = $usernamemax || $self->dbdef_table->column('username')->length;
- $recref->{username} =~ /^([a-z0-9_\-\.]{$usernamemin,$ulen})$/
- or return "Illegal username";
- $recref->{username} = $1;
+ if ( $username_uppercase ) {
+ $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/i
+ or return "Illegal username: ". $recref->{username};
+ $recref->{username} = $1;
+ } else {
+ $recref->{username} =~ /^([a-z0-9_\-\.\&]{$usernamemin,$ulen})$/
+ or return "Illegal username: ". $recref->{username};
+ $recref->{username} = $1;
+ }
+
if ( $username_letterfirst ) {
$recref->{username} =~ /^[a-z]/ or return "Illegal username";
} elsif ( $username_letter ) {
$recref->{username} =~ /[a-z]/ or return "Illegal username";
}
+ if ( $username_noperiod ) {
+ $recref->{username} =~ /\./ and return "Illegal username";
+ }
+ unless ( $username_ampersand ) {
+ $recref->{username} =~ /\&/ and return "Illegal username";
+ }
$recref->{popnum} =~ /^(\d*)$/ or return "Illegal popnum: ".$recref->{popnum};
$recref->{popnum} = $1;
return "Only root can have uid 0"
if $recref->{uid} == 0 && $recref->{username} ne 'root';
- $error = $self->ut_textn('finger');
- return $error if $error;
+# $error = $self->ut_textn('finger');
+# return $error if $error;
+ $self->getfield('finger') =~
+ /^([\w \t\!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\*\<\>]*)$/
+ or return "Illegal finger: ". $self->getfield('finger');
+ $self->setfield('finger', $1);
- $recref->{dir} =~ /^([\/\w\-]*)$/
+ $recref->{dir} =~ /^([\/\w\-\.\&]*)$/
or return "Illegal directory";
- $recref->{dir} = $1 ||
- $dir_prefix . '/' . $recref->{username}
- #$dir_prefix . '/' . substr($recref->{username},0,1). '/' . $recref->{username}
+ $recref->{dir} = $1;
+ return "Illegal directory"
+ if $recref->{dir} =~ /(^|\/)\.+(\/|$)/; #no .. component
+ return "Illegal directory"
+ if $recref->{dir} =~ /\&/ && ! $username_ampersand;
+ unless ( $recref->{dir} ) {
+ $recref->{dir} = $dir_prefix . '/';
+ if ( $dirhash > 0 ) {
+ for my $h ( 1 .. $dirhash ) {
+ $recref->{dir} .= substr($recref->{username}, $h-1, 1). '/';
+ }
+ } elsif ( $dirhash < 0 ) {
+ for my $h ( reverse $dirhash .. -1 ) {
+ $recref->{dir} .= substr($recref->{username}, $h, 1). '/';
+ }
+ }
+ $recref->{dir} .= $recref->{username};
;
+ }
unless ( $recref->{username} eq 'sync' ) {
if ( grep $_ eq $recref->{shell}, @shells ) {
unless ( $recref->{_password} );
#if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{4,16})$/ ) {
- if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{$passwordmin,8})$/ ) {
+ if ( $recref->{_password} =~ /^((\*SUSPENDED\* )?)([^\t\n]{$passwordmin,$passwordmax})$/ ) {
$recref->{_password} = $1.$3;
#uncomment this to encrypt password immediately upon entry, or run
#bin/crypt_pw in cron to give new users a window during which their
} elsif ( $recref->{_password} eq '!!' ) {
$recref->{_password} = '!!';
} else {
- return "Illegal password";
+ #return "Illegal password";
+ return "Illegal password: ". $recref->{_password};
}
''; #no error
sub radius_reply {
my $self = shift;
- map {
- /^(radius_(.*))$/;
- my($column, $attrib) = ($1, $2);
- $attrib =~ s/_/\-/g;
- ( $attrib, $self->getfield($column) );
- } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
+ my %reply =
+ map {
+ /^(radius_(.*))$/;
+ my($column, $attrib) = ($1, $2);
+ #$attrib =~ s/_/\-/g;
+ ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
+ } grep { /^radius_/ && $self->getfield($_) } fields( $self->table );
+ if ( $self->ip && $self->ip ne '0e0' ) {
+ $reply{'Framed-IP-Address'} = $self->ip;
+ }
+ %reply;
}
=item radius_check
map {
/^(rc_(.*))$/;
my($column, $attrib) = ($1, $2);
- $attrib =~ s/_/\-/g;
- ( $attrib, $self->getfield($column) );
+ #$attrib =~ s/_/\-/g;
+ ( $FS::raddb::attrib{lc($attrib)}, $self->getfield($column) );
} grep { /^rc_/ && $self->getfield($_) } fields( $self->table );
}
sub domain {
my $self = shift;
if ( $self->domsvc ) {
- my $svc_domain = qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } )
+ #$self->svc_domain->domain;
+ my $svc_domain = $self->svc_domain
or die "no svc_domain.svcnum for svc_acct.domsvc ". $self->domsvc;
$svc_domain->domain;
} else {
}
}
+=item svc_domain
+
+Returns the FS::svc_domain record for this account's domain (see
+L<FS::svc_domain>.
+
+=cut
+
+sub svc_domain {
+ my $self = shift;
+ $self->{'_domsvc'}
+ ? $self->{'_domsvc'}
+ : qsearchs( 'svc_domain', { 'svcnum' => $self->domsvc } );
+}
+
+=item cust_svc
+
+Returns the FS::cust_svc record for this account (see L<FS::cust_svc>).
+
+sub cust_svc {
+ my $self = shift;
+ qsearchs( 'cust_svc', { 'svcnum' => $self->svcnum } );
+}
+
=item email
Returns an email address associated with the account.
$self->username. '@'. $self->domain;
}
-=back
+=item seconds_since TIMESTAMP
-=head1 VERSION
+Returns the number of seconds this account has been online since TIMESTAMP.
+See L<FS::session>
-$Id: svc_acct.pm,v 1.30 2001-09-06 20:41:59 ivan Exp $
+TIMESTAMP is specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
+L<Time::Local> and L<Date::Parse> for conversion functions.
-=head1 BUGS
+=cut
+
+#note: POD here, implementation in FS::cust_svc
+sub seconds_since {
+ my $self = shift;
+ $self->cust_svc->seconds_since(@_);
+}
-The bits which ssh should fork before doing so (or maybe queue jobs for a
-daemon).
+=back
+
+=head1 BUGS
The $recref stuff in sub check should be cleaned up.
=head1 SEE ALSO
-L<FS::svc_Common>, L<FS::Record>, L<FS::Conf>, L<FS::cust_svc>,
-L<FS::part_svc>, L<FS::cust_pkg>, L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
+L<FS::svc_Common>, edit/part_svc.cgi from an installed web interface,
+export.html from the base documentation, L<FS::Record>, L<FS::Conf>,
+L<FS::cust_svc>, L<FS::part_svc>, L<FS::cust_pkg>, L<FS::queue>,
+L<freeside-queued>), L<Net::SSH>, L<ssh>, L<FS::svc_acct_pop>,
schema.html from the base documentation.
=cut