$cp_server $cp_user $cp_pass $cp_workgroup
$dirhash
$icradius_dbh
- @saltset @pw_set);
+ @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;
#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');
$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' , '.' , '/' );
$self->shell,
);
if ( $username && $uid && $dir && $shellmachine && ! $nossh_hack ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
+ 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;
}
if ( $cyrus_server ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::cyrus_insert' };
+ 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;
}
if ( $cp_server ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_insert' };
+ 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;
if ( $icradius_dbh ) {
my $radcheck_queue =
- new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_insert' };
+ new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'FS::svc_acct::icradius_rc_insert'
+ };
$error = $radcheck_queue->insert( $self->username,
$self->_password,
$self->radius_check
}
my $radreply_queue =
- new FS::queue { 'job' => 'FS::svc_acct::icradius_rr_insert' };
+ new FS::queue {
+ 'svcnum' => $self->svcnum,
+ 'job' => 'FS::svc_acct::icradius_rr_insert'
+ };
$error = $radreply_queue->insert( $self->username,
$self->_password,
$self->radius_reply
$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
}
Domain => $mydomain,
Timeout => 60,
#Debug => 1,
- ) or die $@;
+ ) or die "$@\n";
$app->create_mailbox(
Mailbox => $username,
Domain => $mydomain,
);
- die $app->message unless $app->ok;
+ die $app->message."\n" unless $app->ok;
}
sub icradius_rc_insert {
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
$self->dir,
);
if ( $username && $shellmachine && ! $nossh_hack ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
+ my $queue = new FS::queue { 'job' => 'Net::SSH::ssh_cmd' };
$error = $queue->insert("root\@$shellmachine", eval qq("$userdel") );
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
$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";
+ }
}
Domain => $mydomain,
Timeout => 60,
#Debug => 1,
- ) or die $@;
+ ) or die "$@\n";
$app->delete_mailbox(
Mailbox => $username,
Domain => $mydomain,
);
- die $app->message unless $app->ok;
+ die $app->message."\n" unless $app->ok;
}
sub icradius_rc_delete {
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,
$new->getfield('gid'),
);
if ( $old_dir && $new_dir && $old_dir ne $new_dir && ! $nossh_hack ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::ssh' };
+ 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;
}
if ( $cp_server && $old->username ne $new->username ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_rename' };
+ 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;
}
if ( $cp_server && $old->_password ne $new->_password ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::cp_change' };
+ 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;
}
if ( $icradius_dbh ) {
- my $queue = new FS::queue { 'job' => 'FS::svc_acct::icradius_rc_replace' };
+ my $queue = new FS::queue {
+ 'svcnum' => $new->svcnum,
+ 'job' => 'FS::svc_acct::icradius_rc_replace'
+ };
$error = $queue->insert( $new->username,
$new->_password,
);
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 cp_rename {
- my ( $old_username, $new_username );
+ my ( $old_username, $new_username ) = @_;
my $app = new Net::APP ( $cp_server,
User => $cp_user,
Domain => $mydomain,
Timeout => 60,
#Debug => 1,
- ) or die $@;
+ ) or die "$@\n";
$app->rename_mailbox(
Domain => $mydomain,
New_Mailbox => $new_username,
);
- die $app->message unless $app->ok;
+ die $app->message."\n" unless $app->ok;
}
sub cp_change {
- my ( $username, $password );
+ my ( $username, $password ) = @_;
my $app = new Net::APP ( $cp_server,
User => $cp_user,
Domain => $mydomain,
Timeout => 60,
#Debug => 1,
- ) or die $@;
+ ) 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: $!";
- die $app->message unless $app->ok;
+ 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
$self->cust_svc->seconds_since(@_);
}
-=item ssh
-
-=cut
-
-sub ssh {
- my ( $host, @cmd_and_args ) = @_;
-
- use IO::File;
- my $reader = IO::File->new();
- my $writer = IO::File->new();
- my $error = IO::File->new();
-
- &Net::SSH::sshopen3( $host, $reader, $writer, $error, @cmd_and_args) or die $!;
-
- local $/ = undef;
- my $output_stream = <$writer>;
- my $error_stream = <$error>;
- if ( length $error_stream ) {
- #warn "[FS::svc_acct::ssh] STDERR $error_stream";
- die "[FS::svc_acct::ssh] STDERR $error_stream";
- }
- if ( length $output_stream ) {
- warn "[FS::svc_acct::ssh] STDOUT $output_stream";
- }
-
-# &Net::SSH::ssh(@args,">>/usr/local/etc/freeside/sshoutput 2>&1");
-}
-
=back
=head1 BUGS
projects / freeside.git / blobdiff