| -rw-r--r-- | src/eyefiservice.cc | 77 |
1 files changed, 73 insertions, 4 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 93bbcca..4a4a179 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc @@ -12,4 +12,21 @@ #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 */ @@ -78,3 +95,4 @@ int eyefiService::GetPhotoStatus( - std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); + eyekinfig_t eyekinfig(macaddress); + std::string computed_credential = binary_t(macaddress+eyekinfig.get_upload_key()+session_nonce.hex()).md5().hex(); @@ -86,3 +104,21 @@ int eyefiService::GetPhotoStatus( - r.fileid = 1; r.offset = 0; +#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<long>(0); + r.offset = filesize; + already.set(filename,filesignature,filesize); + } +#else /* HAVE_SQLITE */ + r.fileid=1, r.offset=0; +#endif /* HAVE_SQLITE */ return SOAP_OK; @@ -136,2 +172,5 @@ int eyefiService::UploadPhoto( binary_t digest, idigest; +#ifdef HAVE_SQLITE + bool beenthere = false; +#endif @@ -166,2 +205,9 @@ int eyefiService::UploadPhoto( #endif +#ifdef HAVE_SQLITE + if(!(*i).size) { + if(!already.is(filename,filesignature,filesize)) + throw std::runtime_error("got zero-length upload for unknown file"); + beenthere = true; continue; + } +#endif @@ -183,2 +229,9 @@ int eyefiService::UploadPhoto( +#ifdef HAVE_SQLITE + if(beenthere) { + r.success=true; + return SOAP_OK; + } +#endif + if(tf.empty()) throw std::runtime_error("haven't seen THE file"); @@ -205,4 +258,20 @@ int eyefiService::UploadPhoto( std::string cmd = eyekinfig.get_on_upload_photo(); - if(success && !cmd.empty()) { - if(detached_child()) { + if(success) { +#ifdef HAVE_SQLITE + { + iiidb_t D(eyekinfig); + D.prepare( + "INSERT INTO photo" + " (ctime,mac,fileid,filename,filesize,filesignature,encryption,flags)" + " VALUES" + " (:ctime,:mac,:fileid,:filename,:filesize,:filesignature,:encryption,:flags)" + ).bind(":ctime",time(0)) + .bind(":mac",macaddress) + .bind(":fileid",fileid).bind(":filename",filename) + .bind(":filesize",filesize).bind(":filesignature",filesignature) + .bind(":encryption",encryption).bind(":flags",flags) + .step(); + } +#endif /* HAVE_SQLITE */ + if((!cmd.empty()) && detached_child()) { putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) ); |