-rw-r--r-- | src/eyefiservice.cc | 75 |
1 files changed, 72 insertions, 3 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 93bbcca..4a4a179 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -10,8 +10,25 @@ | |||
10 | #include "eyekinfig.h" | 10 | #include "eyekinfig.h" |
11 | #include "eyetil.h" | 11 | #include "eyetil.h" |
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 | ||
16 | static bool detached_child() { | 33 | static bool detached_child() { |
17 | pid_t p = fork(); | 34 | pid_t p = fork(); |
@@ -76,7 +93,8 @@ int eyefiService::GetPhotoStatus( | |||
76 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, | 93 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, |
77 | session_nonce.hex().c_str() ); | 94 | session_nonce.hex().c_str() ); |
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 | ||
81 | #ifndef NDEBUG | 99 | #ifndef NDEBUG |
82 | syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); | 100 | syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); |
@@ -84,7 +102,25 @@ int eyefiService::GetPhotoStatus( | |||
84 | 102 | ||
85 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); | 103 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); |
86 | 104 | ||
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()) { | ||
87 | r.fileid = 1; r.offset = 0; | 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; |
89 | }catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } | 125 | }catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } |
90 | 126 | ||
@@ -134,6 +170,9 @@ int eyefiService::UploadPhoto( | |||
134 | 170 | ||
135 | std::string tf,lf; | 171 | std::string tf,lf; |
136 | binary_t digest, idigest; | 172 | binary_t digest, idigest; |
173 | #ifdef HAVE_SQLITE | ||
174 | bool beenthere = false; | ||
175 | #endif | ||
137 | 176 | ||
138 | for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { | 177 | for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { |
139 | #ifndef NDEBUG | 178 | #ifndef NDEBUG |
@@ -164,6 +203,13 @@ int eyefiService::UploadPhoto( | |||
164 | #ifndef NDEBUG | 203 | #ifndef NDEBUG |
165 | syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); | 204 | syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); |
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 | ||
168 | tarchive_t a((*i).ptr,(*i).size); | 214 | tarchive_t a((*i).ptr,(*i).size); |
169 | while(a.read_next_header()) { | 215 | while(a.read_next_header()) { |
@@ -181,6 +227,13 @@ int eyefiService::UploadPhoto( | |||
181 | } | 227 | } |
182 | } | 228 | } |
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"); |
185 | if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); | 238 | if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); |
186 | 239 | ||
@@ -203,8 +256,24 @@ int eyefiService::UploadPhoto( | |||
203 | } | 256 | } |
204 | } | 257 | } |
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()) ); |
209 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); | 278 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); |
210 | putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) ); | 279 | putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) ); |