[aurweb,1/2] Source valid ssh prefixes from config

Message ID 20210610183512.516429-1-void@fluix.one
State New
Headers show
Series [aurweb,1/2] Source valid ssh prefixes from config | expand

Commit Message

Steven Guikal June 10, 2021, 6:35 p.m. UTC
---

I'm not versed in PHP and this hasn't been tested.

 web/lib/acctfuncs.inc.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Patch

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index efc08331..0d021f99 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -875,11 +875,7 @@  function valid_pgp_fingerprint($fingerprint) {
  * @return bool True if the SSH public key is valid, otherwise false
  */
 function valid_ssh_pubkey($pubkey) {
-	$valid_prefixes = array(
-		"ssh-rsa", "ssh-dss", "ecdsa-sha2-nistp256",
-		"ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "ssh-ed25519",
-		"sk-ssh-ecdsa@openssh.com", "sk-ssh-ed25519@openssh.com"
-	);
+	$valid_prefixes = explode(' ', config_get('auth', 'valid-keytypes'));
 
 	$has_valid_prefix = false;
 	foreach ($valid_prefixes as $prefix) {