-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 @@ | |||
12 | #include "soapeyefiService.h" | 12 | #include "soapeyefiService.h" |
13 | #ifdef HAVE_SQLITE | ||
14 | # include "iiidb.h" | ||
15 | #endif | ||
13 | 16 | ||
14 | static binary_t session_nonce; | 17 | static binary_t session_nonce; |
18 | #ifdef HAVE_SQLITE | ||
19 | static struct { | ||
20 | std::string filesignature; | ||
21 | long filesize; | ||
22 | std::string filename; | ||
23 | inline void reset() { filesignature.erase(); filename.erase(); filesize=0; } | ||
24 | inline void set(const std::string n,const std::string sig,long siz) { | ||
25 | filename = n; filesignature = sig; filesize = siz; | ||
26 | } | ||
27 | inline bool is(const std::string n,const std::string sig,long siz) { | ||
28 | return filesize==siz && filename==n && filesignature==sig; | ||
29 | } | ||
30 | } already; | ||
31 | #endif /* HAVE_SQLITE */ | ||
15 | 32 | ||
@@ -78,3 +95,4 @@ int eyefiService::GetPhotoStatus( | |||
78 | 95 | ||
79 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); | 96 | eyekinfig_t eyekinfig(macaddress); |
97 | std::string computed_credential = binary_t(macaddress+eyekinfig.get_upload_key()+session_nonce.hex()).md5().hex(); | ||
80 | 98 | ||
@@ -86,3 +104,21 @@ int eyefiService::GetPhotoStatus( | |||
86 | 104 | ||
87 | r.fileid = 1; r.offset = 0; | 105 | #ifdef HAVE_SQLITE |
106 | iiidb_t D(eyekinfig); | ||
107 | seclude::stmt_t S = D.prepare( | ||
108 | "SELECT fileid FROM photo" | ||
109 | " WHERE mac=:mac AND filename=:filename" | ||
110 | " AND filesize=:filesize AND filesignature=:filesignature" | ||
111 | ).bind(":mac",macaddress) | ||
112 | .bind(":filename",filename).bind(":filesize",filesize) | ||
113 | .bind(":filesignature",filesignature); | ||
114 | if(!S.step()) { | ||
115 | r.fileid = 1; r.offset = 0; | ||
116 | }else{ | ||
117 | r.fileid = S.column<long>(0); | ||
118 | r.offset = filesize; | ||
119 | already.set(filename,filesignature,filesize); | ||
120 | } | ||
121 | #else /* HAVE_SQLITE */ | ||
122 | r.fileid=1, r.offset=0; | ||
123 | #endif /* HAVE_SQLITE */ | ||
88 | return SOAP_OK; | 124 | return SOAP_OK; |
@@ -136,2 +172,5 @@ int eyefiService::UploadPhoto( | |||
136 | binary_t digest, idigest; | 172 | binary_t digest, idigest; |
173 | #ifdef HAVE_SQLITE | ||
174 | bool beenthere = false; | ||
175 | #endif | ||
137 | 176 | ||
@@ -166,2 +205,9 @@ int eyefiService::UploadPhoto( | |||
166 | #endif | 205 | #endif |
206 | #ifdef HAVE_SQLITE | ||
207 | if(!(*i).size) { | ||
208 | if(!already.is(filename,filesignature,filesize)) | ||
209 | throw std::runtime_error("got zero-length upload for unknown file"); | ||
210 | beenthere = true; continue; | ||
211 | } | ||
212 | #endif | ||
167 | 213 | ||
@@ -183,2 +229,9 @@ int eyefiService::UploadPhoto( | |||
183 | 229 | ||
230 | #ifdef HAVE_SQLITE | ||
231 | if(beenthere) { | ||
232 | r.success=true; | ||
233 | return SOAP_OK; | ||
234 | } | ||
235 | #endif | ||
236 | |||
184 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); | 237 | if(tf.empty()) throw std::runtime_error("haven't seen THE file"); |
@@ -205,4 +258,20 @@ int eyefiService::UploadPhoto( | |||
205 | std::string cmd = eyekinfig.get_on_upload_photo(); | 258 | std::string cmd = eyekinfig.get_on_upload_photo(); |
206 | if(success && !cmd.empty()) { | 259 | if(success) { |
207 | if(detached_child()) { | 260 | #ifdef HAVE_SQLITE |
261 | { | ||
262 | iiidb_t D(eyekinfig); | ||
263 | D.prepare( | ||
264 | "INSERT INTO photo" | ||
265 | " (ctime,mac,fileid,filename,filesize,filesignature,encryption,flags)" | ||
266 | " VALUES" | ||
267 | " (:ctime,:mac,:fileid,:filename,:filesize,:filesignature,:encryption,:flags)" | ||
268 | ).bind(":ctime",time(0)) | ||
269 | .bind(":mac",macaddress) | ||
270 | .bind(":fileid",fileid).bind(":filename",filename) | ||
271 | .bind(":filesize",filesize).bind(":filesignature",filesignature) | ||
272 | .bind(":encryption",encryption).bind(":flags",flags) | ||
273 | .step(); | ||
274 | } | ||
275 | #endif /* HAVE_SQLITE */ | ||
276 | if((!cmd.empty()) && detached_child()) { | ||
208 | putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) ); | 277 | putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) ); |