summaryrefslogtreecommitdiffabout
path: root/src/eyefiservice.cc
Unidiff
Diffstat (limited to 'src/eyefiservice.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc21
1 files changed, 16 insertions, 5 deletions
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}