X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_acct.pm;h=2f327a3d3907383cf35d2614fcd8ca1de0133d8e;hp=f3c2d76d34b686b2695138b75d179b21ed2c1f7c;hb=8f42b751aebda2e7dce2c363bed6f1e15b411b1d;hpb=a2c24812441a8f8ae3045a8c0c93c7f009d4f494

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index f3c2d76d3..2f327a3d3 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -7,6 +7,7 @@ use vars qw( @ISA $nossh_hack $conf $dir_prefix @shells $usernamemin
              $username_noperiod $username_uppercase
              $shellmachine $useradd $usermod $userdel $mydomain
              $cyrus_server $cyrus_admin_user $cyrus_admin_pass
+             $cp_server $cp_user $cp_pass $cp_workgroup
              $dirhash
              $icradius_dbh
              @saltset @pw_set);
@@ -71,6 +72,16 @@ $FS::UID::callback{'FS::svc_acct'} = sub {
     $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
@@ -270,7 +281,10 @@ sub insert {
     $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;
@@ -279,17 +293,36 @@ sub insert {
   }
 
   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;
       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 { '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
@@ -300,7 +333,10 @@ sub insert {
     }
 
     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
@@ -351,6 +387,27 @@ sub cyrus_insert {
   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 $@;
+
+  $app->create_mailbox(
+                        Mailbox   => $username,
+                        Password  => $password,
+                        Workgroup => $cp_workgroup,
+                        Domain    => $mydomain,
+                      );
+
+  die $app->message unless $app->ok;
+}
+
 sub icradius_rc_insert {
   my( $username, $password, %radcheck ) = @_;
   
@@ -500,7 +557,7 @@ sub delete {
     $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;
@@ -517,6 +574,16 @@ sub delete {
       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 =
@@ -562,6 +629,24 @@ sub cyrus_delete {
   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 $@;
+
+  $app->delete_mailbox(
+                        Mailbox   => $username,
+                        Domain    => $mydomain,
+                      );
+
+  die $app->message unless $app->ok;
+}
+
 sub icradius_rc_delete {
   my $username = shift;
   
@@ -658,7 +743,10 @@ sub replace {
     $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;
@@ -666,8 +754,35 @@ sub replace {
     }
   }
 
+  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 { '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,
                            );
@@ -693,6 +808,48 @@ sub icradius_rc_replace {
   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 $@;
+
+  $app->rename_mailbox(
+                        Domain        => $mydomain,
+                        Old_Mailbox   => $old_username,
+                        New_Mailbox   => $new_username,
+                      );
+
+  die $app->message 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 $@;
+
+  $app->change_mailbox(
+                        Domain    => $mydomain,
+                        Mailbox   => $username,
+                        Password  => $password,
+                      );
+
+  die $app->message unless $app->ok;
+
+}
+
 =item suspend
 
 Suspends this account by prefixing *SUSPENDED* to the password.  If there is an
@@ -1034,34 +1191,6 @@ sub seconds_since {
   $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