-rw-r--r-- | src/eyefiservice.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index d9318ed..f8d5f31 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -1,84 +1,84 @@ | |||
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 | ||
14 | static binary_t session_nonce; | 14 | static binary_t session_nonce; |
15 | 15 | ||
16 | static bool detached_child() { | 16 | static 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 | ||
33 | static int E(eyefiService* efs,const char *c,const std::exception& e) { | 33 | static int E(eyefiService* efs,const char *c,const std::exception& e) { |
34 | efs->keep_alive=0; | 34 | efs->keep_alive=0; |
35 | syslog(LOG_ERR,"error while processing %s: %s",c,e.what()); | 35 | syslog(LOG_ERR,"error while processing %s: %s",c,e.what()); |
36 | return efs->soap_receiverfault(gnu::autosprintf("error processing %s",c),0); | 36 | return soap_sender_fault(efs,gnu::autosprintf("error processing %s",c),0); |
37 | } | 37 | } |
38 | 38 | ||
39 | int eyefiService::StartSession( | 39 | int eyefiService::StartSession( |
40 | std::string macaddress,std::string cnonce, | 40 | std::string macaddress,std::string cnonce, |
41 | int transfermode,long transfermodetimestamp, | 41 | int transfermode,long transfermodetimestamp, |
42 | struct rns__StartSessionResponse &r ) try { | 42 | struct rns__StartSessionResponse &r ) try { |
43 | #ifndef NDEBUG | 43 | #ifndef NDEBUG |
44 | syslog(LOG_DEBUG, | 44 | syslog(LOG_DEBUG, |
45 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", | 45 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", |
46 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); | 46 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); |
47 | #endif | 47 | #endif |
48 | eyekinfig_t eyekinfig(macaddress); | 48 | eyekinfig_t eyekinfig(macaddress); |
49 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); | 49 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); |
50 | 50 | ||
51 | r.snonce = session_nonce.make_nonce().hex(); | 51 | r.snonce = session_nonce.make_nonce().hex(); |
52 | r.transfermode=transfermode; | 52 | r.transfermode=transfermode; |
53 | r.transfermodetimestamp=transfermodetimestamp; | 53 | r.transfermodetimestamp=transfermodetimestamp; |
54 | r.upsyncallowed=false; | 54 | r.upsyncallowed=false; |
55 | 55 | ||
56 | std::string cmd = eyekinfig.get_on_start_session(); | 56 | std::string cmd = eyekinfig.get_on_start_session(); |
57 | if(!cmd.empty()) { | 57 | if(!cmd.empty()) { |
58 | if(detached_child()) { | 58 | if(detached_child()) { |
59 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); | 59 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); |
60 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); | 60 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); |
61 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); | 61 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); |
62 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; | 62 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; |
63 | execv("/bin/sh",argv); | 63 | execv("/bin/sh",argv); |
64 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 64 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
65 | _exit(-1); | 65 | _exit(-1); |
66 | } | 66 | } |
67 | } | 67 | } |
68 | return SOAP_OK; | 68 | return SOAP_OK; |
69 | }catch(const std::exception& e) { return E(this,"StartSession",e); } | 69 | }catch(const std::exception& e) { return E(this,"StartSession",e); } |
70 | 70 | ||
71 | int eyefiService::GetPhotoStatus( | 71 | int eyefiService::GetPhotoStatus( |
72 | std::string credential, std::string macaddress, | 72 | std::string credential, std::string macaddress, |
73 | std::string filename, long filesize, std::string filesignature, | 73 | std::string filename, long filesize, std::string filesignature, |
74 | int flags, | 74 | int flags, |
75 | struct rns__GetPhotoStatusResponse &r ) try { | 75 | struct rns__GetPhotoStatusResponse &r ) try { |
76 | #ifndef NDEBUG | 76 | #ifndef NDEBUG |
77 | syslog(LOG_DEBUG, | 77 | syslog(LOG_DEBUG, |
78 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", | 78 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", |
79 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, | 79 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, |
80 | session_nonce.hex().c_str() ); | 80 | session_nonce.hex().c_str() ); |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); | 83 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); |
84 | 84 | ||