stream mime attachments directly to disk

Signed-off-by: Michael Krelin <hacker@klever.net>

4 files changed, 90 insertions, 70 deletions

diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index 645069e..597a3f2 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -36,3 +36,13 @@ eyefiworker::eyefiworker()
     }
-eyefiworker::~eyefiworker() {
+
+static void *fmimewriteopen_(struct soap *soap,
+	void *handle, const char *id, const char *type, const char *description,
+	enum soap_mime_encoding encoding) {
+    return static_cast<eyefiworker*>(soap)->mime_writeopen(handle,id,type,description,encoding);
+}
+static int fmimewrite_(struct soap *soap,void *handle,const char *buf,size_t len) {
+    return static_cast<eyefiworker*>(soap)->mime_write(handle,buf,len);
+}
+static void fmimewriteclose_(struct soap *soap,void *handle) {
+    static_cast<eyefiworker*>(soap)->mime_writeclose(handle);
 }
@@ -43,2 +53,3 @@ int eyefiworker::run(int bindport) {
     signal(SIGCHLD,SIG_IGN);
+    fmimewriteopen=fmimewriteopen_; fmimewrite=fmimewrite_; fmimewriteclose=fmimewriteclose_;
     while(true) {
@@ -112,4 +123,6 @@ int eyefiworker::StartSession(
 	    macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
-    eyekinfig_t eyekinfig(macaddress);
-    r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex();
+    kinfig.reset(new eyekinfig_t(macaddress));
+    umask(kinfig->get_umask());
+
+    r.credential = binary_t(macaddress+cnonce+kinfig->get_upload_key()).md5().hex();
 
@@ -120,3 +133,3 @@ int eyefiworker::StartSession(
 
-    std::string cmd = eyekinfig.get_on_start_session();
+    std::string cmd = kinfig->get_on_start_session();
     if(!cmd.empty()) {
@@ -145,4 +158,6 @@ int eyefiworker::GetPhotoStatus(
 
-    eyekinfig_t eyekinfig(macaddress);
-    std::string computed_credential = binary_t(macaddress+eyekinfig.get_upload_key()+session_nonce.hex()).md5().hex();
+    if(!(kinfig && kinfig->macaddress==macaddress))
+	throw std::runtime_error("I'm not talking to this peer");
+
+    std::string computed_credential = binary_t(macaddress+kinfig->get_upload_key()+session_nonce.hex()).md5().hex();
 
@@ -154,4 +169,6 @@ int eyefiworker::GetPhotoStatus(
 
+    indir.reset(new tmpdir_t(kinfig->get_targetdir()+"/.incoming.XXXXXX"));
+
 #ifdef HAVE_SQLITE
-    iiidb_t D(eyekinfig);
+    iiidb_t D(*kinfig);
     seclude::stmt_t S = D.prepare(
@@ -182,3 +199,6 @@ int eyefiworker::MarkLastPhotoInRoll(
 	    macaddress.c_str(), mergedelta );
-    std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
+    if(!(kinfig && kinfig->macaddress==macaddress))
+	throw std::runtime_error("I'm not talking to this peer");
+
+    std::string cmd = kinfig->get_on_mark_last_photo_in_roll();
     if(!cmd.empty()) {
@@ -197,2 +217,22 @@ int eyefiworker::MarkLastPhotoInRoll(
 
+void *eyefiworker::mime_writeopen(void *handle,const char *id,const char *type,const char *description,
+	enum soap_mime_encoding encoding) {
+    if(!id) return NULL;
+    if(!strcmp(id,"FILENAME")) {
+	mime_tarfile.reset(new mimewrite_tarfile(*indir));
+	return mime_tarfile.get();
+    }else if(!strcmp(id,"INTEGRITYDIGEST")) {
+	mime_idigest.reset(new mimewrite_string());
+	return mime_idigest.get();
+    }
+    return NULL;
+}
+int eyefiworker::mime_write(void *handle,const char *buf,size_t len) {
+    if(!handle) return SOAP_ERR;
+    return static_cast<mimewrite_base*>(handle)->write(buf,len);
+}
+void eyefiworker::mime_writeclose(void *handle) {
+    if(handle) static_cast<mimewrite_base*>(handle)->close();
+}
+
 int eyefiworker::UploadPhoto(
@@ -207,2 +247,5 @@ int eyefiworker::UploadPhoto(
 	    filesignature.c_str(), encryption.c_str(), flags );
+    if(!(kinfig && kinfig->macaddress==macaddress))
+	throw std::runtime_error("I'm not talking to this peer");
+
     std::string::size_type fnl=filename.length();
@@ -213,49 +256,15 @@ int eyefiworker::UploadPhoto(
 
-    eyekinfig_t eyekinfig(macaddress);
-
-    umask(eyekinfig.get_umask());
+    if(!indir) throw std::runtime_error("I haven't even created a directory!");
+    shared_ptr<tmpdir_t> dir; dir.swap(indir);
+    if(!mime_tarfile) throw std::runtime_error("I haven't written the tarball!");
+    shared_ptr<mimewrite_tarfile> file; file.swap(mime_tarfile);
+    if(!mime_idigest) throw std::runtime_error("I haven't seen the integrity digest!");
+    shared_ptr<mimewrite_string> idigest; idigest.swap(mime_idigest);
 
-    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 );
-#endif
-
-	if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) {
-	    std::string idigestr((*i).ptr,(*i).size);
-#ifndef NDEBUG
-	    syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str());
-#endif
-	    idigest.from_hex(idigestr);
-	}
-	if( (*i).id && !strcmp((*i).id,"FILENAME") ) {
-	    assert( (*i).type && !strcmp((*i).type,"application/x-tar") );
-#ifdef III_SAVE_TARS
-	    std::string tarfile = indir.get_file(filename);
-	    {
-		std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size);
-	    }
-#endif
-
-	    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(!file->f.tellg()) {
 		if(!already.is(filename,filesignature,filesize))
 		    throw std::runtime_error("got zero-length upload for unknown file");
-		beenthere = true; continue;
+	r.success = true;
+	return SOAP_OK;
 	    }
@@ -263,5 +272,8 @@ int eyefiworker::UploadPhoto(
 
-	    tarchive_t a((*i).ptr,(*i).size);
-	    while(a.read_next_header()) {
-		std::string ep = a.entry_pathname(), f = indir.get_file(ep);
+    if(idigest->str != file->idigest.final(kinfig->get_upload_key()).hex())
+	throw std::runtime_error("Integrity digest doesn't match, disintegrating.");
+
+    std::string tf, lf;
+    for(tarchive_t a(file->fn.c_str());a.read_next_header();) {
+	std::string ep = a.entry_pathname(), f = dir->get_file(ep);
 		if(ep==the_file) tf = f;
@@ -276,14 +288,4 @@ int eyefiworker::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");
-    if(digest!=idigest) throw std::runtime_error("integrity digest verification failed");
 
@@ -296,2 +298,3 @@ int eyefiworker::UploadPhoto(
     bool success = false;
+    std::string td = kinfig->get_targetdir();
     for(int i=0;i<32767;++i) {
@@ -307,3 +310,3 @@ int eyefiworker::UploadPhoto(
     }
-    std::string cmd = eyekinfig.get_on_upload_photo();
+    std::string cmd = kinfig->get_on_upload_photo();
     if(success) {
@@ -311,3 +314,3 @@ int eyefiworker::UploadPhoto(
 	{
-	    iiidb_t D(eyekinfig);
+	    iiidb_t D(*kinfig);
 	    D.prepare(
diff --git a/src/eyefiworker.h b/src/eyefiworker.h
index 6cdecff..61d92d2 100644
--- a/src/eyefiworker.h
+++ b/src/eyefiworker.h
@@ -3,9 +3,21 @@
 
+#include <tr1/memory>
+using std::tr1::shared_ptr;
+
 #include "soapeyefiService.h"
 
+#include "eyekinfig.h"
+#include "eyetil.h"
+
+struct eyefi_session;
+
 class eyefiworker : public eyefiService {
     public:
+	shared_ptr<eyekinfig_t> kinfig;
+	shared_ptr<tmpdir_t> indir;
+	shared_ptr<mimewrite_tarfile> mime_tarfile;
+	shared_ptr<mimewrite_string> mime_idigest;
 
 	eyefiworker();
-	~eyefiworker();
+	~eyefiworker() { }
 
@@ -26,2 +38,7 @@ class eyefiworker : public eyefiService {
 
+	void *mime_writeopen(void *handle,const char *id,const char *type,const char *description,
+		enum soap_mime_encoding encoding);
+	int mime_write(void *handle,const char *buf,size_t len);
+	void mime_writeclose(void *handle);
+
 	eyefiService *copy() { throw std::logic_error("Not meant to be called"); }
diff --git a/src/eyetil.cc b/src/eyetil.cc
index fba8724..5bceec7 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -154,3 +154,3 @@ std::string tmpdir_t::get_file(const std::string& f) {
 
-tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) {
+tarchive_t::tarchive_t(const char *fn) : a(archive_read_new()), e(0) {
     if(!a) throw std::runtime_error("failed to archive_read_new()");
@@ -160,3 +160,3 @@ tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) {
     }
-    if(archive_read_open_memory(a,p,s)) {
+    if(archive_read_open_filename(a,fn,16384)) {
 	archive_read_finish(a);
diff --git a/src/eyetil.h b/src/eyetil.h
index 64948d0..8af18a4 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -104,3 +104,3 @@ class tarchive_t {
 
-	tarchive_t(void *p,size_t s);
+	tarchive_t(const char *);
 	~tarchive_t();