Lines 32-38
use Net::SFTP::Foreign;
Link Here
|
32 |
|
32 |
|
33 |
use Koha::Database; |
33 |
use Koha::Database; |
34 |
use Koha::DateUtils qw( dt_from_string ); |
34 |
use Koha::DateUtils qw( dt_from_string ); |
35 |
use Koha::Encryption; |
35 |
use Koha::SFTP::Servers; |
36 |
|
36 |
|
37 |
sub new { |
37 |
sub new { |
38 |
my ( $class, $account_id ) = @_; |
38 |
my ( $class, $account_id ) = @_; |
Lines 62-90
sub download_messages {
Link Here
|
62 |
my ( $self, $message_type ) = @_; |
62 |
my ( $self, $message_type ) = @_; |
63 |
$self->{message_type} = $message_type; |
63 |
$self->{message_type} = $message_type; |
64 |
|
64 |
|
|
|
65 |
my $sftp_server_id = $self->{account}->download_sftp_server_id; |
66 |
my $sftp_server_transport; |
67 |
$sftp_server_transport = Koha::SFTP::Servers->find($sftp_server_id)->transport |
68 |
if ($sftp_server_id); |
69 |
|
65 |
my @retrieved_files; |
70 |
my @retrieved_files; |
66 |
|
71 |
|
67 |
if ( $self->{account}->transport eq 'SFTP' ) { |
72 |
if ($message_type) { |
68 |
@retrieved_files = $self->sftp_download(); |
73 |
if ( !$sftp_server_transport ) { |
69 |
} elsif ( $self->{account}->transport eq 'FILE' ) { |
74 |
@retrieved_files = $self->file_download(); |
70 |
@retrieved_files = $self->file_download(); |
75 |
} elsif ( $sftp_server_transport eq 'sftp' ) { |
71 |
} else { # assume FTP |
76 |
@retrieved_files = $self->sftp_download(); |
72 |
@retrieved_files = $self->ftp_download(); |
77 |
} elsif ( $sftp_server_transport eq 'ftp' ) { |
|
|
78 |
@retrieved_files = $self->ftp_download(); |
79 |
} |
73 |
} |
80 |
} |
|
|
81 |
|
74 |
return @retrieved_files; |
82 |
return @retrieved_files; |
75 |
} |
83 |
} |
76 |
|
84 |
|
77 |
sub upload_messages { |
85 |
sub upload_messages { |
78 |
my ( $self, @messages ) = @_; |
86 |
my ( $self, @messages ) = @_; |
|
|
87 |
|
88 |
my $sftp_server_id = $self->{account}->upload_sftp_server_id; |
89 |
my $sftp_server_transport; |
90 |
$sftp_server_transport = Koha::SFTP::Servers->find($sftp_server_id)->transport |
91 |
if ($sftp_server_id); |
92 |
|
79 |
if (@messages) { |
93 |
if (@messages) { |
80 |
if ( $self->{account}->transport eq 'SFTP' ) { |
94 |
if ( !$sftp_server_transport ) { |
|
|
95 |
$self->ftp_upload(@messages); |
96 |
} elsif ( $sftp_server_transport eq 'sftp' ) { |
81 |
$self->sftp_upload(@messages); |
97 |
$self->sftp_upload(@messages); |
82 |
} elsif ( $self->{account}->transport eq 'FILE' ) { |
98 |
} elsif ( $sftp_server_transport eq 'ftp' ) { |
83 |
$self->file_upload(@messages); |
99 |
$self->file_upload(@messages); |
84 |
} else { # assume FTP |
|
|
85 |
$self->ftp_upload(@messages); |
86 |
} |
100 |
} |
87 |
} |
101 |
} |
|
|
102 |
|
88 |
return; |
103 |
return; |
89 |
} |
104 |
} |
90 |
|
105 |
|
Lines 125-141
sub file_download {
Link Here
|
125 |
sub sftp_download { |
140 |
sub sftp_download { |
126 |
my $self = shift; |
141 |
my $self = shift; |
127 |
|
142 |
|
|
|
143 |
my $sftp_server_id = $self->{account}->download_sftp_server_id; |
144 |
return |
145 |
unless $sftp_server_id; |
146 |
my $sftp_server = Koha::SFTP::Servers->find($sftp_server_id); |
147 |
return |
148 |
unless $sftp_server; |
149 |
|
128 |
my $file_ext = _get_file_ext( $self->{message_type} ); |
150 |
my $file_ext = _get_file_ext( $self->{message_type} ); |
129 |
|
151 |
|
130 |
# C = ready to retrieve E = Edifact |
152 |
# C = ready to retrieve E = Edifact |
131 |
my $msg_hash = $self->message_hash(); |
153 |
my $msg_hash = $self->message_hash(); |
132 |
my @downloaded_files; |
154 |
my @downloaded_files; |
133 |
my $port = $self->{account}->download_port ? $self->{account}->download_port : '22'; |
|
|
134 |
my $sftp = Net::SFTP::Foreign->new( |
155 |
my $sftp = Net::SFTP::Foreign->new( |
135 |
host => $self->{account}->host, |
156 |
host => $sftp_server->host, |
136 |
user => $self->{account}->username, |
157 |
user => $sftp_server->user_name, |
137 |
password => Koha::Encryption->new->decrypt_hex( $self->{account}->password ), |
158 |
password => $sftp_server->plain_text_password, |
138 |
port => $port, |
159 |
port => $sftp_server->port, |
139 |
timeout => 10, |
160 |
timeout => 10, |
140 |
); |
161 |
); |
141 |
if ( $sftp->error ) { |
162 |
if ( $sftp->error ) { |
Lines 215-239
sub ingest {
Link Here
|
215 |
sub ftp_download { |
236 |
sub ftp_download { |
216 |
my $self = shift; |
237 |
my $self = shift; |
217 |
|
238 |
|
|
|
239 |
my $sftp_server_id = $self->{account}->download_sftp_server_id; |
240 |
return |
241 |
unless $sftp_server_id; |
242 |
my $sftp_server = Koha::SFTP::Servers->find($sftp_server_id); |
243 |
return |
244 |
unless $sftp_server; |
245 |
|
218 |
my $file_ext = _get_file_ext( $self->{message_type} ); |
246 |
my $file_ext = _get_file_ext( $self->{message_type} ); |
219 |
|
247 |
|
220 |
# C = ready to retrieve E = Edifact |
248 |
# C = ready to retrieve E = Edifact |
221 |
|
249 |
|
222 |
my $msg_hash = $self->message_hash(); |
250 |
my $msg_hash = $self->message_hash(); |
223 |
my @downloaded_files; |
251 |
my @downloaded_files; |
224 |
my $port = $self->{account}->download_port ? $self->{account}->download_port : '21'; |
252 |
my $ftp = Net::FTP->new( |
225 |
my $ftp = Net::FTP->new( |
253 |
$sftp_server->host, |
226 |
$self->{account}->host, |
254 |
Port => $sftp_server->port, |
227 |
Port => $port, |
|
|
228 |
Timeout => 10, |
255 |
Timeout => 10, |
229 |
Passive => 1 |
256 |
Passive => $sftp_server->passiv, |
230 |
) |
257 |
) |
231 |
or return $self->_abort_download( |
258 |
or return $self->_abort_download( |
232 |
undef, |
259 |
undef, |
233 |
"Cannot connect to " . $self->{account}->host . ": $EVAL_ERROR" |
260 |
"Cannot connect to " . $sftp_server->host . ": " . $EVAL_ERROR |
234 |
); |
261 |
); |
235 |
$ftp->login( $self->{account}->username, Koha::Encryption->new->decrypt_hex( $self->{account}->password ) ) |
262 |
$ftp->login( $sftp_server->user_name, $sftp_server->plain_text_password ) |
236 |
or return $self->_abort_download( $ftp, "Cannot login: " . $ftp->message() ); |
263 |
or return $self->_abort_download( $ftp, "Cannot login: $ftp->message()" ); |
237 |
$ftp->cwd( $self->{account}->download_directory ) |
264 |
$ftp->cwd( $self->{account}->download_directory ) |
238 |
or return $self->_abort_download( |
265 |
or return $self->_abort_download( |
239 |
$ftp, |
266 |
$ftp, |
Lines 269-287
sub ftp_download {
Link Here
|
269 |
|
296 |
|
270 |
sub ftp_upload { |
297 |
sub ftp_upload { |
271 |
my ( $self, @messages ) = @_; |
298 |
my ( $self, @messages ) = @_; |
272 |
my $port = $self->{account}->upload_port ? $self->{account}->upload_port : '21'; |
299 |
|
273 |
my $ftp = Net::FTP->new( |
300 |
my $sftp_server_id = $self->{account}->upload_sftp_server_id; |
274 |
$self->{account}->host, |
301 |
return |
275 |
Port => $port, |
302 |
unless $sftp_server_id; |
|
|
303 |
my $sftp_server = Koha::SFTP::Servers->find($sftp_server_id); |
304 |
return |
305 |
unless $sftp_server; |
306 |
|
307 |
my $ftp = Net::FTP->new( |
308 |
$sftp_server->host, |
309 |
Port => $sftp_server->port, |
276 |
Timeout => 10, |
310 |
Timeout => 10, |
277 |
Passive => 1 |
311 |
Passive => $sftp_server->passiv |
278 |
) |
312 |
) |
279 |
or return $self->_abort_download( |
313 |
or return $self->_abort_download( |
280 |
undef, |
314 |
undef, |
281 |
"Cannot connect to " . $self->{account}->host . ": $EVAL_ERROR" |
315 |
"Cannot connect to " . $sftp_server->host . ": " . $EVAL_ERROR |
282 |
); |
316 |
); |
283 |
$ftp->login( $self->{account}->username, Koha::Encryption->new->decrypt_hex( $self->{account}->password ) ) |
317 |
$ftp->login( $sftp_server->user_name, $sftp_server->plain_text_password ) |
284 |
or return $self->_abort_download( $ftp, "Cannot login: " . $ftp->message() ); |
318 |
or return $self->_abort_download( $ftp, "Cannot login: $ftp->message()" ); |
285 |
$ftp->cwd( $self->{account}->upload_directory ) |
319 |
$ftp->cwd( $self->{account}->upload_directory ) |
286 |
or return $self->_abort_download( |
320 |
or return $self->_abort_download( |
287 |
$ftp, |
321 |
$ftp, |
Lines 310-324
sub ftp_upload {
Link Here
|
310 |
|
344 |
|
311 |
sub sftp_upload { |
345 |
sub sftp_upload { |
312 |
my ( $self, @messages ) = @_; |
346 |
my ( $self, @messages ) = @_; |
313 |
my $port = $self->{account}->upload_port ? $self->{account}->upload_port : '22'; |
347 |
|
|
|
348 |
my $sftp_server_id = $self->{account}->upload_sftp_server_id; |
349 |
return |
350 |
unless $sftp_server_id; |
351 |
my $sftp_server = Koha::SFTP::Servers->find($sftp_server_id); |
352 |
return |
353 |
unless $sftp_server; |
354 |
|
314 |
my $sftp = Net::SFTP::Foreign->new( |
355 |
my $sftp = Net::SFTP::Foreign->new( |
315 |
host => $self->{account}->host, |
356 |
host => $sftp_server->host, |
316 |
user => $self->{account}->username, |
357 |
user => $sftp_server->user_name, |
317 |
password => Koha::Encryption->new->decrypt_hex( $self->{account}->password ), |
358 |
password => $sftp_server->plain_text_password, |
318 |
port => $port, |
359 |
port => $sftp_server->port, |
319 |
timeout => 10, |
360 |
timeout => 10, |
320 |
); |
361 |
); |
321 |
$sftp->die_on_error( "Cannot ssh to " . $self->{account}->host ); |
362 |
$sftp->die_on_error( "Cannot ssh to " . $sftp_server->host ); |
322 |
$sftp->setcwd( $self->{account}->upload_directory ) |
363 |
$sftp->setcwd( $self->{account}->upload_directory ) |
323 |
or return $self->_abort_download( |
364 |
or return $self->_abort_download( |
324 |
$sftp, |
365 |
$sftp, |