projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c5a358f
)
shellcommands w/passwords
author
ivan
<ivan>
Thu, 20 Jun 2002 01:29:21 +0000
(
01:29
+0000)
committer
ivan
<ivan>
Thu, 20 Jun 2002 01:29:21 +0000
(
01:29
+0000)
FS/FS/part_export.pm
patch
|
blob
|
history
FS/FS/part_export/shellcommands.pm
patch
|
blob
|
history
FS/bin/freeside-queued
patch
|
blob
|
history
httemplate/edit/part_export.cgi
patch
|
blob
|
history
httemplate/edit/process/part_export.cgi
patch
|
blob
|
history
diff --git
a/FS/FS/part_export.pm
b/FS/FS/part_export.pm
index
9af0017
..
20e3ab4
100644
(file)
--- a/
FS/FS/part_export.pm
+++ b/
FS/FS/part_export.pm
@@
-526,21
+526,33
@@
tie my %shellcommands_options, 'Tie::IxHash',
#'machine' => { label=>'Remote machine' },
'user' => { label=>'Remote username', default=>'root' },
'useradd' => { label=>'Insert command',
#'machine' => { label=>'Remote machine' },
'user' => { label=>'Remote username', default=>'root' },
'useradd' => { label=>'Insert command',
- default=>'useradd -d $dir -m -s $shell -u $uid $username'
+ default=>'useradd -d $dir -m -s $shell -u $uid $username
; passwd $username
'
#default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
},
#default=>'cp -pr /etc/skel $dir; chown -R $uid.$gid $dir'
},
+ 'useradd_stdin' => { label=>'Insert command STDIN',
+ type =>'textarea',
+ default=>'$_password\n$_password\n',
+ },
'userdel' => { label=>'Delete command',
default=>'userdel $username',
#default=>'rm -rf $dir',
},
'userdel' => { label=>'Delete command',
default=>'userdel $username',
#default=>'rm -rf $dir',
},
+ 'userdel_stdin' => { label=>'Delete command STDIN',
+ type =>'textarea',
+ default=>'',
+ },
'usermod' => { label=>'Modify command',
'usermod' => { label=>'Modify command',
- default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username',
+ default=>'usermod -d $new_dir -l $new_username -s $new_shell -u $new_uid $old_username
; passwd $new_username
',
#default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
# 'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
# 'find . -depth -print | cpio -pdm $new_dir; '.
# 'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
# 'rm -rf $old_dir'.
#')'
#default=>'[ -d $old_dir ] && mv $old_dir $new_dir || ( '.
# 'chmod u+t $old_dir; mkdir $new_dir; cd $old_dir; '.
# 'find . -depth -print | cpio -pdm $new_dir; '.
# 'chmod u-t $new_dir; chown -R $uid.$gid $new_dir; '.
# 'rm -rf $old_dir'.
#')'
+ 'usermod_stdin' => { label=>'Modify command STDIN',
+ type =>'textarea',
+ default=>'$_password\n$_password\n',
+ },
},
;
},
;
diff --git
a/FS/FS/part_export/shellcommands.pm
b/FS/FS/part_export/shellcommands.pm
index
7a87bd3
..
870d7f1
100644
(file)
--- a/
FS/FS/part_export/shellcommands.pm
+++ b/
FS/FS/part_export/shellcommands.pm
@@
-20,23
+20,29
@@
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;
$self->shellcommands_queue( $svc_acct->svcnum,
no strict 'refs';
${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
$self->shellcommands_queue( $svc_acct->svcnum,
- $self->options('user')||'root'. "\@". $self->options('machine'),
- eval(qq("$command"))
+ user => $self->options('user')||'root',
+ host => $self->options('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;
$self->shellcommands_queue( $new->svcnum,
no strict 'refs';
${"old_$_"} = $old->getfield($_) foreach $old->fields;
${"new_$_"} = $new->getfield($_) foreach $new->fields;
$self->shellcommands_queue( $new->svcnum,
- $self->options('user')||'root'. "\@". $self->options('machine'),
- eval(qq("$command"))
+ user => $self->options('user')||'root',
+ host => $self->options('machine'),
+ command => eval(qq("$command")),
+ stdin_string => eval(qq("$stdin")),
);
}
);
}
@@
-45,11
+51,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
diff --git
a/FS/bin/freeside-queued
b/FS/bin/freeside-queued
index
846055d
..
48d283a
100644
(file)
--- a/
FS/bin/freeside-queued
+++ b/
FS/bin/freeside-queued
@@
-15,7
+15,7
@@
use FS::queue_depend;
# no autoloading just yet
use FS::cust_main;
use FS::svc_acct;
# no autoloading just yet
use FS::cust_main;
use FS::svc_acct;
-use Net::SSH 0.0
5
;
+use Net::SSH 0.0
6
;
use FS::part_export;
$max_kids = '10'; #guess it should be a config file...
use FS::part_export;
$max_kids = '10'; #guess it should be a config file...
diff --git
a/httemplate/edit/part_export.cgi
b/httemplate/edit/part_export.cgi
index
fbc698e
..
486bd43
100644
(file)
--- a/
httemplate/edit/part_export.cgi
+++ b/
httemplate/edit/part_export.cgi
@@
-63,6
+63,8
@@
my $widget = new HTML::Widgets::SelectLayers(
#}
}
$html .= '</SELECT>';
#}
}
$html .= '</SELECT>';
+ } elsif ( $type eq 'textarea' ) {
+ $html .= qq!<TEXTAREA NAME="$option">$value</TEXTAREA>!;
} elsif ( $type eq 'text' ) {
$html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
} else {
} elsif ( $type eq 'text' ) {
$html .= qq!<INPUT TYPE="text" NAME="$option" VALUE="$value" SIZE=64>!;
} else {
diff --git
a/httemplate/edit/process/part_export.cgi
b/httemplate/edit/process/part_export.cgi
index
6b4d007
..
fa009ed
100644
(file)
--- a/
httemplate/edit/process/part_export.cgi
+++ b/
httemplate/edit/process/part_export.cgi
@@
-6,7
+6,11
@@
my $old = qsearchs('part_export', { 'exportnum'=>$exportnum } ) if $exportnum;
#fixup options
#warn join('-', split(',',$cgi->param('options')));
#fixup options
#warn join('-', split(',',$cgi->param('options')));
-my %options = map { $_=>$cgi->param($_) } split(',',$cgi->param('options'));
+my %options = map {
+ my $value = $cgi->param($_);
+ $value =~ s/\r\n/\n/g; #browsers? (textarea)
+ $_ => $value;
+} split(',', $cgi->param('options'));
my $new = new FS::part_export ( {
map {
my $new = new FS::part_export ( {
map {