projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
working linux and freebsd shellcommands
[freeside.git]
/
FS
/
FS
/
part_export
/
shellcommands.pm
diff --git
a/FS/FS/part_export/shellcommands.pm
b/FS/FS/part_export/shellcommands.pm
index
7a87bd3
..
4e94360
100644
(file)
--- a/
FS/FS/part_export/shellcommands.pm
+++ b/
FS/FS/part_export/shellcommands.pm
@@
-1,10
+1,12
@@
package FS::part_export::shellcommands;
package FS::part_export::shellcommands;
-use vars qw(@ISA);
+use vars qw(@ISA
@saltset
);
use FS::part_export;
@ISA = qw(FS::part_export);
use FS::part_export;
@ISA = qw(FS::part_export);
+@saltset = ( 'a'..'z' , 'A'..'Z' , '0'..'9' , '.' , '/' );
+
sub rebless { shift; }
sub _export_insert {
sub rebless { shift; }
sub _export_insert {
@@
-20,23
+22,33
@@
sub _export_delete {
sub _export_command {
my ( $self, $action, $svc_acct) = (shift, shift, shift);
my $command = $self->option($action);
sub _export_command {
my ( $self, $action, $svc_acct) = (shift, shift, shift);
my $command = $self->option($action);
+ my $stdin = $self->option($action."_stdin");
no strict 'refs';
${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
no strict 'refs';
${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
+ $crypt_password = crypt( $svc_acct->_password,
+ $saltset[int(rand(64))].$saltset[int(rand(64))] );
$self->shellcommands_queue( $svc_acct->svcnum,
$self->shellcommands_queue( $svc_acct->svcnum,
- $self->options('user')||'root'. "\@". $self->options('machine'),
- eval(qq("$command"))
+ user => $self->option('user')||'root',
+ host => $self->machine,
+ command => eval(qq("$command")),
+ stdin_string => eval(qq("$stdin")),
);
}
sub _export_replace {
my($self, $new, $old ) = (shift, shift, shift);
my $command = $self->option('usermod');
);
}
sub _export_replace {
my($self, $new, $old ) = (shift, shift, shift);
my $command = $self->option('usermod');
+ my $stdin = $self->option('usermod_stdin');
no strict 'refs';
${"old_$_"} = $old->getfield($_) foreach $old->fields;
${"new_$_"} = $new->getfield($_) foreach $new->fields;
no strict 'refs';
${"old_$_"} = $old->getfield($_) foreach $old->fields;
${"new_$_"} = $new->getfield($_) foreach $new->fields;
+ $new_crypt_password = crypt( $svc_acct->_password,
+ $saltset[int(rand(64))].$saltset[int(rand(64))]);
$self->shellcommands_queue( $new->svcnum,
$self->shellcommands_queue( $new->svcnum,
- $self->options('user')||'root'. "\@". $self->options('machine'),
- eval(qq("$command"))
+ user => $self->option('user')||'root',
+ host => $self->machine,
+ command => eval(qq("$command")),
+ stdin_string => eval(qq("$stdin")),
);
}
);
}
@@
-45,11
+57,16
@@
sub shellcommands_queue {
my( $self, $svcnum ) = (shift, shift);
my $queue = new FS::queue {
'svcnum' => $svcnum,
my( $self, $svcnum ) = (shift, shift);
my $queue = new FS::queue {
'svcnum' => $svcnum,
- 'job' => "
Net::SSH::ssh_cmd", #freeside-queued pre-uses...
+ 'job' => "
FS::part_export::shellcommands::ssh_cmd",
};
$queue->insert( @_ );
}
};
$queue->insert( @_ );
}
+sub ssh_cmd { #subroutine, not method
+ use Net::SSH '0.06';
+ &Net::SSH::ssh_cmd( { @_ } );
+}
+
#sub shellcommands_insert { #subroutine, not method
#}
#sub shellcommands_replace { #subroutine, not method
#sub shellcommands_insert { #subroutine, not method
#}
#sub shellcommands_replace { #subroutine, not method