Fix os-integration-test

.github/workflows/build.yaml

@@ -19,3 +19,19 @@ jobs:
       - uses: gradle/wrapper-validation-action@v1
       - uses: gradle/gradle-build-action@v2
       - run: ./gradlew build
+
+  os-integration-test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/gradle-build-action@v2
+      - run: bash os-integration-test/generate-keys.sh
+      - run: ./gradlew :os-integration-test:build
+        env:
+          SSH_PORT: 22

os-integration-test/build.gradle

@@ -14,9 +14,12 @@ dependencies {
 }
 
 test {
+    useJUnitPlatform()
     mustRunAfter ':server-integration-test:check'
 }
 
+test.enabled = System.getenv('SSH_PORT') != null
+
 task startSshAgent(type: Exec) {
     commandLine 'ssh-agent'
     standardOutput = new ByteArrayOutputStream()

os-integration-test/generate-keys.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+# Generate key pairs and known_hosts.
+# For GitHub Codespaces, set SSH_PORT=2222
+
+set -ex
+mkdir -m 700 -vp ~/.ssh
+
+# user keys
+ssh-keygen -t ecdsa -N '' -C '' -f ~/.ssh/id_ecdsa
+ssh-keygen -t ecdsa -N gradle -C '' -f ~/.ssh/id_ecdsa_pass
+
+# authorized_keys
+cat ~/.ssh/id_*.pub > ~/.ssh/authorized_keys
+
+# known_hosts
+ssh -v \
+  -o StrictHostKeyChecking=accept-new \
+  -o HostKeyAlgorithms=ecdsa-sha2-nistp256 \
+  -p "${SSH_PORT:-22}" \
+  localhost true

os-integration-test/src/main/groovy/org/hidetake/groovy/ssh/test/os/Fixture.groovy

@@ -16,27 +16,20 @@ class Fixture {
         service.remotes {
             Default {
                 host = 'localhost'
-                port = 22
-                user = 'tester'
-                identity = new File("etc/ssh/id_rsa")
+                port = System.getenv('SSH_PORT') as int
+                user = System.properties['user.name']
+                identity = new File("${System.properties['user.home']}/.ssh/id_ecdsa")
                 knownHosts = addHostKey(new File("build/known_hosts"))
             }
         }
         service.remotes {
-            DefaultWithECDSAKey {
-                host = service.remotes.Default.host
-                port = service.remotes.Default.port
-                user = service.remotes.Default.user
-                identity = new File("etc/ssh/id_ecdsa")
-                knownHosts = service.remotes.Default.knownHosts
-            }
             DefaultWithPassphrase {
                 host = service.remotes.Default.host
                 port = service.remotes.Default.port
                 user = service.remotes.Default.user
                 knownHosts = service.remotes.Default.knownHosts
 
-                identity = new File("etc/ssh/id_rsa_pass")
+                identity = new File("${System.properties['user.home']}/.ssh/id_ecdsa_pass")
                 passphrase = 'gradle'
             }
             DefaultWithOpenSSHKnownHosts {
@@ -45,7 +38,7 @@ class Fixture {
                 user = service.remotes.Default.user
                 identity = service.remotes.Default.identity
 
-                knownHosts = new File("etc/ssh/known_hosts")
+                knownHosts = new File("${System.properties['user.home']}/.ssh/known_hosts")
             }
             DefaultWithAgent {
                 host = service.remotes.Default.host

os-integration-test/src/test/groovy/org/hidetake/groovy/ssh/test/os/UserAuthenticationSpec.groovy

@@ -37,23 +37,7 @@ class UserAuthenticationSpec extends Specification {
         ssh.settings.extensions.add(UserManagementExtension)
     }
 
-    def 'should authenticate by ECDSA key'() {
-        given:
-        def x = randomInt()
-        def y = randomInt()
-
-        when:
-        def r = ssh.run {
-            session(ssh.remotes.DefaultWithECDSAKey) {
-                execute "expr $x + $y"
-            }
-        } as int
-
-        then:
-        r == (x + y)
-    }
-
-    def 'should authenticate by pass-phrased RSA key'() {
+    def 'should authenticate by pass-phrased key'() {
         given:
         def x = randomInt()
         def y = randomInt()