summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2009-04-06 20:27:39 (UTC)
committer Michael Krelin <hacker@klever.net>2009-04-06 20:27:39 (UTC)
commit51d8a8a4ac6ef6096c393fd602df34c6bf8f6366 (patch) (unidiff)
tree8126f60fac6562b14c965e41d19983d81312638a
parentde964540e5a58b3a9195c642ef7a0745ee3b2344 (diff)
downloadiii-51d8a8a4ac6ef6096c393fd602df34c6bf8f6366.zip
iii-51d8a8a4ac6ef6096c393fd602df34c6bf8f6366.tar.gz
iii-51d8a8a4ac6ef6096c393fd602df34c6bf8f6366.tar.bz2
better nonce generation and session credentials verification
based on the patch from Chris Davies Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--AUTHORS1
-rw-r--r--configure.ac6
-rw-r--r--src/Makefile.am4
-rw-r--r--src/eyefiservice.cc21
-rw-r--r--src/eyetil.cc17
-rw-r--r--src/eyetil.h1
6 files changed, 43 insertions, 7 deletions
diff --git a/AUTHORS b/AUTHORS
index 257669f..e7f9101 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,3 +7,4 @@ Thanks to:
7 7
8cdavies of Eye-Fi forums for integrity digest verification algorithm. 8cdavies of Eye-Fi forums for integrity digest verification algorithm.
9 See http://forums.eye.fi/viewtopic.php?f=4&t=270&p=4074#p4074 9 See http://forums.eye.fi/viewtopic.php?f=4&t=270&p=4074#p4074
10 and session nonce verification patch
diff --git a/configure.ac b/configure.ac
index 2e66fc4..515d465 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,12 @@ AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
15PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse],,[ 15PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse],,[
16 AC_MSG_ERROR([one of the build dependencies isn't satisfied]) 16 AC_MSG_ERROR([one of the build dependencies isn't satisfied])
17]) 17])
18PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false])
19AM_CONDITIONAL([HAVE_UUID],[$have_uuid])
20if $have_uuid ; then
21 AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid])
22 AC_SUBST([UUID_UUID],[uuid])
23fi
18 24
19AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) 25AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false])
20test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) 26test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.])
diff --git a/src/Makefile.am b/src/Makefile.am
index 09f698e..b5b7d5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = \
7AM_CPPFLAGS = ${CPPFLAGS_DEBUG} \ 7AM_CPPFLAGS = ${CPPFLAGS_DEBUG} \
8 -DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\" 8 -DEYEKIN_CONF_DIR=\"${sysconfdir}/${PACKAGE}\"
9DEFAULT_INCLUDES = -I${top_builddir} -I${builddir} -I${srcdir} 9DEFAULT_INCLUDES = -I${top_builddir} -I${builddir} -I${srcdir}
10INCLUDES = ${MODULES_CFLAGS} 10INCLUDES = ${MODULES_CFLAGS} ${UUID_CFLAGS}
11 11
12iiid_SOURCES = iiid.cc \ 12iiid_SOURCES = iiid.cc \
13 eyekinfig.cc eyetil.cc \ 13 eyekinfig.cc eyetil.cc \
@@ -15,7 +15,7 @@ iiid_SOURCES = iiid.cc \
15nodist_iiid_SOURCES = \ 15nodist_iiid_SOURCES = \
16 ${builddir}/soapC.cpp ${builddir}/soapeyefiService.cpp \ 16 ${builddir}/soapC.cpp ${builddir}/soapeyefiService.cpp \
17 COPYING.cc 17 COPYING.cc
18iiid_LDADD = ${MODULES_LIBS} 18iiid_LDADD = ${MODULES_LIBS} ${UUID_LIBS}
19 19
20COPYING.cc: ${top_srcdir}/COPYING 20COPYING.cc: ${top_srcdir}/COPYING
21 echo "const char * COPYING = " >$@ || (rm $@;exit 1) 21 echo "const char * COPYING = " >$@ || (rm $@;exit 1)
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index d233a07..1a21c02 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -6,10 +6,13 @@
6#include <syslog.h> 6#include <syslog.h>
7#include <sys/wait.h> 7#include <sys/wait.h>
8#include <autosprintf.h> 8#include <autosprintf.h>
9#include <openssl/rand.h>
9#include "eyekinfig.h" 10#include "eyekinfig.h"
10#include "eyetil.h" 11#include "eyetil.h"
11#include "soapeyefiService.h" 12#include "soapeyefiService.h"
12 13
14static binary_t session_nonce;
15
13static bool detached_child() { 16static bool detached_child() {
14 pid_t p = fork(); 17 pid_t p = fork();
15 if(p<0) throw std::runtime_error("failed to fork()"); 18 if(p<0) throw std::runtime_error("failed to fork()");
@@ -46,9 +49,8 @@ int eyefiService::StartSession(
46 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); 49 macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
47#endif 50#endif
48 r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex(); 51 r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex();
49 /* TODO: better nonce generator */ 52
50 time_t t = time(0); 53 r.snonce = session_nonce.make_nonce().hex();
51 r.snonce = binary_t(&t,sizeof(t)).md5().hex();
52 r.transfermode=transfermode; 54 r.transfermode=transfermode;
53 r.transfermodetimestamp=transfermodetimestamp; 55 r.transfermodetimestamp=transfermodetimestamp;
54 r.upsyncallowed=false; 56 r.upsyncallowed=false;
@@ -74,9 +76,18 @@ int eyefiService::GetPhotoStatus(
74 struct rns__GetPhotoStatusResponse &r ) { 76 struct rns__GetPhotoStatusResponse &r ) {
75#ifndef NDEBUG 77#ifndef NDEBUG
76 syslog(LOG_DEBUG, 78 syslog(LOG_DEBUG,
77 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s", 79 "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s; session nonce=%s",
78 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str() ); 80 macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), session_nonce.hex().c_str() );
81#endif
82
83 std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex();
84
85#ifndef NDEBUG
86 syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str());
79#endif 87#endif
88
89 if (credential != computed_credential) throw std::runtime_error("card authentication failed");
90
80 r.fileid = 1; r.offset = 0; 91 r.fileid = 1; r.offset = 0;
81 return SOAP_OK; 92 return SOAP_OK;
82} 93}
diff --git a/src/eyetil.cc b/src/eyetil.cc
index fe816a6..7669cb6 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -9,6 +9,11 @@
9#include <openssl/md5.h> 9#include <openssl/md5.h>
10#include "eyetil.h" 10#include "eyetil.h"
11 11
12#include "config.h"
13#ifdef HAVE_LIBUUID
14# include <uuid/uuid.h>
15#endif
16
12binary_t& binary_t::from_hex(const std::string& h) { 17binary_t& binary_t::from_hex(const std::string& h) {
13 std::string::size_type hs = h.length(); 18 std::string::size_type hs = h.length();
14 if(hs&1) 19 if(hs&1)
@@ -32,6 +37,18 @@ binary_t& binary_t::from_data(const void *d,size_t s) {
32 return *this; 37 return *this;
33} 38}
34 39
40binary_t& binary_t::make_nonce() {
41#ifdef HAVE_LIBUUID
42 uuid_t uuid;
43 uuid_generate(uuid);
44 from_data((unsigned char*)uuid,sizeof(uuid));
45#else
46 resize(16);
47 std::generate_n(begin(),16,rand);
48#endif /* HAVE_LIBUUID */
49 return *this;
50}
51
35std::string binary_t::hex() const { 52std::string binary_t::hex() const {
36 std::string rv; 53 std::string rv;
37 rv.reserve((size()<<1)+1); 54 rv.reserve((size()<<1)+1);
diff --git a/src/eyetil.h b/src/eyetil.h
index 378f703..d946e71 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -15,6 +15,7 @@ class binary_t : public std::vector<unsigned char> {
15 15
16 binary_t& from_hex(const std::string& h); 16 binary_t& from_hex(const std::string& h);
17 binary_t& from_data(const void *d,size_t s); 17 binary_t& from_data(const void *d,size_t s);
18 binary_t& make_nonce();
18 19
19 std::string hex() const; 20 std::string hex() const;
20 binary_t md5() const; 21 binary_t md5() const;