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