author | Michael Krelin <hacker@klever.net> | 2012-01-20 23:22:36 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2012-01-20 23:22:36 (UTC) |
commit | 5f346b73b3d130022d56270ae174f654b3c2d77a (patch) (side-by-side diff) | |
tree | a51ad2e15089c80cd30dc2e8073bdddb55a3cddf | |
parent | 8035dab48b39f1b0bb9e7aba5ce69fbf59259406 (diff) | |
download | iii-5f346b73b3d130022d56270ae174f654b3c2d77a.zip iii-5f346b73b3d130022d56270ae174f654b3c2d77a.tar.gz iii-5f346b73b3d130022d56270ae174f654b3c2d77a.tar.bz2 |
a better way to detect the file
now that the list of file types is eliminated it should accept whatever file cards wants to send
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiservice.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 276977a..d9318ed 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc @@ -114,32 +114,38 @@ int eyefiService::MarkLastPhotoInRoll( keep_alive = 0; return SOAP_OK; }catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } int eyefiService::UploadPhoto( int fileid, std::string macaddress, std::string filename, long filesize, std::string filesignature, std::string encryption, int flags, struct rns__UploadPhotoResponse& r ) try { #ifndef NDEBUG syslog(LOG_DEBUG, "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," " filesignature=%s, encryption=%s, flags=%04X", macaddress.c_str(), fileid, filename.c_str(), filesize, filesignature.c_str(), encryption.c_str(), flags ); #endif + std::string::size_type fnl=filename.length(); + if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar"))) + throw std::runtime_error(gnu::autosprintf("honestly, I expected the tarball coming here, not '%s'",filename.c_str())); + std::string the_file(filename,0,fnl-sizeof(".tar")+sizeof("")); + std::string the_log = the_file+".log"; + eyekinfig_t eyekinfig(macaddress); umask(eyekinfig.get_umask()); std::string td = eyekinfig.get_targetdir(); tmpdir_t indir(td+"/.incoming.XXXXXX"); std::string tf,lf; binary_t digest, idigest; 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 @@ -156,44 +162,35 @@ int eyefiService::UploadPhoto( #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 tarchive_t a((*i).ptr,(*i).size); while(a.read_next_header()) { - std::string f = indir.get_file(a.entry_pathname()); - std::string::size_type fl = f.length(); - if(fl<4) continue; - const char *s = f.c_str()+fl-4; - static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW", - ".RW2",".CR2" }; - if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes), - std::not1(std::bind1st(std::ptr_fun(strcasecmp),s))) - != suffixes+sizeof(suffixes)/sizeof(*suffixes)) - tf = f; - else if(!strcasecmp(s,".log")) - lf = f; + std::string ep = a.entry_pathname(), f = indir.get_file(ep); + if(ep==the_file) tf = f; + else if(ep==the_log) lf = f; else continue; int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); if(fd<0) throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); if(!a.read_data_into_fd(fd)) throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); close(fd); } } } 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 |