| -rw-r--r-- | core/launcher/transferserver.cpp | 595 |
1 files changed, 293 insertions, 302 deletions
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp index 0337a94..371400e 100644 --- a/core/launcher/transferserver.cpp +++ b/core/launcher/transferserver.cpp @@ -17,26 +17,25 @@ ** not clear to you. ** **********************************************************************/ -#define _XOPEN_SOURCE +//#define _XOPEN_SOURCE + +#include <qtopia/global.h> +#include <qtopia/qpeapplication.h> + +#ifndef Q_OS_WIN32 #include <pwd.h> #include <sys/types.h> #include <unistd.h> #include <stdlib.h> #include <time.h> #include <shadow.h> +#include <crypt.h> -/* we need the _OS_LINUX stuff first ! */ -#include <qglobal.h> - -#ifndef _OS_LINUX_ - -extern "C" -{ -#include <uuid/uuid.h> -#define UUID_H_INCLUDED -} +#else +#include <stdlib.h> +#include <time.h> +#endif -#endif // not defined linux #if defined(_OS_LINUX_) #include <shadow.h> @@ -50,17 +49,21 @@ extern "C" #include <qstringlist.h> #include <qfileinfo.h> #include <qregexp.h> -//#include <qpe/qcopchannel_qws.h> -#include <qpe/process.h> -#include <qpe/global.h> -#include <qpe/config.h> -#include <qpe/contact.h> -#include <qpe/quuid.h> -#include <qpe/version.h> -#include <qpe/qcopenvelope_qws.h> +//#include <qtopia/qcopchannel_qws.h> +#include <qtopia/process.h> +#include <qtopia/global.h> +#include <qtopia/config.h> +#include <qtopia/private/contact.h> +#include <qtopia/quuid.h> +#include <qtopia/version.h> +#ifdef Q_WS_QWS +#include <qtopia/qcopenvelope_qws.h> +#endif + +#include "launcherglobal.h" #include "transferserver.h" -#include <opie/oprocess.h> +#include <qtopia/qprocess.h> const int block_size = 51200; @@ -68,53 +71,37 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent , const char* name ) : QServerSocket( port, 1, parent, name ) { + connections.setAutoDelete( TRUE ); if ( !ok() ) qWarning( "Failed to bind to port %d", port ); } -TransferServer::~TransferServer() +void TransferServer::authorizeConnections() { + QListIterator<ServerPI> it(connections); + while ( it.current() ) { + if ( !it.current()->verifyAuthorised() ) { + disconnect( it.current(), SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) ); + connections.removeRef( it.current() ); + } else + ++it; } - -void TransferServer::newConnection( int socket ) -{ - (void) new ServerPI( socket, this ); } -/* - * small class in anonymous namespace - * to generate a QUUid for us - */ -namespace -{ -struct UidGen +void TransferServer::closed(ServerPI *item) { - QString uuid(); -}; -#if !defined(_OS_LINUX_) + connections.removeRef(item); +} -QString UidGen::uuid() +TransferServer::~TransferServer() { - uuid_t uuid; - uuid_generate( uuid ); - return QUUid( uuid ).toString(); } -#else -/* -* linux got a /proc/sys/kernel/random/uuid file -* it'll generate the uuids for us -*/ -QString UidGen::uuid() -{ - QFile file( "/proc/sys/kernel/random/uuid" ); - if (!file.open(IO_ReadOnly ) ) - return QString::null; - - QTextStream stream(&file); - return "{" + stream.read().stripWhiteSpace() + "}"; -} -#endif +void TransferServer::newConnection( int socket ) +{ + ServerPI *ptr = new ServerPI( socket, this ); + connect( ptr, SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) ); + connections.append( ptr ); } QString SyncAuthentication::serverId() @@ -122,9 +109,9 @@ QString SyncAuthentication::serverId() Config cfg("Security"); cfg.setGroup("Sync"); QString r = cfg.readEntry("serverid"); + if ( r.isEmpty() ) { - UidGen gen; - r = gen.uuid(); + r = Opie::Global::uuid(); cfg.writeEntry("serverid", r ); } return r; @@ -140,14 +127,19 @@ QString SyncAuthentication::ownerName() return c.fullName(); } - return ""; + return QString::null; } QString SyncAuthentication::loginName() { - struct passwd *pw; + struct passwd *pw = 0L; +#ifndef Q_OS_WIN32 pw = getpwuid( geteuid() ); return QString::fromLocal8Bit( pw->pw_name ); +#else + //### revise + return QString(); +#endif } int SyncAuthentication::isAuthorized(QHostAddress peeraddress) @@ -163,13 +155,13 @@ int SyncAuthentication::isAuthorized(QHostAddress peeraddress) uint auth_peer_bits = cfg.readNumEntry("auth_peer_bits", 24); uint mask = auth_peer_bits >= 32 // shifting by 32 is not defined ? 0xffffffff : (((1 << auth_peer_bits) - 1) << (32 - auth_peer_bits)); + return (peeraddress.ip4Addr() & mask) == auth_peer; } bool SyncAuthentication::checkUser( const QString& user ) { - if ( user.isEmpty() ) - return FALSE; + if ( user.isEmpty() ) return FALSE; QString euser = loginName(); return user == euser; } @@ -202,11 +194,17 @@ bool SyncAuthentication::checkPassword( const QString& password ) // Detect old Qtopia Desktop (no password) if ( password.isEmpty() ) { if ( denials < 1 || now > lastdenial + 600 ) { - QMessageBox::warning( 0, tr("Sync Connection"), + QMessageBox unauth( + tr("Sync Connection"), tr("<p>An unauthorized system is requesting access to this device." "<p>If you are using a version of Qtopia Desktop older than 1.5.1, " "please upgrade."), - tr("Deny") ); + QMessageBox::Warning, + QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, + 0, QString::null, TRUE, WStyle_StaysOnTop); + unauth.setButtonText(QMessageBox::Cancel, tr("Deny")); + unauth.exec(); + denials++; lastdenial = now; } @@ -214,45 +212,75 @@ bool SyncAuthentication::checkPassword( const QString& password ) } // Second, check sync password... - QString pass = password.left(6); - /* old QtopiaDesktops are sending - * rootme newer versions got a Qtopia - * prefixed. Qtopia prefix will suceed - * until the sync software syncs up - * FIXME - */ - if ( pass == "rootme" || pass == "Qtopia") { - - QString cpassword = QString::fromLocal8Bit( crypt( password.mid(8).local8Bit(), "qp" ) ); - Config cfg("Security"); + + static int lock=0; + if ( lock ) return FALSE; + + ++lock; + if ( password.left(6) == "Qtopia" ) { + Config cfg( QPEApplication::qpeDir()+"/etc/Security.conf", Config::File ); cfg.setGroup("Sync"); - QString pwds = cfg.readEntry("Passwords"); - if ( QStringList::split(QChar(' '), pwds).contains(cpassword) ) + QStringList pwds = cfg.readListEntry("Passwords",' '); + for (QStringList::ConstIterator it=pwds.begin(); it!=pwds.end(); ++it) { +#ifndef Q_OS_WIN32 + QString cpassword = QString::fromLocal8Bit( + crypt( password.mid(8).local8Bit(), (*it).left(2).latin1() ) ); +#else + // ### revise + QString cpassword(""); +#endif + if ( *it == cpassword ) { + lock--; return TRUE; + } + } // Unrecognized system. Be careful... - - if ( (denials > 2 && now < lastdenial + 600) - || QMessageBox::warning(0, tr("Sync Connection"), + QMessageBox unrecbox( + tr("Sync Connection"), tr("<p>An unrecognized system is requesting access to this device." "<p>If you have just initiated a Sync for the first time, this is normal."), - tr("Allow"), tr("Deny"), 0, 1, 1 ) == 1 ) { + QMessageBox::Warning, + QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton, + 0, QString::null, TRUE, WStyle_StaysOnTop); + unrecbox.setButtonText(QMessageBox::Cancel, tr("Deny")); + unrecbox.setButtonText(QMessageBox::Yes, tr("Allow")); + + if ( (denials > 2 && now < lastdenial+600) + || unrecbox.exec() != QMessageBox::Yes) + { denials++; lastdenial = now; + lock--; return FALSE; - } - else { + } else { + const char salty[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/."; + char salt[2]; + salt[0]= salty[rand() % (sizeof(salty)-1)]; + salt[1]= salty[rand() % (sizeof(salty)-1)]; +#ifndef Q_OS_WIN32 + QString cpassword = QString::fromLocal8Bit( + crypt( password.mid(8).local8Bit(), salt ) ); +#else + //### revise + QString cpassword(""); +#endif denials = 0; - cfg.writeEntry("Passwords", pwds + " " + cpassword); + pwds.prepend(cpassword); + cfg.writeEntry("Passwords",pwds,' '); + lock--; return TRUE; } } + lock--; return FALSE; } + ServerPI::ServerPI( int socket, QObject *parent , const char* name ) - : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 ) + : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 ), + storFileSize(-1) { state = Connected; @@ -262,12 +290,10 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name ) peeraddress = peerAddress(); #ifndef INSECURE - if ( !SyncAuthentication::isAuthorized(peeraddress) ) { state = Forbidden; startTimer( 0 ); - } - else + } else #endif { connect( this, SIGNAL( readyRead() ), SLOT( read() ) ); @@ -277,7 +303,7 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name ) for ( int i = 0; i < 4; i++ ) wait[i] = FALSE; - send( "220 Qtopia " QPE_VERSION " FTP Server" ); + send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr state = Wait_USER; dtp = new ServerDTP( this ); @@ -301,12 +327,25 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name ) ServerPI::~ServerPI() { + close(); + dtp->close(); + delete dtp; + delete serversocket; +} + +bool ServerPI::verifyAuthorised() +{ + if ( !SyncAuthentication::isAuthorized(peerAddress()) ) { + state = Forbidden; + return FALSE; + } + return TRUE; } void ServerPI::connectionClosed() { // qDebug( "Debug: Connection closed" ); - delete this; + emit connectionClosed(this); } void ServerPI::send( const QString& msg ) @@ -358,8 +397,7 @@ void ServerPI::process( const QString& message ) // split message using "," as separator QStringList msg = QStringList::split( " ", message ); - if ( msg.isEmpty() ) - return ; + if ( msg.isEmpty() ) return; // command token QString cmd = msg[0].upper(); @@ -383,8 +421,8 @@ void ServerPI::process( const QString& message ) // we always respond to QUIT, regardless of state if ( cmd == "QUIT" ) { - send( "211 Good bye!" ); - delete this; + send( "211 Good bye!" ); // No tr + close(); return ; } @@ -396,10 +434,10 @@ void ServerPI::process( const QString& message ) if ( Wait_USER == state ) { if ( cmd != "USER" || msg.count() < 2 || !SyncAuthentication::checkUser( arg ) ) { - send( "530 Please login with USER and PASS" ); + send( "530 Please login with USER and PASS" ); // No tr return ; } - send( "331 User name ok, need password" ); + send( "331 User name ok, need password" ); // No tr state = Wait_PASS; return ; } @@ -408,21 +446,24 @@ void ServerPI::process( const QString& message ) if ( Wait_PASS == state ) { if ( cmd != "PASS" || !SyncAuthentication::checkPassword( arg ) ) { - send( "530 Please login with USER and PASS" ); + send( "530 Please login with USER and PASS" ); // No tr return ; } - send( "230 User logged in, proceed" ); + send( "230 User logged in, proceed" ); // No tr state = Ready; return ; } // ACCESS CONTROL COMMANDS + // Only an ALLO sent immediately before STOR is valid. + if ( cmd != "STOR" ) + storFileSize = -1; // account (ACCT) if ( cmd == "ACCT" ) { // even wu-ftp does not support it - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // change working directory (CWD) @@ -430,32 +471,32 @@ void ServerPI::process( const QString& message ) if ( !args.isEmpty() ) { if ( directory.cd( args, TRUE ) ) - send( "250 Requested file action okay, completed" ); + send( "250 Requested file action okay, completed" ); // No tr else - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr } else - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr } // change to parent directory (CDUP) else if ( cmd == "CDUP" ) { if ( directory.cdUp() ) - send( "250 Requested file action okay, completed" ); + send( "250 Requested file action okay, completed" ); // No tr else - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr } // structure mount (SMNT) else if ( cmd == "SMNT" ) { // even wu-ftp does not support it - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // reinitialize (REIN) else if ( cmd == "REIN" ) { // even wu-ftp does not support it - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } @@ -465,15 +506,15 @@ void ServerPI::process( const QString& message ) // data port (PORT) else if ( cmd == "PORT" ) { if ( parsePort( arg ) ) - send( "200 Command okay" ); + send( "200 Command okay" ); // No tr else - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr } // passive (PASV) else if ( cmd == "PASV" ) { passiv = TRUE; - send( "227 Entering Passive Mode (" + send( "227 Entering Passive Mode (" // No tr + address().toString().replace( QRegExp( "\\." ), "," ) + "," + QString::number( ( serversocket->port() ) >> 8 ) + "," + QString::number( ( serversocket->port() ) & 0xFF ) + ")" ); @@ -482,25 +523,25 @@ void ServerPI::process( const QString& message ) // representation type (TYPE) else if ( cmd == "TYPE" ) { if ( arg.upper() == "A" || arg.upper() == "I" ) - send( "200 Command okay" ); + send( "200 Command okay" ); // No tr else - send( "504 Command not implemented for that parameter" ); + send( "504 Command not implemented for that parameter" ); // No tr } // file structure (STRU) else if ( cmd == "STRU" ) { if ( arg.upper() == "F" ) - send( "200 Command okay" ); + send( "200 Command okay" ); // No tr else - send( "504 Command not implemented for that parameter" ); + send( "504 Command not implemented for that parameter" ); // No tr } // transfer mode (MODE) else if ( cmd == "MODE" ) { if ( arg.upper() == "S" ) - send( "200 Command okay" ); + send( "200 Command okay" ); // No tr else - send( "504 Command not implemented for that parameter" ); + send( "504 Command not implemented for that parameter" ); // No tr } @@ -511,71 +552,72 @@ void ServerPI::process( const QString& message ) else if ( cmd == "RETR" ) if ( !args.isEmpty() && checkReadFile( absFilePath( args ) ) || backupRestoreGzip( absFilePath( args ) ) ) { - send( "150 File status okay" ); + send( "150 File status okay" ); // No tr sendFile( absFilePath( args ) ); } else { qDebug("550 Requested action not taken"); - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr } // store (STOR) else if ( cmd == "STOR" ) if ( !args.isEmpty() && checkWriteFile( absFilePath( args ) ) ) { - send( "150 File status okay" ); + send( "150 File status okay" ); // No tr retrieveFile( absFilePath( args ) ); } else - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr // store unique (STOU) else if ( cmd == "STOU" ) { - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // append (APPE) else if ( cmd == "APPE" ) { - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // allocate (ALLO) else if ( cmd == "ALLO" ) { - send( "200 Command okay" ); + storFileSize = args.toInt(); + send( "200 Command okay" ); // No tr } // restart (REST) else if ( cmd == "REST" ) { - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // rename from (RNFR) else if ( cmd == "RNFR" ) { renameFrom = QString::null; if ( args.isEmpty() ) - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr else { QFile file( absFilePath( args ) ); if ( file.exists() ) { - send( "350 File exists, ready for destination name" ); + send( "350 File exists, ready for destination name" ); // No tr renameFrom = absFilePath( args ); } else - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr } } // rename to (RNTO) else if ( cmd == "RNTO" ) { if ( lastCommand != "RNFR" ) - send( "503 Bad sequence of commands" ); + send( "503 Bad sequence of commands" ); // No tr else if ( args.isEmpty() ) - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr else { QDir dir( absFilePath( args ) ); if ( dir.rename( renameFrom, absFilePath( args ), TRUE ) ) - send( "250 Requested file action okay, completed." ); + send( "250 Requested file action okay, completed." ); // No tr else - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr } } @@ -583,24 +625,23 @@ void ServerPI::process( const QString& message ) else if ( cmd.contains( "ABOR" ) ) { dtp->close(); if ( dtp->dtpMode() != ServerDTP::Idle ) - send( "426 Connection closed; transfer aborted" ); + send( "426 Connection closed; transfer aborted" ); // No tr else - send( "226 Closing data connection" ); + send( "226 Closing data connection" ); // No tr } // delete (DELE) else if ( cmd == "DELE" ) { if ( args.isEmpty() ) - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr else { QFile file( absFilePath( args ) ) ; if ( file.remove() ) { - send( "250 Requested file action okay, completed" ); + send( "250 Requested file action okay, completed" ); // No tr QCopEnvelope e("QPE/System", "linkChanged(QString)" ); e << file.name(); - } - else { - send( "550 Requested action not taken" ); + } else { + send( "550 Requested action not taken" ); // No tr } } } @@ -608,13 +649,13 @@ void ServerPI::process( const QString& message ) // remove directory (RMD) else if ( cmd == "RMD" ) { if ( args.isEmpty() ) - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr else { QDir dir; if ( dir.rmdir( absFilePath( args ), TRUE ) ) - send( "250 Requested file action okay, completed" ); + send( "250 Requested file action okay, completed" ); // No tr else - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr } } @@ -622,14 +663,14 @@ void ServerPI::process( const QString& message ) else if ( cmd == "MKD" ) { if ( args.isEmpty() ) { qDebug(" Error: no arg"); - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr } else { QDir dir; if ( dir.mkdir( absFilePath( args ), TRUE ) ) - send( "250 Requested file action okay, completed." ); + send( "250 Requested file action okay, completed." ); // No tr else - send( "550 Requested action not taken" ); + send( "550 Requested action not taken" ); // No tr } } @@ -641,9 +682,9 @@ void ServerPI::process( const QString& message ) // list (LIST) else if ( cmd == "LIST" ) { if ( sendList( absFilePath( args ) ) ) - send( "150 File status okay" ); + send( "150 File status okay" ); // No tr else - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr } // size (SIZE) @@ -652,7 +693,7 @@ void ServerPI::process( const QString& message ) QFileInfo fi( filePath ); bool gzipfile = backupRestoreGzip( filePath ); if ( !fi.exists() && !gzipfile ) - send( "500 Syntax error, command unrecognized" ); + send( "500 Syntax error, command unrecognized" ); // No tr else { if ( !gzipfile ) send( "213 " + QString::number( fi.size() ) ); @@ -667,7 +708,7 @@ void ServerPI::process( const QString& message ) else { QString size = out.left( out.find("\t") ); int guess = size.toInt() / 5; - if ( filePath.contains("doc") ) + if ( filePath.contains("doc") ) // No tr guess *= 1000; qDebug("sending back gzip guess of %d", guess); send( "213 " + QString::number(guess) ); @@ -677,50 +718,50 @@ void ServerPI::process( const QString& message ) } // name list (NLST) else if ( cmd == "NLST" ) { - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // site parameters (SITE) else if ( cmd == "SITE" ) { - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // system (SYST) else if ( cmd == "SYST" ) { - send( "215 UNIX Type: L8" ); + send( "215 UNIX Type: L8" ); // No tr } // status (STAT) else if ( cmd == "STAT" ) { - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // help (HELP ) else if ( cmd == "HELP" ) { - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr } // noop (NOOP) else if ( cmd == "NOOP" ) { - send( "200 Command okay" ); + send( "200 Command okay" ); // No tr } // not implemented else - send( "502 Command not implemented" ); + send( "502 Command not implemented" ); // No tr lastCommand = cmd; } bool ServerPI::backupRestoreGzip( const QString &file ) { - return (file.find( "backup" ) != -1 && + return (file.find( "backup" ) != -1 && // No tr file.findRev( ".tgz" ) == (int)file.length() - 4 ); } bool ServerPI::backupRestoreGzip( const QString &file, QStringList &targets ) { - if ( file.find( "backup" ) != -1 && + if ( file.find( "backup" ) != -1 && // No tr file.findRev( ".tgz" ) == (int)file.length() - 4 ) { QFileInfo info( file ); targets = info.dirPath( TRUE ); @@ -743,8 +784,7 @@ void ServerPI::sendFile( const QString& file ) QStringList targets; if ( backupRestoreGzip( file, targets ) ) dtp->sendGzipFile( file, targets, peeraddress, peerport ); - else - dtp->sendFile( file, peeraddress, peerport ); + else dtp->sendFile( file, peeraddress, peerport ); } } @@ -761,15 +801,14 @@ void ServerPI::retrieveFile( const QString& file ) if ( backupRestoreGzip( file, targets ) ) dtp->retrieveGzipFile( file, peeraddress, peerport ); else - dtp->retrieveFile( file, peeraddress, peerport ); + dtp->retrieveFile( file, peeraddress, peerport, storFileSize ); } } bool ServerPI::parsePort( const QString& pp ) { QStringList p = QStringList::split( ",", pp ); - if ( p.count() != 6 ) - return FALSE; + if ( p.count() != 6 ) return FALSE; // h1,h2,h3,h4,p1,p2 peeraddress = QHostAddress( ( p[0].toInt() << 24 ) + ( p[1].toInt() << 16 ) + @@ -780,7 +819,7 @@ bool ServerPI::parsePort( const QString& pp ) void ServerPI::dtpCompleted() { - send( "226 Closing data connection, file transfer successful" ); + send( "226 Closing data connection, file transfer successful" ); // No tr if ( dtp->dtpMode() == ServerDTP::RetrieveFile ) { QString fn = dtp->fileName(); if ( fn.right(8) == ".desktop" && fn.find("/Documents/") >= 0 ) { @@ -790,20 +829,23 @@ void ServerPI::dtpCompleted() } waitsocket = 0; dtp->close(); + storFileSize = -1; } void ServerPI::dtpFailed() { dtp->close(); waitsocket = 0; - send( "451 Requested action aborted: local error in processing" ); + send( "451 Requested action aborted: local error in processing" ); // No tr + storFileSize = -1; } void ServerPI::dtpError( int ) { dtp->close(); waitsocket = 0; - send( "451 Requested action aborted: local error in processing" ); + send( "451 Requested action aborted: local error in processing" ); // No tr + storFileSize = -1; } bool ServerPI::sendList( const QString& arg ) @@ -821,8 +863,7 @@ bool ServerPI::sendList( const QString& arg ) fn = directory.path(); QFileInfo fi( fn ); - if ( !fi.exists() ) - return FALSE; + if ( !fi.exists() ) return FALSE; // return file listing if ( fi.isFile() ) { @@ -844,7 +885,7 @@ bool ServerPI::sendList( const QString& arg ) ++it; } - ts << "total " << QString::number( total / 1024 ) << endl; + ts << "total " << QString::number( total / 1024 ) << endl; // No tr it.toFirst(); while ( ( info = it.current() ) ) { @@ -870,8 +911,7 @@ bool ServerPI::sendList( const QString& arg ) QString ServerPI::fileListing( QFileInfo *info ) { - if ( !info ) - return QString::null; + if ( !info ) return QString::null; QString s; // type char @@ -897,10 +937,16 @@ QString ServerPI::fileListing( QFileInfo *info ) s += QString::number( subdirs ).rightJustify( 3, ' ', TRUE ) + " "; // owner - s += info->owner().leftJustify( 8, ' ', TRUE ) + " "; + QString o = info->owner(); + if ( o.isEmpty() ) + o = QString::number(info->ownerId()); + s += o.leftJustify( 8, ' ', TRUE ) + " "; // group - s += info->group().leftJustify( 8, ' ', TRUE ) + " "; + QString g = info->group(); + if ( g.isEmpty() ) + g = QString::number(info->groupId()); + s += g.leftJustify( 8, ' ', TRUE ) + " "; // file size in bytes s += QString::number( info->size() ).rightJustify( 9, ' ', TRUE ) + " "; @@ -921,51 +967,32 @@ QString ServerPI::fileListing( QFileInfo *info ) QString ServerPI::permissionString( QFileInfo *info ) { - if ( !info ) - return QString( "---------" ); + if ( !info ) return QString( "---------" ); QString s; // user - if ( info->permission( QFileInfo::ReadUser ) ) - s += "r"; - else - s += "-"; - if ( info->permission( QFileInfo::WriteUser ) ) - s += "w"; - else - s += "-"; - if ( info->permission( QFileInfo::ExeUser ) ) - s += "x"; - else - s += "-"; + if ( info->permission( QFileInfo::ReadUser ) ) s += "r"; + else s += "-"; + if ( info->permission( QFileInfo::WriteUser ) ) s += "w"; + else s += "-"; + if ( info->permission( QFileInfo::ExeUser ) ) s += "x"; + else s += "-"; // group - if ( info->permission( QFileInfo::ReadGroup ) ) - s += "r"; - else - s += "-"; - if ( info->permission( QFileInfo::WriteGroup ) ) - s += "w"; - else - s += "-"; - if ( info->permission( QFileInfo::ExeGroup ) ) - s += "x"; - else - s += "-"; + if ( info->permission( QFileInfo::ReadGroup ) ) s += "r"; + else s += "-"; + if ( info->permission( QFileInfo::WriteGroup ) )s += "w"; + else s += "-"; + if ( info->permission( QFileInfo::ExeGroup ) ) s += "x"; + else s += "-"; // exec - if ( info->permission( QFileInfo::ReadOther ) ) - s += "r"; - else - s += "-"; - if ( info->permission( QFileInfo::WriteOther ) ) - s += "w"; - else - s += "-"; - if ( info->permission( QFileInfo::ExeOther ) ) - s += "x"; - else - s += "-"; + if ( info->permission( QFileInfo::ReadOther ) ) s += "r"; + else s += "-"; + if ( info->permission( QFileInfo::WriteOther ) ) s += "w"; + else s += "-"; + if ( info->permission( QFileInfo::ExeOther ) ) s += "x"; + else s += "-"; return s; } @@ -974,8 +1001,7 @@ void ServerPI::newConnection( int socket ) { //qDebug( "New incomming connection" ); - if ( !passiv ) - return ; + if ( !passiv ) return; if ( wait[SendFile] ) { QStringList targets; @@ -990,7 +1016,7 @@ void ServerPI::newConnection( int socket ) if ( backupRestoreGzip( waitfile ) ) dtp->retrieveGzipFile( waitfile ); else - dtp->retrieveFile( waitfile ); + dtp->retrieveFile( waitfile, storFileSize ); dtp->setSocket( socket ); } else if ( wait[SendByteArray] ) { @@ -1011,8 +1037,7 @@ void ServerPI::newConnection( int socket ) QString ServerPI::absFilePath( const QString& file ) { - if ( file.isEmpty() ) - return file; + if ( file.isEmpty() ) return file; QString filepath( file ); if ( file[0] != "/" ) @@ -1030,7 +1055,7 @@ void ServerPI::timerEvent( QTimerEvent * ) ServerDTP::ServerDTP( QObject *parent, const char* name) : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ), - retrieveTargzProc( 0 ), gzipProc( 0 ) + retrieveTargzProc( 0 ) { connect( this, SIGNAL( connected() ), SLOT( connected() ) ); @@ -1038,26 +1063,33 @@ ServerDTP::ServerDTP( QObject *parent, const char* name) connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) ); connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) ); - gzipProc = new OProcess( this, "gzipProc" ); - - createTargzProc = new OProcess( QString("tar"), this, "createTargzProc"); + createTargzProc = new QProcess( QString("tar"), this, "createTargzProc"); // No tr + createTargzProc->setCommunication( QProcess::Stdout ); createTargzProc->setWorkingDirectory( QDir::rootDirPath() ); - connect( createTargzProc, SIGNAL( processExited(OProcess *) ), SLOT( targzDone() ) ); + connect( createTargzProc, SIGNAL( processExited() ), SLOT( targzDone() ) ); - QStringList args = "tar"; - args += "-xv"; - retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" ); + retrieveTargzProc = new QProcess( this, "retrieveTargzProc" ); + retrieveTargzProc->setCommunication( QProcess::Stdin ); retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() ); - connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ), + connect( retrieveTargzProc, SIGNAL( processExited() ), SIGNAL( completed() ) ); - connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ), + connect( retrieveTargzProc, SIGNAL( processExited() ), SLOT( extractTarDone() ) ); } ServerDTP::~ServerDTP() { buf.close(); + if ( RetrieveFile == mode && file.isOpen() ) { + // We're being shutdown before the client closed. + file.close(); + if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) { + qDebug( "STOR incomplete" ); + file.remove(); + } + } else { file.close(); + } createTargzProc->kill(); } @@ -1065,8 +1097,7 @@ void ServerDTP::extractTarDone() { qDebug("extract done"); #ifndef QT_NO_COP - - QCopEnvelope e( "QPE/Desktop", "restoreDone(QString)" ); + QCopEnvelope e( "QPE/System", "restoreDone(QString)" ); e << file.name(); #endif } @@ -1090,10 +1121,9 @@ void ServerDTP::connected() file.close(); emit completed(); mode = Idle; - } - else { - - if ( !file.atEnd() ) { + } else { + // Don't write more if there is plenty buffered already. + if ( bytesToWrite() <= block_size && !file.atEnd() ) { QCString s; s.resize( block_size ); int bytes = file.readBlock( s.data(), block_size ); @@ -1110,10 +1140,9 @@ void ServerDTP::connected() bytes_written = 0; qDebug("==>start send tar process"); - if ( !createTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdout) ) - qWarning("Error starting %s or %s", - createTargzProc->args()[0].data(), - gzipProc->args()[0].data()); + if ( !createTargzProc->start() ) + qWarning("Error starting %s", + createTargzProc->arguments().join(" ").latin1()); break; case SendBuffer: if ( !buf.open( IO_ReadOnly) ) { @@ -1184,13 +1213,19 @@ void ServerDTP::connectionClosed() // retrieve file mode else if ( RetrieveFile == mode ) { file.close(); + if ( recvFileSize >= 0 && (int)file.size() != recvFileSize ) { + qDebug( "STOR incomplete" ); + file.remove(); + emit failed(); + } else { emit completed(); } + } else if ( RetrieveGzipFile == mode ) { qDebug("Done writing ungzip file; closing input"); - gzipProc->flushStdin(); - gzipProc->closeStdin(); + retrieveTargzProc->flushStdin(); + retrieveTargzProc->closeStdin(); } // retrieve buffer mode @@ -1244,13 +1279,13 @@ void ServerDTP::readyRead() file.writeBlock( s.data(), s.size() ); } else if ( RetrieveGzipFile == mode ) { - if ( !gzipProc->isRunning() ) - gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout )); + if ( !retrieveTargzProc->isRunning() ) + retrieveTargzProc->start(); QByteArray s; s.resize( bytesAvailable() ); readBlock( s.data(), bytesAvailable() ); - gzipProc->writeStdin( s.data(), s.size() ); + retrieveTargzProc->writeToStdin( s ); qDebug("wrote %d bytes to ungzip ", s.size() ); } // retrieve buffer mode @@ -1262,35 +1297,20 @@ void ServerDTP::readyRead() } } -void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen) +void ServerDTP::writeTargzBlock() { - writeBlock( buffer, buflen ); - qDebug("writeTargzBlock %d", buflen); - if ( !createTargzProc->isRunning() ) { - qDebug("tar and gzip done"); - emit completed(); - mode = Idle; - disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int ) ), - this, SLOT( writeTargzBlock(OProcess *, char *, int) ) ); - } + QByteArray block = createTargzProc->readStdout(); + writeBlock( block.data(), block.size() ); + qDebug("writeTargzBlock %d", block.size()); } void ServerDTP::targzDone() { - //qDebug("targz done"); - disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess *, char *, int) ), - this, SLOT( gzipTarBlock(OProcess *, char *, int) ) ); - gzipProc->closeStdin(); -} - -void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen) -{ - //qDebug("gzipTarBlock"); - if ( !gzipProc->isRunning() ) { - //qDebug("auto start gzip proc"); - gzipProc->start(OProcess::NotifyOnExit, (OProcess::Communication) ( OProcess::Stdin | OProcess::Stdout )); - } - gzipProc->writeStdin( buffer, buflen ); + qDebug("tar and gzip done"); + emit completed(); + mode = Idle; + disconnect( createTargzProc, SIGNAL( readyReadStdout() ), + this, SLOT( writeTargzBlock() ) ); } void ServerDTP::sendFile( const QString fn, const QHostAddress& host, Q_UINT16 port ) @@ -1320,52 +1340,26 @@ void ServerDTP::sendGzipFile( const QString &fn, mode = SendGzipFile; file.setName( fn ); - QStringList args = "tar"; - args += "-cv"; + QStringList args = "targzip"; + //args += "-cv"; args += archiveTargets; qDebug("sendGzipFile %s", args.join(" ").latin1() ); - createTargzProc->clearArguments( ); - *createTargzProc << args; + createTargzProc->setArguments( args ); connect( createTargzProc, - SIGNAL( receivedStdout(OProcess *, char *, int) ), SLOT( gzipTarBlock(OProcess *, char *, int) ) ); - - gzipProc->clearArguments( ); - *gzipProc << "gzip"; - connect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ), - SLOT( writeTargzBlock(OProcess *, char *, int) ) ); + SIGNAL( readyReadStdout() ), SLOT( writeTargzBlock() ) ); } -void ServerDTP::gunzipDone() -{ - qDebug("gunzipDone"); - disconnect( gzipProc, SIGNAL( processExited() ), - this, SLOT( gunzipDone() ) ); - retrieveTargzProc->closeStdin(); - disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ), - this, SLOT( tarExtractBlock(OProcess *, char *, int) ) ); -} - -void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen) -{ - qDebug("tarExtractBlock"); - if ( !retrieveTargzProc->isRunning() ) { - qDebug("auto start ungzip proc"); - if ( !retrieveTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdin) ) - qWarning(" failed to start tar -x process"); - } - retrieveTargzProc->writeStdin( buffer, buflen ); -} - - -void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT16 port ) +void ServerDTP::retrieveFile( const QString fn, const QHostAddress& host, Q_UINT16 port, int fileSize ) { + recvFileSize = fileSize; file.setName( fn ); mode = RetrieveFile; connectToHost( host.toString(), port ); } -void ServerDTP::retrieveFile( const QString fn ) +void ServerDTP::retrieveFile( const QString fn, int fileSize ) { + recvFileSize = fileSize; file.setName( fn ); mode = RetrieveFile; } @@ -1376,12 +1370,9 @@ void ServerDTP::retrieveGzipFile( const QString &fn ) file.setName( fn ); mode = RetrieveGzipFile; - gzipProc->clearArguments(); - *gzipProc << "gunzip"; - connect( gzipProc, SIGNAL( readyReadStdout() ), - SLOT( tarExtractBlock() ) ); - connect( gzipProc, SIGNAL( processExited() ), - SLOT( gunzipDone() ) ); + retrieveTargzProc->setArguments( "targunzip" ); + connect( retrieveTargzProc, SIGNAL( processExited() ), + SLOT( extractTarDone() ) ); } void ServerDTP::retrieveGzipFile( const QString &fn, const QHostAddress& host, Q_UINT16 port ) |