summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2013-01-29 18:28:58 (UTC)
committer Michael Krelin <hacker@klever.net>2013-02-02 12:42:52 (UTC)
commit8cef826610f171b25a7a4aa3a764b1fb04c24d2f (patch) (unidiff)
tree0f4cd74156e998931955c9117fb263a37ba1f98c
parent7e4f9ebf4a76de3adafba6b32620d4610341897b (diff)
downloadiii-8cef826610f171b25a7a4aa3a764b1fb04c24d2f.zip
iii-8cef826610f171b25a7a4aa3a764b1fb04c24d2f.tar.gz
iii-8cef826610f171b25a7a4aa3a764b1fb04c24d2f.tar.bz2
added persistent store for photo status
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am7
-rw-r--r--src/eyefiservice.cc77
-rw-r--r--src/eyefiworker.cc6
-rw-r--r--src/iiidb.h28
5 files changed, 114 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 1e0e42c..3b409fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,15 @@ PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false])
18AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) 18AM_CONDITIONAL([HAVE_UUID],[$have_uuid])
19if $have_uuid ; then 19if $have_uuid ; then
20 AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) 20 AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid])
21 AC_SUBST([UUID_UUID],[uuid]) 21 AC_SUBST([UUID_UUID],[uuid])
22fi 22fi
23 23
24PKG_CHECK_MODULES([SQLITE],[sqlite3],[have_sqlite=true],[have_sqlite=false])
25$have_sqlite && AC_DEFINE([HAVE_SQLITE],,[defined in presence of libsqlite3])
26
24AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) 27AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false])
25test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) 28test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.])
26 29
27notfound=false 30notfound=false
28AC_CHECK_HEADERS([archive.h],[ 31AC_CHECK_HEADERS([archive.h],[
29 AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) 32 AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true])
diff --git a/src/Makefile.am b/src/Makefile.am
index b31bed5..f2ff772 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,25 +1,26 @@
1bin_PROGRAMS=iii-extract-riff-chunk 1bin_PROGRAMS=iii-extract-riff-chunk
2sbin_PROGRAMS=iiid 2sbin_PROGRAMS=iiid
3noinst_HEADERS = \ 3noinst_HEADERS = \
4 eyefi.h \ 4 eyefi.h \
5 eyekinfig.h eyetil.h \ 5 eyekinfig.h eyetil.h \
6 eyefiworker.h 6 eyefiworker.h iiidb.h \
7 seclude.h
7 8
8AM_CPPFLAGS = ${CPPFLAGS_DEBUG} \ 9AM_CPPFLAGS = ${CPPFLAGS_DEBUG} \
9 -DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\" 10 -DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\"
10DEFAULT_INCLUDES = -I${top_builddir} -I${builddir} -I${srcdir} 11DEFAULT_INCLUDES = -I${top_builddir} -I${builddir} -I${srcdir}
11INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS} 12INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS} ${SQLITE_CFLAGS}
12 13
13iiid_SOURCES = iiid.cc \ 14iiid_SOURCES = iiid.cc \
14 eyekinfig.cc eyetil.cc \ 15 eyekinfig.cc eyetil.cc \
15 eyefiservice.cc eyefiworker.cc 16 eyefiservice.cc eyefiworker.cc
16nodist_iiid_SOURCES = \ 17nodist_iiid_SOURCES = \
17 ${builddir}/soapC.cpp ${builddir}/soapeyefiService.cpp \ 18 ${builddir}/soapC.cpp ${builddir}/soapeyefiService.cpp \
18 COPYING.cc 19 COPYING.cc
19iiid_LDADD = ${MODULES_LIBS} ${UUID_LIBS} 20iiid_LDADD = ${MODULES_LIBS} ${UUID_LIBS} ${SQLITE_LIBS}
20 21
21iii_extract_riff_chunk_SOURCES = iii-extract-riff-chunk.cc 22iii_extract_riff_chunk_SOURCES = iii-extract-riff-chunk.cc
22nodist_iii_extract_riff_chunk_SOURCES = COPYING.cc 23nodist_iii_extract_riff_chunk_SOURCES = COPYING.cc
23 24
24COPYING.cc: ${top_srcdir}/COPYING 25COPYING.cc: ${top_srcdir}/COPYING
25 echo "const char * COPYING = " >$@ || (rm $@;exit 1) 26 echo "const char * COPYING = " >$@ || (rm $@;exit 1)
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 93bbcca..4a4a179 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -7,14 +7,31 @@
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#ifdef HAVE_SQLITE
14# include "iiidb.h"
15#endif
13 16
14static binary_t session_nonce; 17static 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
16static bool detached_child() { 33static bool detached_child() {
17 pid_t p = fork(); 34 pid_t p = fork();
18 if(p<0) { 35 if(p<0) {
19 syslog(LOG_ERR,"Failed to fork away for hook execution"); 36 syslog(LOG_ERR,"Failed to fork away for hook execution");
20 _exit(-1); 37 _exit(-1);
@@ -73,21 +90,40 @@ int eyefiService::GetPhotoStatus(
73 struct rns__GetPhotoStatusResponse &r ) try { 90 struct rns__GetPhotoStatusResponse &r ) try {
74 syslog(LOG_INFO, 91 syslog(LOG_INFO,
75 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", 92 "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, 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());
83#endif 101#endif
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
87 r.fileid = 1; r.offset = 0; 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()) {
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
91int eyefiService::MarkLastPhotoInRoll( 127int eyefiService::MarkLastPhotoInRoll(
92 std::string macaddress, int mergedelta, 128 std::string macaddress, int mergedelta,
93 struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { 129 struct rns__MarkLastPhotoInRollResponse&/* r */ ) try {
@@ -131,12 +167,15 @@ int eyefiService::UploadPhoto(
131 167
132 std::string td = eyekinfig.get_targetdir(); 168 std::string td = eyekinfig.get_targetdir();
133 tmpdir_t indir(td+"/.incoming.XXXXXX"); 169 tmpdir_t indir(td+"/.incoming.XXXXXX");
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
140 syslog(LOG_DEBUG, 179 syslog(LOG_DEBUG,
141 " MIME attachment with id=%s, type=%s, size=%ld", 180 " MIME attachment with id=%s, type=%s, size=%ld",
142 (*i).id, (*i).type, (long)(*i).size ); 181 (*i).id, (*i).type, (long)(*i).size );
@@ -161,12 +200,19 @@ int eyefiService::UploadPhoto(
161 if(!tf.empty()) throw std::runtime_error("already seen tarball"); 200 if(!tf.empty()) throw std::runtime_error("already seen tarball");
162 if(!digest.empty()) throw std::runtime_error("already have integrity digest"); 201 if(!digest.empty()) throw std::runtime_error("already have integrity digest");
163 digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key()); 202 digest = integrity_digest((*i).ptr,(*i).size,eyekinfig.get_upload_key());
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()) {
170 std::string ep = a.entry_pathname(), f = indir.get_file(ep); 216 std::string ep = a.entry_pathname(), f = indir.get_file(ep);
171 if(ep==the_file) tf = f; 217 if(ep==the_file) tf = f;
172 else if(ep==the_log) lf = f; 218 else if(ep==the_log) lf = f;
@@ -178,12 +224,19 @@ int eyefiService::UploadPhoto(
178 throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str())); 224 throw std::runtime_error(gnu::autosprintf("failed to untar file into '%s'",f.c_str()));
179 close(fd); 225 close(fd);
180 } 226 }
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
187 std::string::size_type ls = tf.rfind('/'); 240 std::string::size_type ls = tf.rfind('/');
188 // XXX: actually, lack of '/' signifies error here 241 // XXX: actually, lack of '/' signifies error here
189 std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1); 242 std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1);
@@ -200,14 +253,30 @@ int eyefiService::UploadPhoto(
200 if(!lf.empty()) unlink(lf.c_str()); 253 if(!lf.empty()) unlink(lf.c_str());
201 success=true; 254 success=true;
202 break; 255 break;
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()) );
211 if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) ); 280 if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) );
212 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; 281 char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
213 execv("/bin/sh",argv); 282 execv("/bin/sh",argv);
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index c051482..9dcd048 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -1,9 +1,12 @@
1#include <signal.h> 1#include <signal.h>
2#include <stdexcept> 2#include <stdexcept>
3#include "eyefiworker.h" 3#include "eyefiworker.h"
4#ifdef HAVE_SQLITE
5# include "sqlite3.h"
6#endif
4 7
5eyefiworker::eyefiworker() 8eyefiworker::eyefiworker()
6 : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) { 9 : eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
7 bind_flags = SO_REUSEADDR; max_keep_alive = 0; 10 bind_flags = SO_REUSEADDR; max_keep_alive = 0;
8 socket_flags = 11 socket_flags =
9#if defined(MSG_NOSIGNAL) 12#if defined(MSG_NOSIGNAL)
@@ -14,12 +17,15 @@ eyefiworker::eyefiworker()
14#error Something is wrong with sigpipe prevention on the platform 17#error Something is wrong with sigpipe prevention on the platform
15#endif 18#endif
16 ; 19 ;
17 } 20 }
18 21
19int eyefiworker::run(int bindport) { 22int eyefiworker::run(int bindport) {
23#ifdef HAVE_SQLITE
24 sqlite3_initialize();
25#endif
20 if(!soap_valid_socket(bind(0,bindport,64))) 26 if(!soap_valid_socket(bind(0,bindport,64)))
21 throw std::runtime_error("failed to bind()"); 27 throw std::runtime_error("failed to bind()");
22 signal(SIGCHLD,SIG_IGN); 28 signal(SIGCHLD,SIG_IGN);
23 while(true) { 29 while(true) {
24 if(!soap_valid_socket(accept())) 30 if(!soap_valid_socket(accept()))
25 throw std::runtime_error("failed to accept()"); 31 throw std::runtime_error("failed to accept()");
diff --git a/src/iiidb.h b/src/iiidb.h
new file mode 100644
index 0000000..e77fa09
--- a/dev/null
+++ b/src/iiidb.h
@@ -0,0 +1,28 @@
1#ifndef __IIIDB_H
2#define __IIIDB_H
3
4#include <autosprintf.h>
5#include "seclude.h"
6#include "eyekinfig.h"
7
8struct iiidb_t : public seclude::db_t {
9 iiidb_t(eyekinfig_t& k) : seclude::db_t(gnu::autosprintf("%s/.iii.db",k.get_targetdir().c_str())) {
10 try {
11 exec("SELECT 1 FROM photo LIMIT 0");
12 }catch(const seclude::sqlite3_error& e) {
13 exec( "CREATE TABLE photo ("
14 " id integer PRIMARY KEY AUTOINCREMENT,"
15 " ctime integer NOT NULL,"
16 " mac text NOT NULL,"
17 " fileid integer NOT NULL,"
18 " filename text NOT NULL,"
19 " filesize integer NOT NULL,"
20 " filesignature text NOT NULL UNIQUE,"
21 " encryption text NOT NULL,"
22 " flags integer NOT NULL"
23 ")" );
24 }
25 }
26};
27
28#endif /* __IIIDB_H */