Rev 1024 | Rev 1050 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1024 | Rev 1025 | ||
---|---|---|---|
Line 36... | Line 36... | ||
36 | return false; |
36 | return false; |
37 | } |
37 | } |
38 | 38 | ||
39 | public function action($actionID, $params) { |
39 | public function action($actionID, $params) { |
40 | if ($actionID == 'get_challenge') { |
40 | if ($actionID == 'get_challenge') { |
41 | $complexity=50000; // TODO: make configurable |
- | |
42 | $server_secret='VtsClientChallenge:'.OIDplus::baseConfig()->getValue('SERVER_SECRET'); |
41 | $server_secret='VtsClientChallenge:'.OIDplus::baseConfig()->getValue('SERVER_SECRET'); |
43 | 42 | ||
44 | $min = 0; |
43 | $offset = 0; // doesn't matter |
45 | $max = $complexity; |
44 | $min = $offset; |
- | 45 | $max = $offset + OIDplus::baseConfig()->getValue('VTS_CAPTCHA_COMPLEXITY', 50000); |
|
- | 46 | if ($max > mt_getrandmax()) $max = mt_getrandmax(); |
|
- | 47 | ||
46 | $starttime = time(); |
48 | $starttime = time(); |
47 | $random = rand($min,$max); // TODO: cryptographic rand |
49 | $random = mt_rand($min,$max); |
48 | $ip_target = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'unknown'; |
50 | $ip_target = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'unknown'; |
49 | $challenge = sha3_512($starttime.'/'.$ip_target.'/'.$random); |
51 | $challenge = sha3_512($starttime.'/'.$ip_target.'/'.$random); |
50 | $challenge_integrity = sha3_512_hmac($challenge,$server_secret); |
52 | $challenge_integrity = sha3_512_hmac($challenge,$server_secret); |
51 | $send_to_client = array($starttime, $ip_target, $challenge, $min, $max, $challenge_integrity); |
53 | $send_to_client = array($starttime, $ip_target, $challenge, $min, $max, $challenge_integrity); |
52 | 54 | ||
53 | $open_trans_file = self::getOpenTransFileName($ip_target, $random); |
55 | $open_trans_file = self::getOpenTransFileName($ip_target, $random); |
54 | if (@file_put_contents($open_trans_file, '') === false) { |
56 | if (@file_put_contents($open_trans_file, '') === false) { |
55 | throw new OIDplusException(_L('Cannot write file %1', $open_trans_file)); |
57 | throw new OIDplusException(_L('Cannot write file %1', $open_trans_file)); |
56 | } |
58 | } |
57 | 59 | ||
- | 60 | return array( |
|
- | 61 | "status" => 0, |
|
58 | return array("status" => 0, "challenge" => $send_to_client); |
62 | "challenge" => $send_to_client, |
- | 63 | // Autosolve on=calculate result on page load; off=calculate result on form submit |
|
- | 64 | "autosolve" => OIDplus::baseConfig()->getValue('VTS_CAPTCHA_AUTOSOLVE', true) |
|
- | 65 | ); |
|
59 | } |
66 | } |
60 | } |
67 | } |
61 | 68 | ||
62 | private static function getOpenTransFileName($ip_target, $random) { |
69 | private static function getOpenTransFileName($ip_target, $random) { |
63 | $dir = OIDplus::localpath().'/userdata/cache'; |
70 | $dir = OIDplus::localpath().'/userdata/cache'; |
Line 88... | Line 95... | ||
88 | public function captchaVerify($params, $fieldname=null) { |
95 | public function captchaVerify($params, $fieldname=null) { |
89 | 96 | ||
90 | if (is_null($fieldname)) $fieldname = 'vts_validation_result'; |
97 | if (is_null($fieldname)) $fieldname = 'vts_validation_result'; |
91 | 98 | ||
92 | $server_secret='VtsClientChallenge:'.OIDplus::baseConfig()->getValue('SERVER_SECRET'); |
99 | $server_secret='VtsClientChallenge:'.OIDplus::baseConfig()->getValue('SERVER_SECRET'); |
93 | $max_time = 10*60; // 10min. TODO: make configurable! |
- | |
94 | 100 | ||
95 | if (!isset($params[$fieldname])) throw new OIDplusException(_L('No challenge response found').' (A)'); |
101 | if (!isset($params[$fieldname])) throw new OIDplusException(_L('No challenge response found').' (A)'); |
96 | 102 | ||
97 | $client_response = @json_decode($params[$fieldname], true); |
103 | $client_response = @json_decode($params[$fieldname], true); |
98 | 104 | ||
Line 108... | Line 114... | ||
108 | $open_trans_file = self::getOpenTransFileName($ip_target, $answer); |
114 | $open_trans_file = self::getOpenTransFileName($ip_target, $answer); |
109 | 115 | ||
110 | $current_ip = (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'unknown'); |
116 | $current_ip = (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'unknown'); |
111 | if ($ip_target != $current_ip) { |
117 | if ($ip_target != $current_ip) { |
112 | throw new OIDplusException(_L('IP address has changed. Please try again. (current IP %1, expected %2)', $current_ip, $ip_target)); |
118 | throw new OIDplusException(_L('IP address has changed. Please try again. (current IP %1, expected %2)', $current_ip, $ip_target)); |
113 | } else if (time()-$starttime > $max_time) { |
119 | } else if (time()-$starttime > OIDplus::baseConfig()->getValue('VTS_CAPTCHA_MAXTIME', 10*60/*10 minutes*/)) { |
114 | throw new OIDplusException(_L('Challenge expired. Please try again.')); |
120 | throw new OIDplusException(_L('Challenge expired. Please try again.')); |
115 | } else if ($challenge_integrity != sha3_512_hmac($challenge,$server_secret)) { |
121 | } else if ($challenge_integrity != sha3_512_hmac($challenge,$server_secret)) { |
116 | throw new OIDplusException(_L('Challenge integrity failed')); |
122 | throw new OIDplusException(_L('Challenge integrity failed')); |
117 | } else if ($challenge !== sha3_512($starttime.'/'.$ip_target.'/'.$answer)) { |
123 | } else if ($challenge !== sha3_512($starttime.'/'.$ip_target.'/'.$answer)) { |
118 | throw new OIDplusException(_L('Wrong answer')); |
124 | throw new OIDplusException(_L('Wrong answer')); |