Subject | Hash | Author | Date (UTC) |
---|---|---|---|
Show the key size in bits when listing ssh keys | 31583c21cf178475e546ad47a47e56c6982dff09 | Catalin(ux) M. BOIE | 2016-02-08 06:23:43 |
Improved a little the admin report | 1f348f2c163ba1320dce223774b2f677f18d6461 | Catalin(ux) M. BOIE | 2016-02-08 06:23:05 |
Improved a little how a tree is shown | 753af0ef4a6d9fc2f2ddb993335f3c50a3fff2ab | Catalin(ux) M. BOIE | 2016-02-07 06:46:02 |
In admin's report, add in the subject the total number of yesterday's changes | 02a3b4131626b7023ba87a59b188256a601cd13a | Catalin(ux) M. BOIE | 2016-02-07 05:52:47 |
More detailed and correct description for hooks | d3045a11eed05c897381ae2cfcbbf91ede1d4910 | Catalin(ux) M. BOIE | 2016-02-07 05:42:53 |
docker: fixes and improvements for image generation | 37bd416d1664e8d9fcdf4554646618e5dd226e35 | Catalin(ux) M. BOIE | 2016-02-07 05:42:28 |
Added bug template and prefill the bug form assigned to field to the owner of the repo | 682e787ceb92d770e1a268a9f635e4336102cf3b | Catalin(ux) M. BOIE | 2016-02-07 05:38:58 |
Change download location for rocketgit.xml | 41bf40104994391fd5d9938ac891157625872c0d | Catalin(ux) M. BOIE | 2016-02-02 23:04:53 |
Fixes for data encoding for slack | 67b8210aa1c86b891d6760c89ac840f38f4eb025 | Catalin(ux) M. BOIE | 2016-01-30 17:49:57 |
Some TODO updates and some minor text fixes | d4a5bc8e8bc37021ca2c30899c01d8c54d56e5f6 | Catalin(ux) M. BOIE | 2016-01-30 17:38:59 |
Some docker fixes | 36c31d723d45a067980217b1c642f6bb77d54fd9 | Catalin(ux) M. BOIE | 2016-01-30 17:38:25 |
When adding hooks, help the user by providing some defaults (slack for now) | a7f4d8f10f8943508d90e968129b412431a4b0c3 | Catalin(ux) M. BOIE | 2016-01-30 17:37:50 |
Store good key string into the database. | 460245b306d9e7340969b386eecaaa6cfc7f7431 | Catalin(ux) M. BOIE | 2016-01-29 18:23:12 |
Some small fixes for http hooks | 43f8db273aedd804b150ee07a1af23b347687975 | Catalin(ux) M. BOIE | 2016-01-29 18:22:32 |
Bump version | 37e96e0960414a11682c3fc1344e896c93492123 | Catalin(ux) M. BOIE | 2016-01-25 21:28:45 |
Remove debug leftover | f39db0548ef78c2265d675a4199c9c26d53807b3 | Catalin(ux) M. BOIE | 2016-01-25 21:27:33 |
Fixed bad interaction between fixes and structure | fc0fabf8d429a18978908694bc9a86d09bed702b | Catalin(ux) M. BOIE | 2016-01-25 21:27:13 |
Do not allow a failed connection to generate err-* file | 5cf7214e724427ef78a1e8d72eef1be865c2270a | Catalin(ux) M. BOIE | 2016-01-20 22:56:56 |
Log the id of the event | 115138b15e0436b56b7f75f12e5cf0d068989dea | Catalin(ux) M. BOIE | 2016-01-20 19:28:53 |
If git ls-tree returns nothing, the path is invalid | a96013c19fae04a9ec0ec3b1505825c92150c978 | Catalin(ux) M. BOIE | 2016-01-20 19:14:03 |
File | Lines added | Lines deleted |
---|---|---|
inc/keys.inc.php | 16 | 2 |
root/themes/default/user/keys/list/header.html | 1 | 0 |
root/themes/default/user/keys/list/line.html | 1 | 0 |
File inc/keys.inc.php changed (mode: 100644) (index 7d7a653..8d00ffc) | |||
... | ... | function rg_keys_info($key) | |
210 | 210 | break; | break; |
211 | 211 | } | } |
212 | 212 | ||
213 | $bits_div = 1; | ||
214 | $bits_sub = 1; | ||
213 | 215 | if (strcasecmp($ret['type'], 'ssh-rsa') == 0) { | if (strcasecmp($ret['type'], 'ssh-rsa') == 0) { |
214 | 216 | $count = 2; | $count = 2; |
217 | $bits_pos = 1; | ||
215 | 218 | } else if (strcasecmp($ret['type'], 'ssh-dss') == 0) { | } else if (strcasecmp($ret['type'], 'ssh-dss') == 0) { |
216 | 219 | $count = 4; | $count = 4; |
220 | $bits_pos = 3; | ||
217 | 221 | } else if (strncasecmp($ret['type'], 'ecdsa-', 6) == 0) { | } else if (strncasecmp($ret['type'], 'ecdsa-', 6) == 0) { |
218 | 222 | $count = 2; | $count = 2; |
223 | $bits_pos = 1; | ||
224 | $bits_div = 2; | ||
219 | 225 | } else if (strcasecmp($ret['type'], 'ssh-ed25519') == 0) { | } else if (strcasecmp($ret['type'], 'ssh-ed25519') == 0) { |
220 | 226 | $count = 1; | $count = 1; |
227 | // TODO: not sure about this! | ||
228 | $bits_pos = 0; | ||
229 | $bits_sub = 0; | ||
221 | 230 | } else { | } else { |
222 | 231 | rg_log('Strange key type: ' . $ret['type']); | rg_log('Strange key type: ' . $ret['type']); |
223 | 232 | // Probably this is a new key type, just consider it valid | // Probably this is a new key type, just consider it valid |
224 | 233 | $_t = explode(' ', $key, 3); | $_t = explode(' ', $key, 3); |
225 | 234 | $ret['key'] = $_t[1]; | $ret['key'] = $_t[1]; |
226 | 235 | if (isset($_t[2])) | if (isset($_t[2])) |
227 | $ret['comment'] = $_t[2]; | ||
236 | $ret['comment'] = trim($_t[2]); | ||
228 | 237 | $error = FALSE; | $error = FALSE; |
229 | 238 | break; | break; |
230 | 239 | } | } |
... | ... | function rg_keys_info($key) | |
240 | 249 | $_t = unpack('N', substr($d, $used, 4)); | $_t = unpack('N', substr($d, $used, 4)); |
241 | 250 | $xlen = $_t[1]; | $xlen = $_t[1]; |
242 | 251 | rg_log_ml("xlen=$xlen"); | rg_log_ml("xlen=$xlen"); |
252 | //rg_log('bin: ' . bin2hex(substr($d, $used + 4, $xlen))); | ||
253 | //rg_log('ascii: ' . substr($d, $used + 4, $xlen)); | ||
243 | 254 | if ($d_len < $used + 4 + $xlen) { | if ($d_len < $used + 4 + $xlen) { |
244 | 255 | rg_keys_set_error("key is too short (chunk body)"); | rg_keys_set_error("key is too short (chunk body)"); |
245 | 256 | $have_all_chunks = FALSE; | $have_all_chunks = FALSE; |
246 | 257 | break; | break; |
247 | 258 | } | } |
248 | 259 | ||
260 | if ($i == $bits_pos) | ||
261 | $ret['bits'] = (($xlen - $bits_sub) / $bits_div) * 8; | ||
262 | |||
249 | 263 | $used += 4 + $xlen; | $used += 4 + $xlen; |
250 | 264 | } | } |
251 | 265 | if ($have_all_chunks === FALSE) | if ($have_all_chunks === FALSE) |
252 | 266 | continue; | continue; |
253 | 267 | ||
254 | $ret['comment'] = substr($t[1], $off); | ||
268 | $ret['comment'] = trim(substr($t[1], $off)); | ||
255 | 269 | ||
256 | 270 | $error = FALSE; | $error = FALSE; |
257 | 271 | break; | break; |
File root/themes/default/user/keys/list/header.html changed (mode: 100644) (index 094d54e..8b89a0b) | |||
10 | 10 | <tr> | <tr> |
11 | 11 | <th>Select</th> | <th>Select</th> |
12 | 12 | <th>Upload date (UTC)</th> | <th>Upload date (UTC)</th> |
13 | <th>Bits</th> | ||
13 | 14 | <th>Fingerprint</th> | <th>Fingerprint</th> |
14 | 15 | <th>Comment</th> | <th>Comment</th> |
15 | 16 | <th>First use (UTC)</th> | <th>First use (UTC)</th> |
File root/themes/default/user/keys/list/line.html changed (mode: 100644) (index 102f5cd..ea497af) | |||
1 | 1 | <tr> | <tr> |
2 | 2 | <td><input type="checkbox" name="key_delete_ids[@@key_id@@]" /></td> | <td><input type="checkbox" name="key_delete_ids[@@key_id@@]" /></td> |
3 | 3 | <td>@@itime@@</td> | <td>@@itime@@</td> |
4 | <td>@@bits@@</td> | ||
4 | 5 | <td><small>SHA256:@@fingerprint_sha256@@<br />MD5:@@fingerprint_md5@@</small></td> | <td><small>SHA256:@@fingerprint_sha256@@<br />MD5:@@fingerprint_md5@@</small></td> |
5 | 6 | <td>@@comment@@</td> | <td>@@comment@@</td> |
6 | 7 | <td>@@first_use@@</td> | <td>@@first_use@@</td> |