[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.3-49-gde1bfa1

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Wed Dec 9 11:57:14 CET 2015


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  de1bfa135c0a6d4298e5e3c5b9a6bf6276a86c9a (commit)
      from  7a8e533d7b1c31392e12178866513d86967bccb7 (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=de1bfa135c0a6d4298e5e3c5b9a6bf6276a86c9a

commit de1bfa135c0a6d4298e5e3c5b9a6bf6276a86c9a
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Dec 9 11:57:04 2015 +0100

    account: fix supported ssh keys types - again

diff --git a/src/CHANGES b/src/CHANGES
index e63fe02..847fbbf 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -4,6 +4,7 @@ FusionForge 6.0.4:
 * Accounts: trigger system replication when user changes password or shell (Inria)
 * Accounts: passwords hashes: increase md5crypt salt length to 8; fix invalid Blowfish salt (Inria)
 * Accounts: passwords hashes: add support for SHA256/SHA512 (Inria)
+* Accounts: fix supported ssh keys types - again (Inria)
 * FRS: fix shownotes.php link. Use new url form. view=shownotes (TrivialDev)
 * FRS: frs latest zip migration script hardening (TrivialDev)
 * MTA-Exim4: restart exim4 on install
diff --git a/src/common/include/account.php b/src/common/include/account.php
index 40ba613..bd77498 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -341,7 +341,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-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
+			if ( preg_match("@^(((no-port-forwarding|no-X11-forwarding|no-agent-forwarding|no-pty|command=\"[^\"]+\"|from=\"?[A-Za-z0-9\.-]+\"?),?)*\s+)?(ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521|ssh-ed25519|ssh-dss|ssh-rsa)\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



More information about the Fusionforge-commits mailing list