Revert "improve ssh key validation (#163)"

This reverts commit cf60e7a.

Author: simonLeary42

.github/workflows/phpunit.yml

@@ -7,14 +7,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: "8.3"
-        # php extensions also listed in tools/docker-dev/web/Dockerfile
-        extensions: curl,mysql,ldap,pdo,redis
-        tools: composer:v2
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
-    - name: Run PHPUnit tests
-      run: vendor/bin/phpunit
+    - uses: php-actions/composer@v6
+    - uses: php-actions/phpunit@v3

composer.json

@@ -4,8 +4,5 @@
         "phpseclib/phpseclib": "3.0.43",
         "phpmailer/phpmailer": "6.6.4",
         "hakasapl/phpopenldaper": "1.0.5"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "<12.1"
     }
 }

phpunit.xml

@@ -1,9 +1,9 @@
-  <!-- restrictWarnings="true" -->
 <phpunit
   bootstrap="test/unit/bootstrap.php"
   failOnWarning="true"
   failOnDeprecation="true"
   failOnNotice="true"
+  restrictWarnings="true"
 >
   <testsuites>
     <testsuite name="unit">

resources/lib/UnitySite.php

@@ -52,18 +52,6 @@ public static function getGithubKeys($username)
 
     public static function testValidSSHKey($key_str)
     {
-        $key_str = trim($key_str);
-        if ($key_str == "") {
-            return false;
-        }
-        // PHP warning when key_str is digits: Attempt to read property "keys" on int
-        if (preg_match("/^[0-9]+$/", $key_str)) {
-            return false;
-        }
-        // PHP warning when key_str is JSON: Undefined property: stdClass::$keys
-        if (!is_null(@json_decode($key_str))) {
-            return false;
-        }
         try {
             PublicKeyLoader::load($key_str);
             return true;

test/unit/AjaxSshValidateTest.php

@@ -2,7 +2,6 @@ FROM ubuntu:20.04
 
 # Web Server Setup
 ARG DEBIAN_FRONTEND=noninteractive
-# php extensions also listed in .github/workflows/phpunit.yml
 RUN apt-get update && apt-get install -y \
     apache2 \
     apache2-utils \
@@ -24,4 +23,4 @@ RUN sed -i '/display_errors/c\display_errors = on' /etc/php/7.4/apache2/php.ini
 # Start apache2 server
 EXPOSE 80
 
-CMD ["apache2ctl", "-D", "FOREGROUND"]
+CMD ["apache2ctl", "-D", "FOREGROUND"]

tools/docker-dev/web/Dockerfile

@@ -1,6 +1,12 @@
 <?php
 
-require_once __DIR__ . "/../../../resources/lib/UnitySite.php";
-use UnityWebPortal\lib\UnitySite;
+require "../../../resources/autoload.php";
 
-echo UnitySite::testValidSSHKey($_POST["key"]) ? "true" : "false";
+use phpseclib3\Crypt\PublicKeyLoader;
+
+try {
+    PublicKeyLoader::load($_POST['key'], $password = false);
+    echo "true";
+} catch (Exception $e) {
+    echo "false";
+}