summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2012-01-20 23:22:36 (UTC)
committer Michael Krelin <hacker@klever.net>2012-01-20 23:22:36 (UTC)
commit5f346b73b3d130022d56270ae174f654b3c2d77a (patch) (unidiff)
treea51ad2e15089c80cd30dc2e8073bdddb55a3cddf
parent8035dab48b39f1b0bb9e7aba5ce69fbf59259406 (diff)
downloadiii-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc21
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
@@ -106,102 +106,99 @@ int eyefiService::MarkLastPhotoInRoll(
106 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 106 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
107 putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); 107 putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) );
108 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; 108 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
109 execv("/bin/sh",argv); 109 execv("/bin/sh",argv);
110 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 110 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
111 _exit(-1); 111 _exit(-1);
112 } 112 }
113 } 113 }
114 keep_alive = 0; 114 keep_alive = 0;
115 return SOAP_OK; 115 return SOAP_OK;
116}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } 116}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); }
117 117
118int eyefiService::UploadPhoto( 118int eyefiService::UploadPhoto(
119 int fileid, std::string macaddress, 119 int fileid, std::string macaddress,
120 std::string filename, long filesize, std::string filesignature, 120 std::string filename, long filesize, std::string filesignature,
121 std::string encryption, int flags, 121 std::string encryption, int flags,
122 struct rns__UploadPhotoResponse& r ) try { 122 struct rns__UploadPhotoResponse& r ) try {
123#ifndef NDEBUG 123#ifndef NDEBUG
124 syslog(LOG_DEBUG, 124 syslog(LOG_DEBUG,
125 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," 125 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
126 " filesignature=%s, encryption=%s, flags=%04X", 126 " filesignature=%s, encryption=%s, flags=%04X",
127 macaddress.c_str(), fileid, filename.c_str(), filesize, 127 macaddress.c_str(), fileid, filename.c_str(), filesize,
128 filesignature.c_str(), encryption.c_str(), flags ); 128 filesignature.c_str(), encryption.c_str(), flags );
129#endif 129#endif
130 std::string::size_type fnl=filename.length();
131 if(fnl<sizeof(".tar") || strncmp(filename.c_str()+fnl-sizeof(".tar")+sizeof(""),".tar",sizeof(".tar")))
132 throw std::runtime_error(gnu::autosprintf("honestly, I expected the tarball coming here, not '%s'",filename.c_str()));
133 std::string the_file(filename,0,fnl-sizeof(".tar")+sizeof(""));
134 std::string the_log = the_file+".log";
135
130 eyekinfig_t eyekinfig(macaddress); 136 eyekinfig_t eyekinfig(macaddress);
131 137
132 umask(eyekinfig.get_umask()); 138 umask(eyekinfig.get_umask());
133 139
134 std::string td = eyekinfig.get_targetdir(); 140 std::string td = eyekinfig.get_targetdir();
135 tmpdir_t indir(td+"/.incoming.XXXXXX"); 141 tmpdir_t indir(td+"/.incoming.XXXXXX");
136 142
137 std::string tf,lf; 143 std::string tf,lf;
138 binary_t digest, idigest; 144 binary_t digest, idigest;
139 145
140 for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { 146 for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) {
141#ifndef NDEBUG 147#ifndef NDEBUG
142 syslog(LOG_DEBUG, 148 syslog(LOG_DEBUG,
143 " MIME attachment with id=%s, type=%s, size=%ld", 149 " MIME attachment with id=%s, type=%s, size=%ld",
144 (*i).id, (*i).type, (long)(*i).size ); 150 (*i).id, (*i).type, (long)(*i).size );
145#endif 151#endif
146 152
147 if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { 153 if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) {
148 std::string idigestr((*i).ptr,(*i).size); 154 std::string idigestr((*i).ptr,(*i).size);
149#ifndef NDEBUG 155#ifndef NDEBUG
150 syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str()); 156 syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str());
151#endif 157#endif
152 idigest.from_hex(idigestr); 158 idigest.from_hex(idigestr);
153 } 159 }
154 if( (*i).id && !strcmp((*i).id,"FILENAME") ) { 160 if( (*i).id && !strcmp((*i).id,"FILENAME") ) {
155 assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); 161 assert( (*i).type && !strcmp((*i).type,"application/x-tar") );
156#ifdef III_SAVE_TARS 162#ifdef III_SAVE_TARS
157 std::string tarfile = indir.get_file(filename); 163 std::string tarfile = indir.get_file(filename);
158 { 164 {
159 std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); 165 std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size);
160 } 166 }
161#endif 167#endif
162 168
163 if(!tf.empty()) throw std::runtime_error("already seen tarball"); 169 if(!tf.empty()) throw std::runtime_error("already seen tarball");
164 if(!digest.empty()) throw std::runtime_error("already have integrity digest"); 170 if(!digest.empty()) throw std::runtime_error("already have integrity digest");
165 digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); 171 digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key());
166#ifndef NDEBUG 172#ifndef NDEBUG
167 syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); 173 syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str());
168#endif 174#endif
169 175
170 tarchive_t a((*i).ptr,(*i).size); 176 tarchive_t a((*i).ptr,(*i).size);
171 while(a.read_next_header()) { 177 while(a.read_next_header()) {
172 std::string f = indir.get_file(a.entry_pathname()); 178 std::string ep = a.entry_pathname(), f = indir.get_file(ep);
173 std::string::size_type fl = f.length(); 179 if(ep==the_file) tf = f;
174 if(fl<4) continue; 180 else if(ep==the_log) lf = f;
175 const char *s = f.c_str()+fl-4;
176 static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW",
177 ".RW2",".CR2" };
178 if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes),
179 std::not1(std::bind1st(std::ptr_fun(strcasecmp),s)))
180 != suffixes+sizeof(suffixes)/sizeof(*suffixes))
181 tf = f;
182 else if(!strcasecmp(s,".log"))
183 lf = f;
184 else continue; 181 else continue;
185 int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); 182 int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666);
186 if(fd<0) 183 if(fd<0)
187 throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); 184 throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str()));
188 if(!a.read_data_into_fd(fd)) 185 if(!a.read_data_into_fd(fd))
189 throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); 186 throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str()));
190 close(fd); 187 close(fd);
191 } 188 }
192 } 189 }
193 } 190 }
194 191
195 if(tf.empty()) throw std::runtime_error("haven't seen THE file"); 192 if(tf.empty()) throw std::runtime_error("haven't seen THE file");
196 if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); 193 if(digest!=idigest) throw std::runtime_error("integrity digest verification failed");
197 194
198 std::string::size_type ls = tf.rfind('/'); 195 std::string::size_type ls = tf.rfind('/');
199 // XXX: actually, lack of '/' signifies error here 196 // XXX: actually, lack of '/' signifies error here
200 std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); 197 std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1);
201 ls = lf.rfind('/'); 198 ls = lf.rfind('/');
202 std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1); 199 std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1);
203 std::string ttf,tlf; 200 std::string ttf,tlf;
204 bool success = false; 201 bool success = false;
205 for(int i=0;i<32767;++i) { 202 for(int i=0;i<32767;++i) {
206 const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s"; 203 const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s";
207 ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i); 204 ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i);