| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/eyefiservice.cc | 77 | ||||
| -rw-r--r-- | src/eyefiworker.cc | 6 | ||||
| -rw-r--r-- | src/iiidb.h | 28 |
5 files changed, 114 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 1e0e42c..3b409fc 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,15 @@ PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) if $have_uuid ; then AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) AC_SUBST([UUID_UUID],[uuid]) fi +PKG_CHECK_MODULES([SQLITE],[sqlite3],[have_sqlite=true],[have_sqlite=false]) +$have_sqlite && AC_DEFINE([HAVE_SQLITE],,[defined in presence of libsqlite3]) + AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) notfound=false AC_CHECK_HEADERS([archive.h],[ AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) diff --git a/src/Makefile.am b/src/Makefile.am index b31bed5..f2ff772 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,25 +1,26 @@ bin_PROGRAMS=iii-extract-riff-chunk sbin_PROGRAMS=iiid noinst_HEADERS = \ eyefi.h \ eyekinfig.h eyetil.h \ - eyefiworker.h + eyefiworker.h iiidb.h \ + seclude.h AM_CPPFLAGS = ${CPPFLAGS_DEBUG} \ -DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\" DEFAULT_INCLUDES = -I${top_builddir} -I${builddir} -I${srcdir} -INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS} +INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS} ${SQLITE_CFLAGS} iiid_SOURCES = iiid.cc \ eyekinfig.cc eyetil.cc \ eyefiservice.cc eyefiworker.cc nodist_iiid_SOURCES = \ ${builddir}/soapC.cpp ${builddir}/soapeyefiService.cpp \ COPYING.cc -iiid_LDADD = ${MODULES_LIBS} ${UUID_LIBS} +iiid_LDADD = ${MODULES_LIBS} ${UUID_LIBS} ${SQLITE_LIBS} iii_extract_riff_chunk_SOURCES = iii-extract-riff-chunk.cc nodist_iii_extract_riff_chunk_SOURCES = COPYING.cc COPYING.cc: ${top_srcdir}/COPYING echo "const char * COPYING = " >$@ || (rm $@;exit 1) diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 93bbcca..4a4a179 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc @@ -7,14 +7,31 @@ #include <syslog.h> #include <sys/wait.h> #include <autosprintf.h> #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); @@ -73,21 +90,40 @@ int eyefiService::GetPhotoStatus( 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() ); - 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(); #ifndef NDEBUG syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); #endif if (credential != computed_credential) throw std::runtime_error("card authentication failed"); - 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; }catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } int eyefiService::MarkLastPhotoInRoll( std::string macaddress, int mergedelta, struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { @@ -131,12 +167,15 @@ int eyefiService::UploadPhoto( std::string td = eyekinfig.get_targetdir(); tmpdir_t indir(td+"/.incoming.XXXXXX"); std::string tf,lf; binary_t digest, idigest; +#ifdef HAVE_SQLITE + bool beenthere = false; +#endif for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { #ifndef NDEBUG syslog(LOG_DEBUG, " MIME attachment with id=%s, type=%s, size=%ld", (*i).id, (*i).type, (long)(*i).size ); @@ -161,12 +200,19 @@ int eyefiService::UploadPhoto( if(!tf.empty()) throw std::runtime_error("already seen tarball"); if(!digest.empty()) throw std::runtime_error("already have integrity digest"); digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); #ifndef NDEBUG syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); #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 tarchive_t a((*i).ptr,(*i).size); while(a.read_next_header()) { std::string ep = a.entry_pathname(), f = indir.get_file(ep); if(ep==the_file) tf = f; else if(ep==the_log) lf = f; @@ -178,12 +224,19 @@ int eyefiService::UploadPhoto( throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); close(fd); } } } +#ifdef HAVE_SQLITE + if(beenthere) { + r.success=true; + return SOAP_OK; + } +#endif + if(tf.empty()) throw std::runtime_error("haven't seen THE file"); if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); std::string::size_type ls = tf.rfind('/'); // XXX: actually, lack of '/' signifies error here std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); @@ -200,14 +253,30 @@ int eyefiService::UploadPhoto( if(!lf.empty()) unlink(lf.c_str()); success=true; break; } } 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()) ); putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) ); if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) ); char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; execv("/bin/sh",argv); diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc index c051482..9dcd048 100644 --- a/src/eyefiworker.cc +++ b/src/eyefiworker.cc @@ -1,9 +1,12 @@ #include <signal.h> #include <stdexcept> #include "eyefiworker.h" +#ifdef HAVE_SQLITE +# include "sqlite3.h" +#endif eyefiworker::eyefiworker() : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { bind_flags = SO_REUSEADDR; max_keep_alive = 0; socket_flags = #if defined(MSG_NOSIGNAL) @@ -14,12 +17,15 @@ eyefiworker::eyefiworker() #error Something is wrong with sigpipe prevention on the platform #endif ; } int eyefiworker::run(int bindport) { +#ifdef HAVE_SQLITE + sqlite3_initialize(); +#endif if(!soap_valid_socket(bind(0,bindport,64))) throw std::runtime_error("failed to bind()"); signal(SIGCHLD,SIG_IGN); while(true) { if(!soap_valid_socket(accept())) throw std::runtime_error("failed to accept()"); diff --git a/src/iiidb.h b/src/iiidb.h new file mode 100644 index 0000000..e77fa09 --- a/dev/null +++ b/src/iiidb.h @@ -0,0 +1,28 @@ +#ifndef __IIIDB_H +#define __IIIDB_H + +#include <autosprintf.h> +#include "seclude.h" +#include "eyekinfig.h" + +struct iiidb_t : public seclude::db_t { + iiidb_t(eyekinfig_t& k) : seclude::db_t(gnu::autosprintf("%s/.iii.db",k.get_targetdir().c_str())) { + try { + exec("SELECT 1 FROM photo LIMIT 0"); + }catch(const seclude::sqlite3_error& e) { + exec( "CREATE TABLE photo (" + " id integer PRIMARY KEY AUTOINCREMENT," + " ctime integer NOT NULL," + " mac text NOT NULL," + " fileid integer NOT NULL," + " filename text NOT NULL," + " filesize integer NOT NULL," + " filesignature text NOT NULL UNIQUE," + " encryption text NOT NULL," + " flags integer NOT NULL" + ")" ); + } + } +}; + +#endif /* __IIIDB_H */ |