summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index e89b2fc..276977a 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -1,229 +1,232 @@
1#include <cassert> 1#include <cassert>
2#include <iostream> 2#include <iostream>
3#include <fstream> 3#include <fstream>
4#include <stdexcept> 4#include <stdexcept>
5#include <iterator> 5#include <iterator>
6#include <algorithm> 6#include <algorithm>
7#include <syslog.h> 7#include <syslog.h>
8#include <sys/wait.h> 8#include <sys/wait.h>
9#include <autosprintf.h> 9#include <autosprintf.h>
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 13
14static binary_t session_nonce; 14static binary_t session_nonce;
15 15
16static bool detached_child() { 16static bool detached_child() {
17 pid_t p = fork(); 17 pid_t p = fork();
18 if(p<0) { 18 if(p<0) {
19 syslog(LOG_ERR,"Failed to fork away for hook execution"); 19 syslog(LOG_ERR,"Failed to fork away for hook execution");
20 _exit(-1); 20 _exit(-1);
21 } 21 }
22 if(!p) { 22 if(!p) {
23 setsid(); 23 setsid();
24 for(int i=getdtablesize();i>=0;--i) close(i); 24 for(int i=getdtablesize();i>=0;--i) close(i);
25 int i=open("/dev/null",O_RDWR); assert(i==0); 25 int i=open("/dev/null",O_RDWR); assert(i==0);
26 i = dup(i); assert(i==1); 26 i = dup(i); assert(i==1);
27 i = dup(i); assert(i==2); 27 i = dup(i); assert(i==2);
28 return true; 28 return true;
29 } 29 }
30 return false; 30 return false;
31} 31}
32 32
33static int E(eyefiService* efs,const char *c,const std::exception& e) {
34 efs->keep_alive=0;
35 syslog(LOG_ERR,"error while processing %s: %s",c,e.what());
36 return efs->soap_receiverfault(gnu::autosprintf("error processing %s",c),0);
37}
38
33int eyefiService::StartSession( 39int eyefiService::StartSession(
34 std::string macaddress,std::string cnonce, 40 std::string macaddress,std::string cnonce,
35 int transfermode,long transfermodetimestamp, 41 int transfermode,long transfermodetimestamp,
36 struct rns__StartSessionResponse &r ) try { 42 struct rns__StartSessionResponse &r ) try {
37#ifndef NDEBUG 43#ifndef NDEBUG
38 syslog(LOG_DEBUG, 44 syslog(LOG_DEBUG,
39 "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", 45 "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
40 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); 46 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
41#endif 47#endif
42 eyekinfig_t eyekinfig(macaddress); 48 eyekinfig_t eyekinfig(macaddress);
43 r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); 49 r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex();
44 50
45 r.snonce = session_nonce.make_nonce().hex(); 51 r.snonce = session_nonce.make_nonce().hex();
46 r.transfermode=transfermode; 52 r.transfermode=transfermode;
47 r.transfermodetimestamp=transfermodetimestamp; 53 r.transfermodetimestamp=transfermodetimestamp;
48 r.upsyncallowed=false; 54 r.upsyncallowed=false;
49 55
50 std::string cmd = eyekinfig.get_on_start_session(); 56 std::string cmd = eyekinfig.get_on_start_session();
51 if(!cmd.empty()) { 57 if(!cmd.empty()) {
52 if(detached_child()) { 58 if(detached_child()) {
53 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 59 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
54 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); 60 putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) );
55 putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); 61 putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) );
56 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; 62 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
57 execv("/bin/sh",argv); 63 execv("/bin/sh",argv);
58 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 64 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
59 _exit(-1); 65 _exit(-1);
60 } 66 }
61 } 67 }
62 return SOAP_OK; 68 return SOAP_OK;
63}catch(std::runtime_error& e) { 69}catch(const std::exception& e) { return E(this,"StartSession",e); }
64 syslog(LOG_ERR,"error while processing StartSession: %s",e.what());
65 return soap_receiverfault(e.what(),0);
66}
67 70
68int eyefiService::GetPhotoStatus( 71int eyefiService::GetPhotoStatus(
69 std::string credential, std::string macaddress, 72 std::string credential, std::string macaddress,
70 std::string filename, long filesize, std::string filesignature, 73 std::string filename, long filesize, std::string filesignature,
71 int flags, 74 int flags,
72 struct rns__GetPhotoStatusResponse &r ) { 75 struct rns__GetPhotoStatusResponse &r ) try {
73#ifndef NDEBUG 76#ifndef NDEBUG
74 syslog(LOG_DEBUG, 77 syslog(LOG_DEBUG,
75 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", 78 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s",
76 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, 79 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags,
77 session_nonce.hex().c_str() ); 80 session_nonce.hex().c_str() );
78#endif 81#endif
79 82
80 std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); 83 std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex();
81 84
82#ifndef NDEBUG 85#ifndef NDEBUG
83 syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); 86 syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str());
84#endif 87#endif
85 88
86 if (credential != computed_credential) throw std::runtime_error("card authentication failed"); 89 if (credential != computed_credential) throw std::runtime_error("card authentication failed");
87 90
88 r.fileid = 1; r.offset = 0; 91 r.fileid = 1; r.offset = 0;
89 return SOAP_OK; 92 return SOAP_OK;
90} 93}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); }
91 94
92int eyefiService::MarkLastPhotoInRoll( 95int eyefiService::MarkLastPhotoInRoll(
93 std::string macaddress, int mergedelta, 96 std::string macaddress, int mergedelta,
94 struct rns__MarkLastPhotoInRollResponse&/* r */ ) { 97 struct rns__MarkLastPhotoInRollResponse&/* r */ ) try {
95#ifndef NDEBUG 98#ifndef NDEBUG
96 syslog(LOG_DEBUG, 99 syslog(LOG_DEBUG,
97 "MarkLastPhotoInRoll request from %s with mergedelta=%d", 100 "MarkLastPhotoInRoll request from %s with mergedelta=%d",
98 macaddress.c_str(), mergedelta ); 101 macaddress.c_str(), mergedelta );
99#endif 102#endif
100 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); 103 std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
101 if(!cmd.empty()) { 104 if(!cmd.empty()) {
102 if(detached_child()) { 105 if(detached_child()) {
103 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 106 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
104 putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); 107 putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) );
105 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 };
106 execv("/bin/sh",argv); 109 execv("/bin/sh",argv);
107 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 110 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
108 _exit(-1); 111 _exit(-1);
109 } 112 }
110 } 113 }
111 keep_alive = 0; 114 keep_alive = 0;
112 return SOAP_OK; 115 return SOAP_OK;
113} 116}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); }
114 117
115int eyefiService::UploadPhoto( 118int eyefiService::UploadPhoto(
116 int fileid, std::string macaddress, 119 int fileid, std::string macaddress,
117 std::string filename, long filesize, std::string filesignature, 120 std::string filename, long filesize, std::string filesignature,
118 std::string encryption, int flags, 121 std::string encryption, int flags,
119 struct rns__UploadPhotoResponse& r ) { 122 struct rns__UploadPhotoResponse& r ) try {
120#ifndef NDEBUG 123#ifndef NDEBUG
121 syslog(LOG_DEBUG, 124 syslog(LOG_DEBUG,
122 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," 125 "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld,"
123 " filesignature=%s, encryption=%s, flags=%04X", 126 " filesignature=%s, encryption=%s, flags=%04X",
124 macaddress.c_str(), fileid, filename.c_str(), filesize, 127 macaddress.c_str(), fileid, filename.c_str(), filesize,
125 filesignature.c_str(), encryption.c_str(), flags ); 128 filesignature.c_str(), encryption.c_str(), flags );
126#endif 129#endif
127 eyekinfig_t eyekinfig(macaddress); 130 eyekinfig_t eyekinfig(macaddress);
128 131
129 umask(eyekinfig.get_umask()); 132 umask(eyekinfig.get_umask());
130 133
131 std::string td = eyekinfig.get_targetdir(); 134 std::string td = eyekinfig.get_targetdir();
132 tmpdir_t indir(td+"/.incoming.XXXXXX"); 135 tmpdir_t indir(td+"/.incoming.XXXXXX");
133 136
134 std::string tf,lf; 137 std::string tf,lf;
135 binary_t digest, idigest; 138 binary_t digest, idigest;
136 139
137 for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) { 140 for(soap_multipart::iterator i=mime.begin(),ie=mime.end();i!=ie;++i) {
138#ifndef NDEBUG 141#ifndef NDEBUG
139 syslog(LOG_DEBUG, 142 syslog(LOG_DEBUG,
140 " MIME attachment with id=%s, type=%s, size=%ld", 143 " MIME attachment with id=%s, type=%s, size=%ld",
141 (*i).id, (*i).type, (long)(*i).size ); 144 (*i).id, (*i).type, (long)(*i).size );
142#endif 145#endif
143 146
144 if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) { 147 if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) {
145 std::string idigestr((*i).ptr,(*i).size); 148 std::string idigestr((*i).ptr,(*i).size);
146#ifndef NDEBUG 149#ifndef NDEBUG
147 syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str()); 150 syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str());
148#endif 151#endif
149 idigest.from_hex(idigestr); 152 idigest.from_hex(idigestr);
150 } 153 }
151 if( (*i).id && !strcmp((*i).id,"FILENAME") ) { 154 if( (*i).id && !strcmp((*i).id,"FILENAME") ) {
152 assert( (*i).type && !strcmp((*i).type,"application/x-tar") ); 155 assert( (*i).type && !strcmp((*i).type,"application/x-tar") );
153#ifdef III_SAVE_TARS 156#ifdef III_SAVE_TARS
154 std::string tarfile = indir.get_file(filename); 157 std::string tarfile = indir.get_file(filename);
155 { 158 {
156 std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size); 159 std::ofstream(tarfile.c_str(),std::ios::out|std::ios::binary).write((*i).ptr,(*i).size);
157 } 160 }
158#endif 161#endif
159 162
160 if(!tf.empty()) throw std::runtime_error("already seen tarball"); 163 if(!tf.empty()) throw std::runtime_error("already seen tarball");
161 if(!digest.empty()) throw std::runtime_error("already have integrity digest"); 164 if(!digest.empty()) throw std::runtime_error("already have integrity digest");
162 digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); 165 digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key());
163#ifndef NDEBUG 166#ifndef NDEBUG
164 syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str()); 167 syslog(LOG_DEBUG," computed integrity digest=%s", digest.hex().c_str());
165#endif 168#endif
166 169
167 tarchive_t a((*i).ptr,(*i).size); 170 tarchive_t a((*i).ptr,(*i).size);
168 while(a.read_next_header()) { 171 while(a.read_next_header()) {
169 std::string f = indir.get_file(a.entry_pathname()); 172 std::string f = indir.get_file(a.entry_pathname());
170 std::string::size_type fl = f.length(); 173 std::string::size_type fl = f.length();
171 if(fl<4) continue; 174 if(fl<4) continue;
172 const char *s = f.c_str()+fl-4; 175 const char *s = f.c_str()+fl-4;
173 static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW", 176 static const char *suffixes[] = { ".JPG",".AVI",".MP4",".NEF",".RAW",".TIF",".DNG",".CRW",
174 ".RW2",".CR2" }; 177 ".RW2",".CR2" };
175 if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes), 178 if(std::find_if(suffixes,suffixes+sizeof(suffixes)/sizeof(*suffixes),
176 std::not1(std::bind1st(std::ptr_fun(strcasecmp),s))) 179 std::not1(std::bind1st(std::ptr_fun(strcasecmp),s)))
177 != suffixes+sizeof(suffixes)/sizeof(*suffixes)) 180 != suffixes+sizeof(suffixes)/sizeof(*suffixes))
178 tf = f; 181 tf = f;
179 else if(!strcasecmp(s,".log")) 182 else if(!strcasecmp(s,".log"))
180 lf = f; 183 lf = f;
181 else continue; 184 else continue;
182 int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666); 185 int fd=open(f.c_str(),O_CREAT|O_WRONLY,0666);
183 if(fd<0) 186 if(fd<0)
184 throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str())); 187 throw std::runtime_error(gnu::autosprintf("failed to create output file '%s'",f.c_str()));
185 if(!a.read_data_into_fd(fd)) 188 if(!a.read_data_into_fd(fd))
186 throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); 189 throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str()));
187 close(fd); 190 close(fd);
188 } 191 }
189 } 192 }
190 } 193 }
191 194
192 if(tf.empty()) throw std::runtime_error("haven't seen THE file"); 195 if(tf.empty()) throw std::runtime_error("haven't seen THE file");
193 if(digest!=idigest) throw std::runtime_error("integrity digest verification failed"); 196 if(digest!=idigest) throw std::runtime_error("integrity digest verification failed");
194 197
195 std::string::size_type ls = tf.rfind('/'); 198 std::string::size_type ls = tf.rfind('/');
196 // XXX: actually, lack of '/' signifies error here 199 // XXX: actually, lack of '/' signifies error here
197 std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); 200 std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1);
198 ls = lf.rfind('/'); 201 ls = lf.rfind('/');
199 std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1); 202 std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1);
200 std::string ttf,tlf; 203 std::string ttf,tlf;
201 bool success = false; 204 bool success = false;
202 for(int i=0;i<32767;++i) { 205 for(int i=0;i<32767;++i) {
203 const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s"; 206 const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s";
204 ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i); 207 ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i);
205 if(!lf.empty()) tlf = (const char*)gnu::autosprintf(fmt,td.c_str(),lbn.c_str(),i); 208 if(!lf.empty()) tlf = (const char*)gnu::autosprintf(fmt,td.c_str(),lbn.c_str(),i);
206 if( (!link(tf.c_str(),ttf.c_str())) && (lf.empty() || !link(lf.c_str(),tlf.c_str())) ) { 209 if( (!link(tf.c_str(),ttf.c_str())) && (lf.empty() || !link(lf.c_str(),tlf.c_str())) ) {
207 unlink(tf.c_str()); 210 unlink(tf.c_str());
208 if(!lf.empty()) unlink(lf.c_str()); 211 if(!lf.empty()) unlink(lf.c_str());
209 success=true; 212 success=true;
210 break; 213 break;
211 } 214 }
212 } 215 }
213 std::string cmd = eyekinfig.get_on_upload_photo(); 216 std::string cmd = eyekinfig.get_on_upload_photo();
214 if(success && !cmd.empty()) { 217 if(success && !cmd.empty()) {
215 if(detached_child()) { 218 if(detached_child()) {
216 putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) ); 219 putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) );
217 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); 220 putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
218 putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) ); 221 putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) );
219 if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) ); 222 if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) );
220 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; 223 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
221 execv("/bin/sh",argv); 224 execv("/bin/sh",argv);
222 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); 225 syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
223 _exit(-1); 226 _exit(-1);
224 } 227 }
225 } 228 }
226 229
227 r.success = true; 230 r.success = true;
228 return SOAP_OK; 231 return SOAP_OK;
229} 232}catch(const std::exception& e) { return E(this,"UploadPhoto",e); }