This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via 5ddf0c26d2d28b7651660c7a90c6352d21d41e39 (commit)
from bd3653b64ab5997a54fce70af9f2cbd9f4957ebe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5ddf0c26d2d28b7651660c7a90c6352d21d41e39
commit 5ddf0c26d2d28b7651660c7a90c6352d21d41e39
Author: Sylvain Beucler <[email protected]>
Date: Thu Jun 25 11:05:39 2015 +0200
account: fix elliptic curve ssh keys support
diff --git a/src/CHANGES b/src/CHANGES
index 10c1872..9bee37b 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,6 @@
FusionForge 6.0.2:
* Mailing lists: fix description encoding depending on Mailman version (Inria
& Thorsten Glaser)
+* Accounts: fix elliptic curve ssh keys support (Inria)
FusionForge 6.0.1:
* Accounts: accept elliptic curve ssh keys (Unit 193)
diff --git a/src/common/include/account.php b/src/common/include/account.php
index 9a83ab2..182eb8e 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -321,7 +321,7 @@ function checkKeys($keys) {
/* The encoded key is made of 0-9, A-Z ,a-z, +, / (base
64) characters,
ends with zero or up to three '=' and the length must
be >= 512 bits (157 base64 characters).
The whole key ends with an optional comment. */
- if (
preg_match("@^(((no-port-forwarding|no-X11-forwarding|no-agent-forwarding|no-pty|command=\"[^\"]+\"|from=\"?[A-Za-z0-9\.-]+\"?),?)*\s+)?ssh-(ed25519|ecdsa|rsa|dss)\s+[A-Za-z0-9+/]{157,}={0,2}(\s+.*)?$@",
$key) === 0 ) { // Warning: we must use === for the test
+ if (
preg_match("@^(((no-port-forwarding|no-X11-forwarding|no-agent-forwarding|no-pty|command=\"[^\"]+\"|from=\"?[A-Za-z0-9\.-]+\"?),?)*\s+)?ssh-(ed25519|ecdsa|rsa|dss)\s+[A-Za-z0-9+/]{68,}={0,2}(\s+.*)?$@",
$key) === 0 ) { // Warning: we must use === for the test
$error_msg = sprintf(_('The following key has a
wrong format: |%s|. Please, correct it by going back to the previous page.'),
htmlspecialchars($key));
session_redirect('/account/');
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/common/include/account.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
