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 ed6e159908e7d021fed601586e87e866a14d5f0f (commit)
from 946e7f8ac2710e68a823fd4a103f86afeae1cf40 (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=ed6e159908e7d021fed601586e87e866a14d5f0f
commit ed6e159908e7d021fed601586e87e866a14d5f0f
Author: Sylvain Beucler <[email protected]>
Date: Wed Jul 8 10:05:52 2015 +0200
accounts: accept more elliptic curve ssh key types
diff --git a/src/CHANGES b/src/CHANGES
index a0f6784..5ae56ac 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,6 @@
Fusionforge 6.0.3:
* Layout: fix rss url when url is absolute (TrivialDev)
+* Accounts: accept more elliptic curve ssh keys types (Unit 193 & Inria)
FusionForge 6.0.2:
* Accounts: fix elliptic curve ssh keys support (Inria)
diff --git a/src/common/include/account.php b/src/common/include/account.php
index bba98e9..e4750ac 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -322,7 +322,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+/]{68,}={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-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|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
