summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -1,76 +1,79 @@
AC_INIT([iii], [0.3], [iii-bugs@klever.net])
AC_CONFIG_SRCDIR([src/iiid.cc])
AC_CONFIG_AUX_DIR([aux.d])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PROG_INSTALL
AC_PROG_CXX
AC_PROG_CC
PKG_PROG_PKG_CONFIG
AC_HEADER_STDC
AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
PKG_CHECK_MODULES([MODULES],[gsoap++ libcrypto libconfuse])
PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false])
AM_CONDITIONAL([HAVE_UUID],[$have_uuid])
if $have_uuid ; then
AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid])
AC_SUBST([UUID_UUID],[uuid])
fi
+PKG_CHECK_MODULES([SQLITE],[sqlite3],[have_sqlite=true],[have_sqlite=false])
+$have_sqlite && AC_DEFINE([HAVE_SQLITE],,[defined in presence of libsqlite3])
+
AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false])
test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.])
notfound=false
AC_CHECK_HEADERS([archive.h],[
AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true])
],[notfound=true])
$notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/])
notfound=false
AC_LANG_PUSH([C++])
AC_CHECK_HEADERS([autosprintf.h],[
AC_CHECK_LIB([asprintf],[main],,[notfound=true])
],[notfound=true])
$notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found])
AC_LANG_POP([C++])
nitpick=false
AC_ARG_ENABLE([nitpicking],
AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]),
[ test "$enableval" = "no" || nitpick=true ]
)
if $nitpick ; then
CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \
-Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \
-Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn"
C_NITPICK="$CPP_NITPICK"
CXX_NITPICK="$C_NITPICK"
CPPFLAGS="$CPPFLAGS $CPP_NITPICK"
CFLAGS="$CFLAGS $C_NITPICK"
CXXFLAGS="$CXXFLAGS $CXX_NITPICK"
fi
ndebug=true
AC_ARG_ENABLE([debug],
AC_HELP_STRING([--enable-debug],[enable debugging code]),
[ test "$enableval" = "no" || ndebug=false ]
)
if $ndebug ; then
CPPFLAGS_DEBUG="-DNDEBUG"
else
CPPFLAGS_DEBUG="-DDEBUG"
fi
AC_SUBST([CPPFLAGS_DEBUG])
AC_CONFIG_FILES([
Makefile
src/Makefile
doc/Makefile
doc/iiid.8
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index b31bed5..f2ff772 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,36 +1,37 @@
bin_PROGRAMS=iii-extract-riff-chunk
sbin_PROGRAMS=iiid
noinst_HEADERS = \
eyefi.h \
eyekinfig.h eyetil.h \
- eyefiworker.h
+ eyefiworker.h iiidb.h \
+ seclude.h
AM_CPPFLAGS = ${CPPFLAGS_DEBUG} \
-DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\"
DEFAULT_INCLUDES = -I${top_builddir} -I${builddir} -I${srcdir}
-INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS}
+INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS} ${SQLITE_CFLAGS}
iiid_SOURCES = iiid.cc \
eyekinfig.cc eyetil.cc \
eyefiservice.cc eyefiworker.cc
nodist_iiid_SOURCES = \
${builddir}/soapC.cpp ${builddir}/soapeyefiService.cpp \
COPYING.cc
-iiid_LDADD = ${MODULES_LIBS} ${UUID_LIBS}
+iiid_LDADD = ${MODULES_LIBS} ${UUID_LIBS} ${SQLITE_LIBS}
iii_extract_riff_chunk_SOURCES = iii-extract-riff-chunk.cc
nodist_iii_extract_riff_chunk_SOURCES = COPYING.cc
COPYING.cc: ${top_srcdir}/COPYING
echo "const char * COPYING = " >$@ || (rm $@;exit 1)
sed -e 's/"/\\"/g' -e 's/^/\"/' -e 's/$$/\\n\"/' $< >>$@ || (rm $@;exit 1)
echo ';' >>$@ || (rm $@;exit 1)
${srcdir}/eyefiservice.cc: ${builddir}/soapeyefiService.h
${srcdir}/iiid.cc: ${builddir}/eyefi.nsmap
${builddir}soapC.cpp ${builddir}/soapeyefiService.cpp ${builddir}/eyefi.nsmap ${builddir}/soapeyefiService.h: ${srcdir}/eyefi.h
${SOAPCPP2} -d${builddir} -S -L -a -i -w -x $<
clean-local:
rm -f soap{{H,Stub,eyefiService}.h,{C,eyefiService}.cpp} eyefi.nsmap COPYING.cc
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 93bbcca..4a4a179 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -1,221 +1,290 @@
#include <cassert>
#include <iostream>
#include <fstream>
#include <stdexcept>
#include <iterator>
#include <algorithm>
#include <syslog.h>
#include <sys/wait.h>
#include <autosprintf.h>
#include "eyekinfig.h"
#include "eyetil.h"
#include "soapeyefiService.h"
+#ifdef HAVE_SQLITE
+# include "iiidb.h"
+#endif
static binary_t session_nonce;
+#ifdef HAVE_SQLITE
+ static struct {
+ std::string filesignature;
+ long filesize;
+ std::string filename;
+ inline void reset() { filesignature.erase(); filename.erase(); filesize=0; }
+ inline void set(const std::string n,const std::string sig,long siz) {
+ filename = n; filesignature = sig; filesize = siz;
+ }
+ inline bool is(const std::string n,const std::string sig,long siz) {
+ return filesize==siz && filename==n && filesignature==sig;
+ }
+ } already;
+#endif /* HAVE_SQLITE */
static bool detached_child() {
pid_t p = fork();
if(p<0) {
syslog(LOG_ERR,"Failed to fork away for hook execution");
_exit(-1);
}
if(!p) {
setsid();
for(int i=getdtablesize();i>=0;--i) close(i);
int i=open("/dev/null",O_RDWR); assert(i==0);
i = dup(i); assert(i==1);
i = dup(i); assert(i==2);
return true;
}
return false;
}
static int E(eyefiService* efs,const char *c,const std::exception& e) {
efs->keep_alive=0;
syslog(LOG_ERR,"error while processing %s: %s",c,e.what());
return soap_sender_fault(efs,gnu::autosprintf("error processing %s",c),0);
}
int eyefiService::StartSession(
std::string macaddress,std::string cnonce,
int transfermode,long transfermodetimestamp,
struct rns__StartSessionResponse &r ) try {
syslog(LOG_INFO,
"StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
eyekinfig_t eyekinfig(macaddress);
r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex();
r.snonce = session_nonce.make_nonce().hex();
r.transfermode=transfermode;
r.transfermodetimestamp=transfermodetimestamp;
r.upsyncallowed=false;
std::string cmd = eyekinfig.get_on_start_session();
if(!cmd.empty()) {
if(detached_child()) {
putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) );
putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) );
char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
execv("/bin/sh",argv);
syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
_exit(-1);
}
}
return SOAP_OK;
}catch(const std::exception& e) { return E(this,"StartSession",e); }
int eyefiService::GetPhotoStatus(
std::string credential, std::string macaddress,
std::string filename, long filesize, std::string filesignature,
int flags,
struct rns__GetPhotoStatusResponse &r ) try {
syslog(LOG_INFO,
"GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s",
macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags,
session_nonce.hex().c_str() );
- std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex();
+ eyekinfig_t eyekinfig(macaddress);
+ std::string computed_credential = binary_t(macaddress+eyekinfig.get_upload_key()+session_nonce.hex()).md5().hex();
#ifndef NDEBUG
syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str());
#endif
if (credential != computed_credential) throw std::runtime_error("card authentication failed");
- r.fileid = 1; r.offset = 0;
+#ifdef HAVE_SQLITE
+ iiidb_t D(eyekinfig);
+ seclude::stmt_t S = D.prepare(
+ "SELECT fileid FROM photo"
+ " WHERE mac=:mac AND filename=:filename"
+ " AND filesize=:filesize AND filesignature=:filesignature"
+ ).bind(":mac",macaddress)
+ .bind(":filename",filename).bind(":filesize",filesize)
+ .bind(":filesignature",filesignature);
+ if(!S.step()) {
+ r.fileid = 1; r.offset = 0;
+ }else{
+ r.fileid = S.column<long>(0);
+ r.offset = filesize;
+ already.set(filename,filesignature,filesize);
+ }
+#else /* HAVE_SQLITE */
+ r.fileid=1, r.offset=0;
+#endif /* HAVE_SQLITE */
return SOAP_OK;
}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); }
int eyefiService::MarkLastPhotoInRoll(
std::string macaddress, int mergedelta,
struct rns__MarkLastPhotoInRollResponse&/* r */ ) try {
syslog(LOG_INFO,
"MarkLastPhotoInRoll request from %s with mergedelta=%d",
macaddress.c_str(), mergedelta );
std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll();
if(!cmd.empty()) {
if(detached_child()) {
putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) );
char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
execv("/bin/sh",argv);
syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
_exit(-1);
}
}
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 {
syslog(LOG_INFO,
"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 );
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;
+#ifdef HAVE_SQLITE
+ bool beenthere = false;
+#endif
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
if((*i).id && !strcmp((*i).id,"INTEGRITYDIGEST")) {
std::string idigestr((*i).ptr,(*i).size);
#ifndef NDEBUG
syslog(LOG_DEBUG, " INTEGRITYDIGEST=%s", idigestr.c_str());
#endif
idigest.from_hex(idigestr);
}
if( (*i).id && !strcmp((*i).id,"FILENAME") ) {
assert( (*i).type && !strcmp((*i).type,"application/x-tar") );
#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
+#ifdef HAVE_SQLITE
+ if(!(*i).size) {
+ if(!already.is(filename,filesignature,filesize))
+ throw std::runtime_error("got zero-length upload for unknown file");
+ beenthere = true; continue;
+ }
+#endif
tarchive_t a((*i).ptr,(*i).size);
while(a.read_next_header()) {
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);
}
}
}
+#ifdef HAVE_SQLITE
+ if(beenthere) {
+ r.success=true;
+ return SOAP_OK;
+ }
+#endif
+
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
std::string tbn = (ls==std::string::npos)?tf:tf.substr(ls+1);
ls = lf.rfind('/');
std::string lbn = (ls==std::string::npos)?lf:lf.substr(ls+1);
std::string ttf,tlf;
bool success = false;
for(int i=0;i<32767;++i) {
const char *fmt = i ? "%1$s/(%3$05d)%2$s" : "%1$s/%2$s";
ttf = (const char*)gnu::autosprintf(fmt,td.c_str(),tbn.c_str(),i);
if(!lf.empty()) tlf = (const char*)gnu::autosprintf(fmt,td.c_str(),lbn.c_str(),i);
if( (!link(tf.c_str(),ttf.c_str())) && (lf.empty() || !link(lf.c_str(),tlf.c_str())) ) {
unlink(tf.c_str());
if(!lf.empty()) unlink(lf.c_str());
success=true;
break;
}
}
std::string cmd = eyekinfig.get_on_upload_photo();
- if(success && !cmd.empty()) {
- if(detached_child()) {
+ if(success) {
+#ifdef HAVE_SQLITE
+ {
+ iiidb_t D(eyekinfig);
+ D.prepare(
+ "INSERT INTO photo"
+ " (ctime,mac,fileid,filename,filesize,filesignature,encryption,flags)"
+ " VALUES"
+ " (:ctime,:mac,:fileid,:filename,:filesize,:filesignature,:encryption,:flags)"
+ ).bind(":ctime",time(0))
+ .bind(":mac",macaddress)
+ .bind(":fileid",fileid).bind(":filename",filename)
+ .bind(":filesize",filesize).bind(":filesignature",filesignature)
+ .bind(":encryption",encryption).bind(":flags",flags)
+ .step();
+ }
+#endif /* HAVE_SQLITE */
+ if((!cmd.empty()) && detached_child()) {
putenv( gnu::autosprintf("EYEFI_UPLOADED_ORIG=%s",tbn.c_str()) );
putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) );
putenv( gnu::autosprintf("EYEFI_UPLOADED=%s",ttf.c_str()) );
if(!lf.empty()) putenv( gnu::autosprintf("EYEFI_LOG=%s",tlf.c_str()) );
char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 };
execv("/bin/sh",argv);
syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
_exit(-1);
}
}
r.success = true;
return SOAP_OK;
}catch(const std::exception& e) { return E(this,"UploadPhoto",e); }
diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index c051482..9dcd048 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -1,36 +1,42 @@
#include <signal.h>
#include <stdexcept>
#include "eyefiworker.h"
+#ifdef HAVE_SQLITE
+# include "sqlite3.h"
+#endif
eyefiworker::eyefiworker()
: eyefiService(SOAP_IO_STORE|SOAP_IO_KEEPALIVE) {
bind_flags = SO_REUSEADDR; max_keep_alive = 0;
socket_flags =
#if defined(MSG_NOSIGNAL)
MSG_NOSIGNAL
#elif defined(SO_NOSIGPIPE)
SO_NOSIGPIPE
#else
#error Something is wrong with sigpipe prevention on the platform
#endif
;
}
int eyefiworker::run(int bindport) {
+#ifdef HAVE_SQLITE
+ sqlite3_initialize();
+#endif
if(!soap_valid_socket(bind(0,bindport,64)))
throw std::runtime_error("failed to bind()");
signal(SIGCHLD,SIG_IGN);
while(true) {
if(!soap_valid_socket(accept()))
throw std::runtime_error("failed to accept()");
pid_t p = fork();
if(p<0) throw std::runtime_error("failed to fork()");
if(!p) {
recv_timeout = 600; send_timeout = 120;
(void)serve();
soap_destroy(this); soap_end(this); soap_done(this);
_exit(0);
}
close(socket); socket = SOAP_INVALID_SOCKET;
}
}
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 @@
+#ifndef __IIIDB_H
+#define __IIIDB_H
+
+#include <autosprintf.h>
+#include "seclude.h"
+#include "eyekinfig.h"
+
+struct iiidb_t : public seclude::db_t {
+ iiidb_t(eyekinfig_t& k) : seclude::db_t(gnu::autosprintf("%s/.iii.db",k.get_targetdir().c_str())) {
+ try {
+ exec("SELECT 1 FROM photo LIMIT 0");
+ }catch(const seclude::sqlite3_error& e) {
+ exec( "CREATE TABLE photo ("
+ " id integer PRIMARY KEY AUTOINCREMENT,"
+ " ctime integer NOT NULL,"
+ " mac text NOT NULL,"
+ " fileid integer NOT NULL,"
+ " filename text NOT NULL,"
+ " filesize integer NOT NULL,"
+ " filesignature text NOT NULL UNIQUE,"
+ " encryption text NOT NULL,"
+ " flags integer NOT NULL"
+ ")" );
+ }
+ }
+};
+
+#endif /* __IIIDB_H */