author | Michael Krelin <hacker@klever.net> | 2012-01-20 20:46:10 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2012-01-20 20:46:10 (UTC) |
commit | a9f093cc83926b0e83324aa9e022903563d9d801 (patch) (unidiff) | |
tree | edb99733968e4617d386406f23aab1f5788eea70 /src | |
parent | 6258fb1baaaa46a828fd6753b9401880b9b63aec (diff) | |
download | iii-a9f093cc83926b0e83324aa9e022903563d9d801.zip iii-a9f093cc83926b0e83324aa9e022903563d9d801.tar.gz iii-a9f093cc83926b0e83324aa9e022903563d9d801.tar.bz2 |
return fault in case of (unsurprisingly) failure
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyefiservice.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 9ef4bb6..2586ade 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -1,128 +1,129 @@ | |||
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 | int eyefiService::StartSession( | 33 | int eyefiService::StartSession( |
34 | std::string macaddress,std::string cnonce, | 34 | std::string macaddress,std::string cnonce, |
35 | int transfermode,long transfermodetimestamp, | 35 | int transfermode,long transfermodetimestamp, |
36 | struct rns__StartSessionResponse &r ) try { | 36 | struct rns__StartSessionResponse &r ) try { |
37 | #ifndef NDEBUG | 37 | #ifndef NDEBUG |
38 | syslog(LOG_DEBUG, | 38 | syslog(LOG_DEBUG, |
39 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", | 39 | "StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld", |
40 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); | 40 | macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp ); |
41 | #endif | 41 | #endif |
42 | eyekinfig_t eyekinfig(macaddress); | 42 | eyekinfig_t eyekinfig(macaddress); |
43 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); | 43 | r.credential = binary_t(macaddress+cnonce+eyekinfig.get_upload_key()).md5().hex(); |
44 | 44 | ||
45 | r.snonce = session_nonce.make_nonce().hex(); | 45 | r.snonce = session_nonce.make_nonce().hex(); |
46 | r.transfermode=transfermode; | 46 | r.transfermode=transfermode; |
47 | r.transfermodetimestamp=transfermodetimestamp; | 47 | r.transfermodetimestamp=transfermodetimestamp; |
48 | r.upsyncallowed=false; | 48 | r.upsyncallowed=false; |
49 | 49 | ||
50 | std::string cmd = eyekinfig.get_on_start_session(); | 50 | std::string cmd = eyekinfig.get_on_start_session(); |
51 | if(!cmd.empty()) { | 51 | if(!cmd.empty()) { |
52 | if(detached_child()) { | 52 | if(detached_child()) { |
53 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); | 53 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); |
54 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); | 54 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODE=%d",transfermode) ); |
55 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); | 55 | putenv( gnu::autosprintf("EYEFI_TRANSFERMODETIMESTAMP=%ld",transfermodetimestamp) ); |
56 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; | 56 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; |
57 | execv("/bin/sh",argv); | 57 | execv("/bin/sh",argv); |
58 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 58 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
59 | _exit(-1); | 59 | _exit(-1); |
60 | } | 60 | } |
61 | } | 61 | } |
62 | return SOAP_OK; | 62 | return SOAP_OK; |
63 | }catch(std::runtime_error& e) { | 63 | }catch(std::runtime_error& e) { |
64 | syslog(LOG_ERR,"error while processing StartSession: %s",e.what()); | 64 | syslog(LOG_ERR,"error while processing StartSession: %s",e.what()); |
65 | return soap_receiverfault(e.what(),0); | ||
65 | } | 66 | } |
66 | 67 | ||
67 | int eyefiService::GetPhotoStatus( | 68 | int eyefiService::GetPhotoStatus( |
68 | std::string credential, std::string macaddress, | 69 | std::string credential, std::string macaddress, |
69 | std::string filename, long filesize, std::string filesignature, | 70 | std::string filename, long filesize, std::string filesignature, |
70 | int flags, | 71 | int flags, |
71 | struct rns__GetPhotoStatusResponse &r ) { | 72 | struct rns__GetPhotoStatusResponse &r ) { |
72 | #ifndef NDEBUG | 73 | #ifndef NDEBUG |
73 | syslog(LOG_DEBUG, | 74 | syslog(LOG_DEBUG, |
74 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", | 75 | "GetPhotoStatus request from %s with credential=%s, filename=%s, filesize=%ld, filesignature=%s, flags=%d; session nonce=%s", |
75 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, | 76 | macaddress.c_str(), credential.c_str(), filename.c_str(), filesize, filesignature.c_str(), flags, |
76 | session_nonce.hex().c_str() ); | 77 | session_nonce.hex().c_str() ); |
77 | #endif | 78 | #endif |
78 | 79 | ||
79 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); | 80 | std::string computed_credential = binary_t(macaddress+eyekinfig_t(macaddress).get_upload_key()+session_nonce.hex()).md5().hex(); |
80 | 81 | ||
81 | #ifndef NDEBUG | 82 | #ifndef NDEBUG |
82 | syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); | 83 | syslog(LOG_DEBUG, " computed credential=%s", computed_credential.c_str()); |
83 | #endif | 84 | #endif |
84 | 85 | ||
85 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); | 86 | if (credential != computed_credential) throw std::runtime_error("card authentication failed"); |
86 | 87 | ||
87 | r.fileid = 1; r.offset = 0; | 88 | r.fileid = 1; r.offset = 0; |
88 | return SOAP_OK; | 89 | return SOAP_OK; |
89 | } | 90 | } |
90 | 91 | ||
91 | int eyefiService::MarkLastPhotoInRoll( | 92 | int eyefiService::MarkLastPhotoInRoll( |
92 | std::string macaddress, int mergedelta, | 93 | std::string macaddress, int mergedelta, |
93 | struct rns__MarkLastPhotoInRollResponse &r ) { | 94 | struct rns__MarkLastPhotoInRollResponse &r ) { |
94 | #ifndef NDEBUG | 95 | #ifndef NDEBUG |
95 | syslog(LOG_DEBUG, | 96 | syslog(LOG_DEBUG, |
96 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", | 97 | "MarkLastPhotoInRoll request from %s with mergedelta=%d", |
97 | macaddress.c_str(), mergedelta ); | 98 | macaddress.c_str(), mergedelta ); |
98 | #endif | 99 | #endif |
99 | std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); | 100 | std::string cmd = eyekinfig_t(macaddress).get_on_mark_last_photo_in_roll(); |
100 | if(!cmd.empty()) { | 101 | if(!cmd.empty()) { |
101 | if(detached_child()) { | 102 | if(detached_child()) { |
102 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); | 103 | putenv( gnu::autosprintf("EYEFI_MACADDRESS=%s",macaddress.c_str()) ); |
103 | putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); | 104 | putenv( gnu::autosprintf("EYEFI_MERGEDELTA=%d",mergedelta) ); |
104 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; | 105 | char *argv[] = { (char*)"/bin/sh", (char*)"-c", (char*)cmd.c_str(), 0 }; |
105 | execv("/bin/sh",argv); | 106 | execv("/bin/sh",argv); |
106 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); | 107 | syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str()); |
107 | _exit(-1); | 108 | _exit(-1); |
108 | } | 109 | } |
109 | } | 110 | } |
110 | keep_alive = 0; | 111 | keep_alive = 0; |
111 | return SOAP_OK; | 112 | return SOAP_OK; |
112 | } | 113 | } |
113 | 114 | ||
114 | int eyefiService::UploadPhoto( | 115 | int eyefiService::UploadPhoto( |
115 | int fileid, std::string macaddress, | 116 | int fileid, std::string macaddress, |
116 | std::string filename, long filesize, std::string filesignature, | 117 | std::string filename, long filesize, std::string filesignature, |
117 | std::string encryption, int flags, | 118 | std::string encryption, int flags, |
118 | struct rns__UploadPhotoResponse& r ) { | 119 | struct rns__UploadPhotoResponse& r ) { |
119 | #ifndef NDEBUG | 120 | #ifndef NDEBUG |
120 | syslog(LOG_DEBUG, | 121 | syslog(LOG_DEBUG, |
121 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," | 122 | "UploadPhoto request from %s with fileid=%d, filename=%s, filesize=%ld," |
122 | " filesignature=%s, encryption=%s, flags=%04X", | 123 | " filesignature=%s, encryption=%s, flags=%04X", |
123 | macaddress.c_str(), fileid, filename.c_str(), filesize, | 124 | macaddress.c_str(), fileid, filename.c_str(), filesize, |
124 | filesignature.c_str(), encryption.c_str(), flags ); | 125 | filesignature.c_str(), encryption.c_str(), flags ); |
125 | #endif | 126 | #endif |
126 | eyekinfig_t eyekinfig(macaddress); | 127 | eyekinfig_t eyekinfig(macaddress); |
127 | 128 | ||
128 | umask(eyekinfig.get_umask()); | 129 | umask(eyekinfig.get_umask()); |