RocketGit

catalinux / rocketgit (public) (License: Affero GPLv3) (since 2015-03-19) (hash sha1)

Main RocketGit repo

Clone URLs: https://rocketgit.com/user/catalinux/rocketgit ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit git://git.rocketgit.com/user/catalinux/rocketgit

List of commits:

Subject	Hash	Author	Date (UTC)
SSH key fingerprint: add SHA256 support	f774edcd0c17f66dd4de54aa35a543bbafaff609	Catalin(ux) M. BOIE	2015-06-04 20:31:35
Put features first in menu	33a9cef11227407d2cdf63056e71b66dd6106f62	Catalin(ux) M. BOIE	2015-06-02 19:44:51
Switch to v2 images	e0d94a44d7093be83b82ea5227c0afcba22a5d27	Catalin(ux) M. BOIE	2015-05-27 03:36:13
Remove 'qcow2' reference because was not the place	ec800590fd07b69f377387c8353d50f6a9430ff8	Catalin(ux) M. BOIE	2015-05-27 03:35:32
Instruct used to follow the README file after rpm install	1e1f092339a0fb4ab7c7ead080d68c1d04686d29	Catalin(ux) M. BOIE	2015-05-27 03:30:23
Lots of fixes, mostly on templating stuff.	eb7e8f94fa4a2f5d82f913bcd7113287172cd450	Catalin(ux) M. BOIE	2015-05-25 18:51:36
Lots of changes all over the place.	9b39ce5e62255ff390926ef11c37b98d1d8751d2	Catalin(ux) M. BOIE	2015-05-22 03:25:46
Invites now accepts a file as the body of the e-mail and php_errormsg fixes.	31ccba6e43e02c34fa2139fe352c3799feecd249	Catalin(ux) M. BOIE	2015-05-09 04:17:40
Allow compression inside TLS	00828bd5eaf5ad08ff7736a6c5627c21179a8e20	Catalin(ux) M. BOIE	2015-05-06 17:09:07
Bump version to 0.32	8a9194a00721f0f6c55ab4bc986e23962357f250	Catalin(ux) M. BOIE	2015-05-05 21:20:30
Small fixes all over the place	baaa5336810128456e63d5e5a8cb111c81fe162d	Catalin(ux) M. BOIE	2015-05-05 21:20:12
Forgot to initialize a variable.	beca8b9e01c37c6101f9a61f8ecf8cb744f1bd41	Catalin(ux) M. BOIE	2015-05-04 22:23:37
Bump version to 0.31	a03215399419416798da2fbaf51a71959f112bc6	Catalin(ux) M. BOIE	2015-05-04 21:52:29
Small fixes, mainy CSS.	f0a08c03ae739e59d1a608234cbb0988cca6a351	Catalin(ux) M. BOIE	2015-05-04 21:51:58
Mostly text changes.	d70ca5530fe3ef23f02f8a2563e957529fe0ea5c	Catalin(ux) M. BOIE	2015-05-04 20:17:59
Fixed an AVC related to apache logging.	21f0a49a7c51687e38046437eca2bfe7a2c86d78	Catalin(ux) M. BOIE	2015-04-24 15:35:11
Lots of fixes, mostly CSS	7f079cf057ae0545827ba0090b816ac181bd2139	Catalin(ux) M. BOIE	2015-04-22 18:39:21
Lots of fixes all over the place.	12b0f0dc0503557effe906b6f7bf519768fdf766	Catalin(ux) M. BOIE	2015-04-21 22:23:25
Added template for libvirt	3c3d00aa66f86c25cb35f273f017d6f0ea4552b7	Catalin(ux) M. BOIE	2015-04-20 16:06:51
Deal with git log when binary files are involved	cda372cdb187782a1a1f8b0986c30fecbd0d0eb6	Catalin(ux) M. BOIE	2015-04-20 03:49:49

Commit f774edcd0c17f66dd4de54aa35a543bbafaff609 - SSH key fingerprint: add SHA256 support

Till now, only md5 was supported, but OpenSSH switched to SHA256 by default.

Author: Catalin(ux) M. BOIE
Author date (UTC): 2015-06-04 20:31
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2015-06-04 20:31
Parent(s): 33a9cef11227407d2cdf63056e71b66dd6106f62
Signing key:
Tree: dcfe0d641af474d3a2ad41607e30fdb8f4c732e4

File	Lines added	Lines deleted
inc/keys.inc.php	4	1
root/themes/default/user/keys/list/line.html	1	1
tests/keys.php	11	3

File inc/keys.inc.php changed (mode: 100644) (index 0b05323..dc167c4)
...	...	function rg_keys_info($key)
243	243	$a = array();	$a = array();
244	244	for ($i = 0; $i < 16; $i++)	for ($i = 0; $i < 16; $i++)
245	245	$a[] = substr($digest, $i * 2, 2);	$a[] = substr($digest, $i * 2, 2);
246		$ret['fingerprint'] = implode(":", $a);
	246		$ret['fingerprint_md5'] = implode(":", $a);
	247
	248		$_x = base64_encode(hash('sha256', $d, TRUE));
	249		$ret['fingerprint_sha256'] = rtrim($_x, "=");
247	250
248	251	$ret['ok'] = 1;	$ret['ok'] = 1;
249	252	break;	break;

File root/themes/default/user/keys/list/line.html changed (mode: 100644) (index 5009f69..b740ba2)
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>@@fingerprint@@</td>
	4		<td><small>MD5:@@fingerprint_md5@@<br />SHA256:@@fingerprint_sha256@@</small></td>
5	5	<td>@@comment@@</td>	<td>@@comment@@</td>
6	6	<td>@@first_use@@</td>	<td>@@first_use@@</td>
7	7	<td>@@last_use@@</td>	<td>@@last_use@@</td>

File tests/keys.php changed (mode: 100644) (index 4576db7..e092a10)
...	...	if ($r['ok'] != 1) {
146	146	rg_log("Error for a valid key (ecdsa): " . rg_keys_error() . "!");	rg_log("Error for a valid key (ecdsa): " . rg_keys_error() . "!");
147	147	exit(1);	exit(1);
148	148	}	}
149		if (strcasecmp($r['fingerprint'], '85:8f:2f:84:c2:db:88:e5:95:f6:22:b9:8d:91:59:cc') != 0) {
150		rg_log("Invalid fingerprint!");
	149		if (strcasecmp($r['fingerprint_md5'], '85:8f:2f:84:c2:db:88:e5:95:f6:22:b9:8d:91:59:cc') != 0) {
	150		rg_log_ml("r=" . print_r($r, TRUE));
	151		rg_log("Invalid md5 fingerprint!");
	152		exit(1);
	153		}
	154		if (strcasecmp($r['fingerprint_sha256'], 'd0FRDYxeXCcS/ZBd4wGbzCRHnh5VPB2zjoYYJRg5Gwo') != 0) {
	155		rg_log_ml("r=" . print_r($r, TRUE));
	156		rg_log("Invalid sha256 fingerprint!");
151	157	exit(1);	exit(1);
152	158	}	}
153	159

...	...	$comment = 'comment';
159	165	$key = $type . ' ' . $body . ' ' . $comment;	$key = $type . ' ' . $body . ' ' . $comment;
160	166	$r = rg_keys_info($key);	$r = rg_keys_info($key);
161	167	if ($r['ok'] != 1) {	if ($r['ok'] != 1) {
	168		rg_log_ml("r=" . print_r($r, TRUE));
162	169	rg_log("Error for a valid key (ed25519): " . rg_keys_error() . "!");	rg_log("Error for a valid key (ed25519): " . rg_keys_error() . "!");
163	170	exit(1);	exit(1);
164	171	}	}
165		if (strcasecmp($r['fingerprint'], '28:f7:1b:cb:ba:43:0a:41:b8:30:a3:8e:8f:bc:d5:4a') != 0) {
	172		if (strcasecmp($r['fingerprint_md5'], '28:f7:1b:cb:ba:43:0a:41:b8:30:a3:8e:8f:bc:d5:4a') != 0) {
	173		rg_log_ml("r=" . print_r($r, TRUE));
166	174	rg_log("Invalid fingerprint!");	rg_log("Invalid fingerprint!");
167	175	exit(1);	exit(1);
168	176	}	}

Hints:
Before first commit, do not forget to setup your git environment:

git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):

git clone https://rocketgit.com/user/catalinux/rocketgit

Clone this repository using ssh (do not forget to upload a key first):

git clone ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit

Clone this repository using git:

git clone git://git.rocketgit.com/user/catalinux/rocketgit

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:

... clone the repository ...
... make some changes and some commits ...
git push origin main