From b80844f51353339cfbb8b35a5585911cdb4301e2 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Tue, 12 Feb 2013 18:47:34 +0000 Subject: moved everything into worker class. --- diff --git a/src/Makefile.am b/src/Makefile.am index f2ff772..7258e8b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,13 +7,14 @@ noinst_HEADERS = \ seclude.h AM_CPPFLAGS = ${CPPFLAGS_DEBUG} \ - -DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\" + -DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\" \ + -DWITH_PURE_VIRTUAL DEFAULT_INCLUDES = -I${top_builddir} -I${builddir} -I${srcdir} INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS} ${SQLITE_CFLAGS} iiid_SOURCES = iiid.cc \ eyekinfig.cc eyetil.cc \ - eyefiservice.cc eyefiworker.cc + eyefiworker.cc nodist_iiid_SOURCES = \ ${builddir}/soapC.cpp ${builddir}/soapeyefiService.cpp \ COPYING.cc diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc deleted file mode 100644 index 4a4a179..0000000 --- a/src/eyefiservice.cc +++ b/dev/null @@ -1,290 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "eyekinfig.h" -#include "eyetil.h" -#include "soapeyefiService.h" -#ifdef HAVE_SQLITE -# include "iiidb.h" -#endif - -static binary_t session_nonce; -#ifdef HAVE_SQLITE - static struct { - std::string filesignature; - long filesize; - std::string filename; - inline void reset() { filesignature.erase(); filename.erase(); filesize=0; } - inline void set(const std::string n,const std::string sig,long siz) { - filename = n; filesignature = sig; filesize = siz; - } - inline bool is(const std::string n,const std::string sig,long siz) { - return filesize==siz && filename==n && filesignature==sig; - } - } already; -#endif /* HAVE_SQLITE */ - -static bool detached_child() { - pid_t p = fork(); - if(p<0) { - syslog(LOG_ERR,"Failed to fork away for hook execution"); - _exit(-1); - } - if(!p) { - setsid(); - for(int i=getdtablesize();i>=0;--i) close(i); - int i=open("/dev/null",O_RDWR); assert(i==0); - i = dup(i); assert(i==1); - i = dup(i); assert(i==2); - return true; - } - return false; -} - -static int E(eyefiService* efs,const char *c,const std::exception& e) { - efs->keep_alive=0; - syslog(LOG_ERR,"error while processing %s: %s",c,e.what()); - return soap_sender_fault(efs,gnu::autosprintf("error processing %s",c),0); -} - -int eyefiService::StartSession( - std::string macaddress,std::string cnonce, - int transfermode,long transfermodetimestamp, - struct rns__StartSessionResponse &r ) try { - syslog(LOG_INFO, - "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", - macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); - eyekinfig_t eyekinfig(macaddress); - r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); - - r.snonce = session_nonce.make_nonce().hex(); - r.transfermode=transfermode; - r.transfermodetimestamp=transfermodetimestamp; - r.upsyncallowed=false; - - std::string cmd = eyekinfig.get_on_start_session(); - if(!cmd.empty()) { - if(detached_child()) { - putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); - putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); - putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); - char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; - execv("/bin/sh",argv); - syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); - _exit(-1); - } - } - return SOAP_OK; -}catch(const std::exception& e) { return E(this,"StartSession",e); } - -int eyefiService::GetPhotoStatus( - std::string credential, std::string macaddress, - std::string filename, long filesize, std::string filesignature, - int flags, - struct rns__GetPhotoStatusResponse &r ) try { - syslog(LOG_INFO, - "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", - macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, - session_nonce.hex().c_str() ); - - eyekinfig_t eyekinfig(macaddress); - std::string computed_credential = binary_t(macaddress+eyekinfig.get_upload_key()+session_nonce.hex()).md5().hex(); - -#ifndef NDEBUG - syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); -#endif - - if (credential != computed_credential) throw std::runtime_error("card authentication failed"); - -#ifdef HAVE_SQLITE - iiidb_t D(eyekinfig); - seclude::stmt_t S = D.prepare( - "SELECT fileid FROM photo" - " WHERE mac=:mac AND filename=:filename" - " AND filesize=:filesize AND filesignature=:filesignature" - ).bind(":mac",macaddress) - .bind(":filename",filename).bind(":filesize",filesize) - .bind(":filesignature",filesignature); - if(!S.step()) { - r.fileid = 1; r.offset = 0; - }else{ - r.fileid = S.column(0); - r.offset = filesize; - already.set(filename,filesignature,filesize); - } -#else /* HAVE_SQLITE */ - r.fileid=1, r.offset=0; -#endif /* HAVE_SQLITE */ - return SOAP_OK; -}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } - -int eyefiService::MarkLastPhotoInRoll( - std::string macaddress, int mergedelta, - struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { - syslog(LOG_INFO, - "MarkLastPhotoInRoll request from %s with mergedelta=%d", - macaddress.c_str(), mergedelta ); - std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); - if(!cmd.empty()) { - if(detached_child()) { - putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); - putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); - char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; - execv("/bin/sh",argv); - syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); - _exit(-1); - } - } - keep_alive = 0; - return SOAP_OK; -}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } - -int eyefiService::UploadPhoto( - int fileid, std::string macaddress, - std::string filename, long filesize, std::string filesignature, - std::string encryption, int flags, - struct rns__UploadPhotoResponse& r ) try { - syslog(LOG_INFO, - "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," - " filesignature=%s, encryption=%s, flags=%04X", - macaddress.c_str(), fileid, filename.c_str(), filesize, - filesignature.c_str(), encryption.c_str(), flags ); - std::string::size_type fnl=filename.length(); - if(fnl #endif #include +#include +#include +#include #include +#include +#include +#include +#include +#include "eyekinfig.h" +#include "eyetil.h" #include "eyefiworker.h" #ifdef HAVE_SQLITE -# include "sqlite3.h" +# include "iiidb.h" #endif eyefiworker::eyefiworker() @@ -52,3 +61,279 @@ int eyefiworker::run(int bindport) { close(socket); socket = SOAP_INVALID_SOCKET; } } + +static binary_t session_nonce; +#ifdef HAVE_SQLITE + static struct { + std::string filesignature; + long filesize; + std::string filename; + inline void reset() { filesignature.erase(); filename.erase(); filesize=0; } + inline void set(const std::string n,const std::string sig,long siz) { + filename = n; filesignature = sig; filesize = siz; + } + inline bool is(const std::string n,const std::string sig,long siz) { + return filesize==siz && filename==n && filesignature==sig; + } + } already; +#endif /* HAVE_SQLITE */ + +static bool detached_child() { + pid_t p = fork(); + if(p<0) { + syslog(LOG_ERR,"Failed to fork away for hook execution"); + _exit(-1); + } + if(!p) { + setsid(); + for(int i=getdtablesize();i>=0;--i) close(i); + int i=open("/dev/null",O_RDWR); assert(i==0); + i = dup(i); assert(i==1); + i = dup(i); assert(i==2); + return true; + } + return false; +} + +static int E(eyefiworker* efs,const char *c,const std::exception& e) { + efs->keep_alive=0; + syslog(LOG_ERR,"error while processing %s: %s",c,e.what()); + return soap_sender_fault(efs,gnu::autosprintf("error processing %s",c),0); +} + +int eyefiworker::StartSession( + std::string macaddress,std::string cnonce, + int transfermode,long transfermodetimestamp, + struct rns__StartSessionResponse &r ) try { + syslog(LOG_INFO, + "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", + macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); + eyekinfig_t eyekinfig(macaddress); + r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); + + r.snonce = session_nonce.make_nonce().hex(); + r.transfermode=transfermode; + r.transfermodetimestamp=transfermodetimestamp; + r.upsyncallowed=false; + + std::string cmd = eyekinfig.get_on_start_session(); + if(!cmd.empty()) { + if(detached_child()) { + putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); + putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); + putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); + char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; + execv("/bin/sh",argv); + syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); + _exit(-1); + } + } + return SOAP_OK; +}catch(const std::exception& e) { return E(this,"StartSession",e); } + +int eyefiworker::GetPhotoStatus( + std::string credential, std::string macaddress, + std::string filename, long filesize, std::string filesignature, + int flags, + struct rns__GetPhotoStatusResponse &r ) try { + syslog(LOG_INFO, + "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", + macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, + session_nonce.hex().c_str() ); + + eyekinfig_t eyekinfig(macaddress); + std::string computed_credential = binary_t(macaddress+eyekinfig.get_upload_key()+session_nonce.hex()).md5().hex(); + +#ifndef NDEBUG + syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); +#endif + + if (credential != computed_credential) throw std::runtime_error("card authentication failed"); + +#ifdef HAVE_SQLITE + iiidb_t D(eyekinfig); + seclude::stmt_t S = D.prepare( + "SELECT fileid FROM photo" + " WHERE mac=:mac AND filename=:filename" + " AND filesize=:filesize AND filesignature=:filesignature" + ).bind(":mac",macaddress) + .bind(":filename",filename).bind(":filesize",filesize) + .bind(":filesignature",filesignature); + if(!S.step()) { + r.fileid = 1; r.offset = 0; + }else{ + r.fileid = S.column(0); + r.offset = filesize; + already.set(filename,filesignature,filesize); + } +#else /* HAVE_SQLITE */ + r.fileid=1, r.offset=0; +#endif /* HAVE_SQLITE */ + return SOAP_OK; +}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } + +int eyefiworker::MarkLastPhotoInRoll( + std::string macaddress, int mergedelta, + struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { + syslog(LOG_INFO, + "MarkLastPhotoInRoll request from %s with mergedelta=%d", + macaddress.c_str(), mergedelta ); + std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); + if(!cmd.empty()) { + if(detached_child()) { + putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); + putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); + char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; + execv("/bin/sh",argv); + syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); + _exit(-1); + } + } + keep_alive = 0; + return SOAP_OK; +}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } + +int eyefiworker::UploadPhoto( + int fileid, std::string macaddress, + std::string filename, long filesize, std::string filesignature, + std::string encryption, int flags, + struct rns__UploadPhotoResponse& r ) try { + syslog(LOG_INFO, + "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," + " filesignature=%s, encryption=%s, flags=%04X", + macaddress.c_str(), fileid, filename.c_str(), filesize, + filesignature.c_str(), encryption.c_str(), flags ); + std::string::size_type fnl=filename.length(); + if(fnl