author | Michael Krelin <hacker@klever.net> | 2013-02-13 22:43:26 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2013-02-13 22:43:26 (UTC) |
commit | 2a5950df692f8a2c9d51a2a3e0c4d41fe0d3e7c9 (patch) (unidiff) | |
tree | 9c8a49a1bd96177abdc9cd13435b66a3aea783e2 /src | |
parent | d6545bd95153a5e41cdae441643f4e4a0af94a49 (diff) | |
download | iii-2a5950df692f8a2c9d51a2a3e0c4d41fe0d3e7c9.zip iii-2a5950df692f8a2c9d51a2a3e0c4d41fe0d3e7c9.tar.gz iii-2a5950df692f8a2c9d51a2a3e0c4d41fe0d3e7c9.tar.bz2 |
stream mime attachments directly to disk
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiworker.cc | 135 | ||||
-rw-r--r-- | src/eyefiworker.h | 19 | ||||
-rw-r--r-- | src/eyetil.cc | 4 | ||||
-rw-r--r-- | src/eyetil.h | 2 |
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 | |||
@@ -35,5 +35,15 @@ eyefiworker::eyefiworker() | |||
35 | #endif | 35 | #endif |
36 | } | 36 | } |
37 | eyefiworker::~eyefiworker() { | 37 | |
38 | static void *fmimewriteopen_(struct soap *soap, | ||
39 | void *handle, const char *id, const char *type, const char *description, | ||
40 | enum soap_mime_encoding encoding) { | ||
41 | return static_cast<eyefiworker*>(soap)->mime_writeopen(handle,id,type,description,encoding); | ||
42 | } | ||
43 | static int fmimewrite_(struct soap *soap,void *handle,const char *buf,size_t len) { | ||
44 | return static_cast<eyefiworker*>(soap)->mime_write(handle,buf,len); | ||
45 | } | ||
46 | static void fmimewriteclose_(struct soap *soap,void *handle) { | ||
47 | static_cast<eyefiworker*>(soap)->mime_writeclose(handle); | ||
38 | } | 48 | } |
39 | 49 | ||
@@ -42,4 +52,5 @@ int eyefiworker::run(int bindport) { | |||
42 | throw std::runtime_error("failed to bind()"); | 52 | throw std::runtime_error("failed to bind()"); |
43 | signal(SIGCHLD,SIG_IGN); | 53 | signal(SIGCHLD,SIG_IGN); |
54 | fmimewriteopen=fmimewriteopen_; fmimewrite=fmimewrite_; fmimewriteclose=fmimewriteclose_; | ||
44 | while(true) { | 55 | while(true) { |
45 | if(!soap_valid_socket(accept())) | 56 | if(!soap_valid_socket(accept())) |
@@ -111,6 +122,8 @@ int eyefiworker::StartSession( | |||
111 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", | 122 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", |
112 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); | 123 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); |
113 | eyekinfig_t eyekinfig(macaddress); | 124 | kinfig.reset(new eyekinfig_t(macaddress)); |
114 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); | 125 | umask(kinfig->get_umask()); |
126 | |||
127 | r.credential = binary_t(macaddress+cnonce+kinfig->get_upload_key()).md5().hex(); | ||
115 | 128 | ||
116 | r.snonce = session_nonce.make_nonce().hex(); | 129 | r.snonce = session_nonce.make_nonce().hex(); |
@@ -119,5 +132,5 @@ int eyefiworker::StartSession( | |||
119 | r.upsyncallowed=false; | 132 | r.upsyncallowed=false; |
120 | 133 | ||
121 | std::string cmd = eyekinfig.get_on_start_session(); | 134 | std::string cmd = kinfig->get_on_start_session(); |
122 | if(!cmd.empty()) { | 135 | if(!cmd.empty()) { |
123 | if(detached_child()) { | 136 | if(detached_child()) { |
@@ -144,6 +157,8 @@ int eyefiworker::GetPhotoStatus( | |||
144 | session_nonce.hex().c_str() ); | 157 | session_nonce.hex().c_str() ); |
145 | 158 | ||
146 | eyekinfig_t eyekinfig(macaddress); | 159 | if(!(kinfig && kinfig->macaddress==macaddress)) |
147 | std::string computed_credential = binary_t(macaddress+eyekinfig.get_upload_key()+session_nonce.hex()).md5().hex(); | 160 | throw std::runtime_error("I'm not talking to this peer"); |
161 | |||
162 | std::string computed_credential = binary_t(macaddress+kinfig->get_upload_key()+session_nonce.hex()).md5().hex(); | ||
148 | 163 | ||
149 | #ifndef NDEBUG | 164 | #ifndef NDEBUG |
@@ -153,6 +168,8 @@ int eyefiworker::GetPhotoStatus( | |||
153 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); | 168 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); |
154 | 169 | ||
170 | indir.reset(new tmpdir_t(kinfig->get_targetdir()+"/.incoming.XXXXXX")); | ||
171 | |||
155 | #ifdef HAVE_SQLITE | 172 | #ifdef HAVE_SQLITE |
156 | iiidb_t D(eyekinfig); | 173 | iiidb_t D(*kinfig); |
157 | seclude::stmt_t S = D.prepare( | 174 | seclude::stmt_t S = D.prepare( |
158 | "SELECT fileid FROM photo" | 175 | "SELECT fileid FROM photo" |
@@ -181,5 +198,8 @@ int eyefiworker::MarkLastPhotoInRoll( | |||
181 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", | 198 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", |
182 | macaddress.c_str(), mergedelta ); | 199 | macaddress.c_str(), mergedelta ); |
183 | std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); | 200 | if(!(kinfig && kinfig->macaddress==macaddress)) |
201 | throw std::runtime_error("I'm not talking to this peer"); | ||
202 | |||
203 | std::string cmd = kinfig->get_on_mark_last_photo_in_roll(); | ||
184 | if(!cmd.empty()) { | 204 | if(!cmd.empty()) { |
185 | if(detached_child()) { | 205 | if(detached_child()) { |
@@ -196,4 +216,24 @@ int eyefiworker::MarkLastPhotoInRoll( | |||
196 | }catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } | 216 | }catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } |
197 | 217 | ||
218 | void *eyefiworker::mime_writeopen(void *handle,const char *id,const char *type,const char *description, | ||
219 | enum soap_mime_encoding encoding) { | ||
220 | if(!id) return NULL; | ||
221 | if(!strcmp(id,"FILENAME")) { | ||
222 | mime_tarfile.reset(new mimewrite_tarfile(*indir)); | ||
223 | return mime_tarfile.get(); | ||
224 | }else if(!strcmp(id,"INTEGRITYDIGEST")) { | ||
225 | mime_idigest.reset(new mimewrite_string()); | ||
226 | return mime_idigest.get(); | ||
227 | } | ||
228 | return NULL; | ||
229 | } | ||
230 | int eyefiworker::mime_write(void *handle,const char *buf,size_t len) { | ||
231 | if(!handle) return SOAP_ERR; | ||
232 | return static_cast<mimewrite_base*>(handle)->write(buf,len); | ||
233 | } | ||
234 | void eyefiworker::mime_writeclose(void *handle) { | ||
235 | if(handle) static_cast<mimewrite_base*>(handle)->close(); | ||
236 | } | ||
237 | |||
198 | int eyefiworker::UploadPhoto( | 238 | int eyefiworker::UploadPhoto( |
199 | int fileid, std::string macaddress, | 239 | int fileid, std::string macaddress, |
@@ -206,4 +246,7 @@ int eyefiworker::UploadPhoto( | |||
206 | macaddress.c_str(), fileid, filename.c_str(), filesize, | 246 | macaddress.c_str(), fileid, filename.c_str(), filesize, |
207 | filesignature.c_str(), encryption.c_str(), flags ); | 247 | filesignature.c_str(), encryption.c_str(), flags ); |
248 | if(!(kinfig && kinfig->macaddress==macaddress)) | ||
249 | throw std::runtime_error("I'm not talking to this peer"); | ||
250 | |||
208 | std::string::size_type fnl=filename.length(); | 251 | std::string::size_type fnl=filename.length(); |
209 | if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar"))) | 252 | if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar"))) |
@@ -212,57 +255,26 @@ int eyefiworker::UploadPhoto( | |||
212 | std::string the_log = the_file+".log"; | 255 | std::string the_log = the_file+".log"; |
213 | 256 | ||
214 | eyekinfig_t eyekinfig(macaddress); | 257 | if(!indir) throw std::runtime_error("I haven't even created a directory!"); |
215 | 258 | shared_ptr<tmpdir_t> dir; dir.swap(indir); | |
216 | umask(eyekinfig.get_umask()); | 259 | if(!mime_tarfile) throw std::runtime_error("I haven't written the tarball!"); |
260 | shared_ptr<mimewrite_tarfile> file; file.swap(mime_tarfile); | ||
261 | if(!mime_idigest) throw std::runtime_error("I haven't seen the integrity digest!"); | ||
262 | shared_ptr<mimewrite_string> idigest; idigest.swap(mime_idigest); | ||
217 | 263 | ||
218 | std::string td = eyekinfig.get_targetdir(); | ||
219 | tmpdir_t indir(td+"/.incoming.XXXXXX"); | ||
220 | |||
221 | std::string tf,lf; | ||
222 | binary_t digest, idigest; | ||
223 | #ifdef HAVE_SQLITE | 264 | #ifdef HAVE_SQLITE |
224 | bool beenthere = false; | 265 | if(!file->f.tellg()) { |
225 | #endif | ||
226 | |||
227 | for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { | ||
228 | #ifndef NDEBUG | ||
229 | syslog(LOG_DEBUG, | ||
230 | " MIME attachment with id=%s, type=%s, size=%ld", | ||
231 | (*i).id, (*i).type, (long)(*i).size ); | ||
232 | #endif | ||
233 | |||
234 | if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { | ||
235 | std::string idigestr((*i).ptr,(*i).size); | ||
236 | #ifndef NDEBUG | ||
237 | syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str()); | ||
238 | #endif | ||
239 | idigest.from_hex(idigestr); | ||
240 | } | ||
241 | if( (*i).id && !strcmp((*i).id,"FILENAME") ) { | ||
242 | assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); | ||
243 | #ifdef III_SAVE_TARS | ||
244 | std::string tarfile = indir.get_file(filename); | ||
245 | { | ||
246 | std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); | ||
247 | } | ||
248 | #endif | ||
249 | |||
250 | if(!tf.empty()) throw std::runtime_error("already seen tarball"); | ||
251 | if(!digest.empty()) throw std::runtime_error("already have integrity digest"); | ||
252 | digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); | ||
253 | #ifndef NDEBUG | ||
254 | syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); | ||
255 | #endif | ||
256 | #ifdef HAVE_SQLITE | ||
257 | if(!(*i).size) { | ||
258 | if(!already.is(filename,filesignature,filesize)) | 266 | if(!already.is(filename,filesignature,filesize)) |
259 | throw std::runtime_error("got zero-length upload for unknown file"); | 267 | throw std::runtime_error("got zero-length upload for unknown file"); |
260 | beenthere = true; continue; | 268 | r.success = true; |
269 | return SOAP_OK; | ||
261 | } | 270 | } |
262 | #endif | 271 | #endif |
263 | 272 | ||
264 | tarchive_t a((*i).ptr,(*i).size); | 273 | if(idigest->str != file->idigest.final(kinfig->get_upload_key()).hex()) |
265 | while(a.read_next_header()) { | 274 | throw std::runtime_error("Integrity digest doesn't match, disintegrating."); |
266 | std::string ep = a.entry_pathname(), f = indir.get_file(ep); | 275 | |
276 | std::string tf, lf; | ||
277 | for(tarchive_t a(file->fn.c_str());a.read_next_header();) { | ||
278 | std::string ep = a.entry_pathname(), f = dir->get_file(ep); | ||
267 | if(ep==the_file) tf = f; | 279 | if(ep==the_file) tf = f; |
268 | else if(ep==the_log) lf = f; | 280 | else if(ep==the_log) lf = f; |
@@ -275,16 +287,6 @@ int eyefiworker::UploadPhoto( | |||
275 | close(fd); | 287 | close(fd); |
276 | } | 288 | } |
277 | } | ||
278 | } | ||
279 | |||
280 | #ifdef HAVE_SQLITE | ||
281 | if(beenthere) { | ||
282 | r.success=true; | ||
283 | return SOAP_OK; | ||
284 | } | ||
285 | #endif | ||
286 | 289 | ||
287 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); | 290 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); |
288 | if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); | ||
289 | 291 | ||
290 | std::string::size_type ls = tf.rfind('/'); | 292 | std::string::size_type ls = tf.rfind('/'); |
@@ -295,4 +297,5 @@ int eyefiworker::UploadPhoto( | |||
295 | std::string ttf,tlf; | 297 | std::string ttf,tlf; |
296 | bool success = false; | 298 | bool success = false; |
299 | std::string td = kinfig->get_targetdir(); | ||
297 | for(int i=0;i<32767;++i) { | 300 | for(int i=0;i<32767;++i) { |
298 | const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s"; | 301 | const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s"; |
@@ -306,9 +309,9 @@ int eyefiworker::UploadPhoto( | |||
306 | } | 309 | } |
307 | } | 310 | } |
308 | std::string cmd = eyekinfig.get_on_upload_photo(); | 311 | std::string cmd = kinfig->get_on_upload_photo(); |
309 | if(success) { | 312 | if(success) { |
310 | #ifdef HAVE_SQLITE | 313 | #ifdef HAVE_SQLITE |
311 | { | 314 | { |
312 | iiidb_t D(eyekinfig); | 315 | iiidb_t D(*kinfig); |
313 | D.prepare( | 316 | D.prepare( |
314 | "INSERT INTO photo" | 317 | "INSERT INTO photo" |
diff --git a/src/eyefiworker.h b/src/eyefiworker.h index 6cdecff..61d92d2 100644 --- a/src/eyefiworker.h +++ b/src/eyefiworker.h | |||
@@ -2,11 +2,23 @@ | |||
2 | #define __EYEFIWORKER_H | 2 | #define __EYEFIWORKER_H |
3 | 3 | ||
4 | #include <tr1/memory> | ||
5 | using std::tr1::shared_ptr; | ||
6 | |||
4 | #include "soapeyefiService.h" | 7 | #include "soapeyefiService.h" |
5 | 8 | ||
9 | #include "eyekinfig.h" | ||
10 | #include "eyetil.h" | ||
11 | |||
12 | struct eyefi_session; | ||
13 | |||
6 | class eyefiworker : public eyefiService { | 14 | class eyefiworker : public eyefiService { |
7 | public: | 15 | public: |
16 | shared_ptr<eyekinfig_t> kinfig; | ||
17 | shared_ptr<tmpdir_t> indir; | ||
18 | shared_ptr<mimewrite_tarfile> mime_tarfile; | ||
19 | shared_ptr<mimewrite_string> mime_idigest; | ||
8 | 20 | ||
9 | eyefiworker(); | 21 | eyefiworker(); |
10 | ~eyefiworker(); | 22 | ~eyefiworker() { } |
11 | 23 | ||
12 | int run(int port) __attribute__ ((noreturn)); | 24 | int run(int port) __attribute__ ((noreturn)); |
@@ -25,4 +37,9 @@ class eyefiworker : public eyefiService { | |||
25 | struct rns__UploadPhotoResponse &r); | 37 | struct rns__UploadPhotoResponse &r); |
26 | 38 | ||
39 | void *mime_writeopen(void *handle,const char *id,const char *type,const char *description, | ||
40 | enum soap_mime_encoding encoding); | ||
41 | int mime_write(void *handle,const char *buf,size_t len); | ||
42 | void mime_writeclose(void *handle); | ||
43 | |||
27 | eyefiService *copy() { throw std::logic_error("Not meant to be called"); } | 44 | eyefiService *copy() { throw std::logic_error("Not meant to be called"); } |
28 | }; | 45 | }; |
diff --git a/src/eyetil.cc b/src/eyetil.cc index fba8724..5bceec7 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc | |||
@@ -153,5 +153,5 @@ std::string tmpdir_t::get_file(const std::string& f) { | |||
153 | } | 153 | } |
154 | 154 | ||
155 | tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) { | 155 | tarchive_t::tarchive_t(const char *fn) : a(archive_read_new()), e(0) { |
156 | if(!a) throw std::runtime_error("failed to archive_read_new()"); | 156 | if(!a) throw std::runtime_error("failed to archive_read_new()"); |
157 | if(archive_read_support_format_tar(a)) { | 157 | if(archive_read_support_format_tar(a)) { |
@@ -159,5 +159,5 @@ tarchive_t::tarchive_t(void *p,size_t s) : a(archive_read_new()), e(0) { | |||
159 | throw std::runtime_error("failed to archive_read_support_format_tar()"); | 159 | throw std::runtime_error("failed to archive_read_support_format_tar()"); |
160 | } | 160 | } |
161 | if(archive_read_open_memory(a,p,s)) { | 161 | if(archive_read_open_filename(a,fn,16384)) { |
162 | archive_read_finish(a); | 162 | archive_read_finish(a); |
163 | throw std::runtime_error("failed to archive_read_open_memory()"); | 163 | throw std::runtime_error("failed to archive_read_open_memory()"); |
diff --git a/src/eyetil.h b/src/eyetil.h index 64948d0..8af18a4 100644 --- a/src/eyetil.h +++ b/src/eyetil.h | |||
@@ -103,5 +103,5 @@ class tarchive_t { | |||
103 | struct archive_entry *e; | 103 | struct archive_entry *e; |
104 | 104 | ||
105 | tarchive_t(void *p,size_t s); | 105 | tarchive_t(const char *); |
106 | ~tarchive_t(); | 106 | ~tarchive_t(); |
107 | 107 | ||