songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SFTP API instead of SCP API

This commit is contained in:
Nicolas Saillant 2023-04-28 13:58:49 +02:00
parent d0478493a0
commit ab0b31fed3
2 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -3191,8 +3191,8 @@ void MainWindow::on_actionSa_ve_Scene_as_Script_triggered()
tr("Enter the name of your scene file.")); tr("Enter the name of your scene file."));
if(path.isEmpty()) if(path.isEmpty())
return; return;
if(!path.contains("Polyhedron_demo_")) if(!path.contains("/tmp/Polyhedron_demo_"))
path.prepend("Polyhedron_demo_"); path.prepend("/tmp/Polyhedron_demo_");
try{ try{
ssh_session session = nullptr; ssh_session session = nullptr;
bool res = establish_ssh_session_from_agent(session, bool res = establish_ssh_session_from_agent(session,

125
Polyhedron/demo/Polyhedron/Use_ssh.cpp
View File

@ -26,6 +26,10 @@
#include <QMessageBox> #include <QMessageBox>
#include <QStringList> #include <QStringList>
#include <libssh/sftp.h>
#include <fcntl.h>
bool test_result(int res) bool test_result(int res)
{ {
switch(res){ switch(res){
@ -240,21 +244,22 @@ bool push_file(ssh_session &session,
const char* dest_path, const char* dest_path,
const char* filepath) const char* filepath)
{ {
std::size_t processed = 0;
sftp_file sftpfile;
//copy a file //copy a file
ssh_scp scp = ssh_scp_new( sftp_session sftp = sftp_new(session);
session, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, "/tmp"); if (sftp == nullptr)
if (scp == nullptr)
{ {
std::cerr<<"Error allocating scp session: %s\n" std::cerr<<"Error allocating sftp session:\n"
<< ssh_get_error(session)<<std::endl; << ssh_get_error(session)<<std::endl;
return false; return false;
} }
int res = ssh_scp_init(scp); int res = sftp_init(sftp);
if(res != SSH_OK) if(res < 0)
{ {
std::cerr<< "Error initializing scp session: %s\n" std::cerr<< "Error initializing sftp session:\n"
<< ssh_get_error(session)<<std::endl; << ssh_get_error(session)<<std::endl;
ssh_scp_free(scp); sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
@ -263,7 +268,7 @@ bool push_file(ssh_session &session,
if(!file) if(!file)
{ {
std::cerr<<"File not found."<<std::endl; std::cerr<<"File not found."<<std::endl;
ssh_scp_free(scp); sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
@ -274,44 +279,39 @@ bool push_file(ssh_session &session,
if (!file.read(buffer.data(), size)) if (!file.read(buffer.data(), size))
{ {
std::cerr<<"error while reading file."<<std::endl; std::cerr<<"error while reading file."<<std::endl;
ssh_scp_free(scp); sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
//push a file to /tmp //push a file to /tmp
res = ssh_scp_push_directory(scp, ".", 0755); sftpfile = sftp_open(sftp, dest_path, O_WRONLY | O_CREAT, 0644);
if (res != SSH_OK) if (sftpfile == NULL)
{ {
std::cerr<<"Can't create remote directory: %s\n" std::cerr<< "Can't open remote file:\n"
<< ssh_get_error(session)<<std::endl; << ssh_get_error(session)<<std::endl;
ssh_scp_free(scp); sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
res = ssh_scp_push_file while ( size > 0 )
(scp, dest_path, size, 0644);
if (res != SSH_OK)
{ {
std::cerr<< "Can't open remote file: %s\n" int s = size;
if (s > 16384)
s = 16384;
res = sftp_write(sftpfile, buffer.data() + processed, s);
if ( res < 0)
{
std::cerr<< "Can't write data to file:\n"
<< ssh_get_error(session)<<std::endl; << ssh_get_error(session)<<std::endl;
ssh_scp_free(scp); sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
res = ssh_scp_write(scp, buffer.data(), size); size -= res;
//some versions of libssh don't copy everything without this. processed += res;
//This is the case for the official version on Ubuntu 18.04
std::chrono::duration<int, std::micro> timespan(size);
std::this_thread::sleep_for(timespan);
if (res != SSH_OK)
{
std::cerr<< "Can't write to remote file: %s\n"
<< ssh_get_error(session)<<std::endl;
ssh_scp_free(scp);
ssh_disconnect(session);
return false;
} }
ssh_scp_free(scp); sftp_close(sftpfile);
sftp_free(sftp);
return true; return true;
} }
@ -323,63 +323,62 @@ bool pull_file(ssh_session &session,
std::size_t size; std::size_t size;
std::size_t processed = 0; std::size_t processed = 0;
std::vector<char> buffer; std::vector<char> buffer;
sftp_file sftpfile;
ssh_scp scp = ssh_scp_new( sftp_session sftp = sftp_new(session);
session, SSH_SCP_READ | SSH_SCP_RECURSIVE, from_path); if (sftp == nullptr)
if (scp == nullptr)
{ {
std::cerr<<"Error allocating scp session: %s\n" std::cerr<<"Error allocating sftp session:\n"
<< ssh_get_error(session)<<std::endl; << ssh_get_error(session)<<std::endl;
return false; return false;
} }
int res = ssh_scp_init(scp); int res = sftp_init(sftp);
if(res != SSH_OK) if(res < 0)
{ {
std::cerr<< "Error initializing scp session: %s\n" std::cerr<< "Error initializing sftp session:\n"
<< ssh_get_error(session)<<std::endl; << ssh_get_error(session)<<std::endl;
ssh_scp_free(scp); sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
rc = ssh_scp_pull_request(scp); sftpfile = sftp_open(sftp, from_path, O_RDONLY, 0);
if (rc != SSH_SCP_REQUEST_NEWFILE) if (sftpfile == NULL)
{ {
std::cerr<< "Error receiving information about file: %s\n" std::cerr<< "Can't open remote file:\n"
<< ssh_get_error(session)<<std::endl; << ssh_get_error(session)<<std::endl;
ssh_scp_free(scp); sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
size = ssh_scp_request_get_size64(scp); sftp_attributes sftpattr;
sftpattr = sftp_stat(sftp,from_path);
size=sftpattr->size;
buffer.resize(size); buffer.resize(size);
if(ssh_scp_accept_request(scp) != SSH_OK) while ( size > 0 )
{ {
std::cerr<< "Could not accept request."<<std::endl; int s = size;
ssh_scp_free(scp); if (s > 16384)
s = 16384;
res = sftp_read(sftpfile, buffer.data() + processed, s);
if ( res < 0)
{
std::cerr<< "Can't read data to file:\n"
<< ssh_get_error(session)<<std::endl;
sftp_free(sftp);
ssh_disconnect(session); ssh_disconnect(session);
return false; return false;
} }
size -= res;
do{ processed += res;
rc = ssh_scp_read(scp, buffer.data() + processed, size-processed);
if (rc == SSH_ERROR)
{
std::cerr<< "Error receiving file data: %s\n"<< ssh_get_error(session)<<std::endl;
//free(buffer);
ssh_scp_free(scp);
ssh_disconnect(session);
return false;
} }
else size=sftpattr->size;
processed += rc;
}while(processed != size);
std::ofstream file(to_path, std::ios::binary |std::ios::trunc); std::ofstream file(to_path, std::ios::binary |std::ios::trunc);
if(!file.write(buffer.data(), size)) if(!file.write(buffer.data(), size))
{ {
std::cerr<<"Error while writing file."<<std::endl; std::cerr<<"Error while writing file."<<std::endl;
} }
file.close(); file.close();
ssh_scp_free(scp); sftp_close(sftpfile);
sftp_free(sftp);
return true; return true;
} }