ci: allow local multi build

.github/composite/setup_entrypoints/action.yaml

@@ -15,8 +15,8 @@ inputs:
   sshnpd_atsign:
     description: sshnpd atsign
     required: true
-  sshrvd_atsign:
-    description: sshrvd atsign
+  srvd_atsign:
+    description: srvd atsign
     required: true
   devicename:
     description: Unique sshnp devicename
@@ -52,7 +52,7 @@ runs:
             esac
             ;;
         esac
-        ./setup-sshnp-entrypoint.sh ${{ inputs.devicename }} ${{ inputs.sshnp_atsign }} ${{ inputs.sshnpd_atsign }} ${{ inputs.sshrvd_atsign }} "$entrypoint_filename" "$args ${{ inputs.args }}"
+        ./setup-sshnp-entrypoint.sh ${{ inputs.devicename }} ${{ inputs.sshnp_atsign }} ${{ inputs.sshnpd_atsign }} ${{ inputs.srvd_atsign }} "$entrypoint_filename" "$args ${{ inputs.args }}"
 
     - name: Setup NPD entrypoint
       shell: bash
@@ -73,4 +73,4 @@ runs:
       shell: bash
       working-directory: tests/end2end_tests/contexts/_init_
       run: |
-        ./setup-sshrvd-entrypoint.sh ${{ inputs.sshrvd_atsign }} "sshrvd_entrypoint.sh"
+        ./setup-srvd-entrypoint.sh ${{ inputs.srvd_atsign }} "srvd_entrypoint.sh"

.github/workflows/end2end_tests.yaml

@@ -16,7 +16,7 @@ on:
 env:
   SSHNP_ATSIGN: "@8incanteater"
   SSHNPD_ATSIGN: "@8052simple"
-  SSHRVD_ATSIGN: "@8485wealthy51"
+  SRVD_ATSIGN: "@8485wealthy51"
 
   PROD_AM_RVD_ATSIGN: "@rv_am"
   PROD_AP_RVD_ATSIGN: "@rv_ap"
@@ -87,15 +87,15 @@ jobs:
           sshnp_atsign: ${{ env.SSHNP_ATSIGN }}
           sshnpd: ${{ matrix.npd }}
           sshnpd_atsign: ${{ env.SSHNPD_ATSIGN }}
-          sshrvd_atsign: ${{ env[env.PROD_RVD_ATSIGN] }}
+          srvd_atsign: ${{ env[env.PROD_RVD_ATSIGN] }}
           devicename: ${{ env.DEVICENAME }}
 
       - name: Ensure entrypoints exist
         working-directory: tests/end2end_tests/contexts
         run: |
           cat sshnp/entrypoint.sh
           cat sshnpd/entrypoint.sh
-          cat sshrvd/entrypoint.sh
+          cat srvd/entrypoint.sh
 
       - name: Create docker-compose.yaml
         working-directory: tests/end2end_tests/tests
@@ -247,7 +247,7 @@ jobs:
           sshnp_atsign: ${{ env.SSHNP_ATSIGN }}
           sshnpd: ${{ matrix.npd }}
           sshnpd_atsign: ${{ env.SSHNPD_ATSIGN }}
-          sshrvd_atsign: ${{ env[env.PROD_RVD_ATSIGN] }}
+          srvd_atsign: ${{ env[env.PROD_RVD_ATSIGN] }}
           devicename: ${{ env.DEVICENAME }}
           args: "-P 55"
 
@@ -256,7 +256,7 @@ jobs:
         run: |
           cat sshnp/entrypoint.sh
           cat sshnpd/entrypoint.sh
-          cat sshrvd/entrypoint.sh
+          cat srvd/entrypoint.sh
 
       - name: Create docker-compose.yaml
         working-directory: tests/end2end_tests/tests

.github/workflows/multibuild.yaml

@@ -55,11 +55,11 @@ jobs:
       - if: ${{ matrix.os != 'windows-latest' }}
         run: dart compile exe bin/sshnpd.dart -v -o sshnp/sshnpd${{ matrix.ext }}
       - if: ${{ matrix.os != 'windows-latest' }}
-        run: dart compile exe bin/sshrv.dart -v -o sshnp/sshrv${{ matrix.ext }}
+        run: dart compile exe bin/srv.dart -v -o sshnp/srv${{ matrix.ext }}
       - if: ${{ matrix.os != 'windows-latest' }}
-        run: dart compile exe bin/sshrvd.dart -v -o sshnp/sshrvd${{ matrix.ext }}
+        run: dart compile exe bin/srvd.dart -v -o sshnp/srvd${{ matrix.ext }}
       - if: ${{ matrix.os != 'windows-latest' }}
-        run: dart compile exe bin/sshrvd.dart -D ENABLE_SNOOP=true -v -o sshnp/debug/sshrvd${{ matrix.ext }}
+        run: dart compile exe bin/srvd.dart -D ENABLE_SNOOP=true -v -o sshnp/debug/srvd${{ matrix.ext }}
       - run: cp -r bundles/core/* sshnp/
       - run: cp -r bundles/${{ matrix.bundle }}/* sshnp/
       - run: cp LICENSE sshnp
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./packages/dart/sshnoports
+        working-directory: ./packages/dart
     strategy:
       matrix:
         platform: [linux/arm/v7, linux/arm64, linux/riscv64]
@@ -92,14 +92,14 @@ jobs:
       - uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
       - uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
       - run: |
-          docker buildx build -t atsigncompany/sshnptarball -f tools/Dockerfile.package \
+          docker buildx build -t atsigncompany/sshnptarball -f sshnoports/tools/Dockerfile.package \
           --platform ${{ matrix.platform }} -o type=tar,dest=bins.tar .
       - run: mkdir tarballs
       - run: tar -xvf bins.tar -C tarballs
       - uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
         with:
           name: ${{ matrix.output-name }}-upload
-          path: ./packages/dart/sshnoports/tarballs/${{ matrix.output-name }}.tgz
+          path: ./packages/dart/tarballs/${{ matrix.output-name }}.tgz
           if-no-files-found: error
 
   notify_on_completion:

.github/workflows/prod_tests.yaml

@@ -14,10 +14,10 @@ permissions:
 env:
   SSHNP_ATSIGN: "@8incanteater"
   SSHNPD_ATSIGN: "@8052simple"
-  SSHRVD_ATSIGN: "@8485wealthy51"
-  SSHRVD_AM_ATSIGN: "@rv_am"
-  SSHRVD_AP_ATSIGN: "@rv_ap"
-  SSHRVD_EU_ATSIGN: "@rv_eu"
+  SRVD_ATSIGN: "@8485wealthy51"
+  SRVD_AM_ATSIGN: "@rv_am"
+  SRVD_AP_ATSIGN: "@rv_ap"
+  SRVD_EU_ATSIGN: "@rv_eu"
   DOCKER_COMPOSE_BUILD_CMD: "docker compose build"
   DOCKER_COMPOSE_UP_CMD: "docker compose up --abort-on-container-exit"
 
@@ -28,10 +28,10 @@ jobs:
       fail-fast: false # if one job fails, do not fail the others
       matrix:
         rvd:
-          # - ${{ env.SSHRVD_ATSIGN }}
-          # - ${{ env.SSHRVD_AM_ATSIGN }}
-          # - ${{ env.SSHRVD_AP_ATSIGN }}
-          # - ${{ env.SSHRVD_EU_ATSIGN }}
+          # - ${{ env.SRVD_ATSIGN }}
+          # - ${{ env.SRVD_AM_ATSIGN }}
+          # - ${{ env.SRVD_AP_ATSIGN }}
+          # - ${{ env.SRVD_EU_ATSIGN }}
           - "@8485wealthy51"
           - "@rv_am"
           - "@rv_ap"
@@ -52,8 +52,8 @@ jobs:
           SSHNPD_ATKEYS="$(tr '[:lower:]' '[:upper:]' <<< '${{ env.SSHNPD_ATSIGN }}')"
           echo "SSHNPD_ATKEYS=ATKEYS_${SSHNPD_ATKEYS:1}" >> $GITHUB_ENV
 
-          SSHRVD_ATKEYS="$(tr '[:lower:]' '[:upper:]' <<< '${{ env.SSHRVD_ATSIGN }}')"
-          echo "SSHRVD_ATKEYS=ATKEYS_${SSHRVD_ATKEYS:1}" >> $GITHUB_ENV
+          SRVD_ATKEYS="$(tr '[:lower:]' '[:upper:]' <<< '${{ env.SRVD_ATSIGN }}')"
+          echo "SRVD_ATKEYS=ATKEYS_${SRVD_ATKEYS:1}" >> $GITHUB_ENV
 
       - name: Setup NP/NPD keys
         working-directory: tests/end2end_tests/contexts
@@ -84,18 +84,18 @@ jobs:
             sshnpd_entrypoint.sh
 
       - name: Set up RVD keys and entrypoint
-        if: matrix.rvd == env.SSHRVD_ATSIGN
+        if: matrix.rvd == env.SRVD_ATSIGN
         working-directory: tests/end2end_tests
         run: |
           # setup keys
-          echo "${{ secrets[env.SSHRVD_ATKEYS] }}" > contexts/sshrvd/.atsign/keys/${{ env.SSHRVD_ATSIGN }}_key.atKeys
+          echo "${{ secrets[env.SRVD_ATKEYS] }}" > contexts/srvd/.atsign/keys/${{ env.SRVD_ATSIGN }}_key.atKeys
 
-          # set up sshrvd entrypoint
+          # set up srvd entrypoint
           cd contexts/_init_
-          ./setup-sshrvd-entrypoint.sh \
+          ./setup-srvd-entrypoint.sh \
             ${{ matrix.rvd }} \
-            sshrvd_entrypoint.sh
-          cd ../sshrvd
+            srvd_entrypoint.sh
+          cd ../srvd
           cat entrypoint.sh
 
       - name: Ensure entrypoints exist
@@ -118,25 +118,25 @@ jobs:
           echo "        condition: service_started" >> docker-compose.yaml
           echo "      container-sshnpd:" >> docker-compose.yaml
           echo "        condition: service_healthy" >> docker-compose.yaml
-          if [ "${{ matrix.rvd }}" == "${{ env.SSHRVD_ATSIGN }}" ]; then
-            echo "      container-sshrvd:" >> docker-compose.yaml
+          if [ "${{ matrix.rvd }}" == "${{ env.SRVD_ATSIGN }}" ]; then
+            echo "      container-srvd:" >> docker-compose.yaml
             echo "        condition: service_healthy" >> docker-compose.yaml
           fi
           cat service-container-sshnpd.yaml >> docker-compose.yaml
           echo "    image: atsigncompany/sshnp-e2e-runtime:latest" >> docker-compose.yaml
           echo "    depends_on:" >> docker-compose.yaml
           echo "      image-runtime-release:" >> docker-compose.yaml
           echo "        condition: service_started" >> docker-compose.yaml
-          if [ "${{ matrix.rvd }}" == "${{ env.SSHRVD_ATSIGN }}" ]; then
-            echo "      container-sshrvd:" >> docker-compose.yaml
+          if [ "${{ matrix.rvd }}" == "${{ env.SRVD_ATSIGN }}" ]; then
+            echo "      container-srvd:" >> docker-compose.yaml
             echo "        condition: service_healthy" >> docker-compose.yaml
           fi
 
       - name: Add RVD service to docker-compose.yaml
-        if: matrix.rvd == env.SSHRVD_ATSIGN
+        if: matrix.rvd == env.SRVD_ATSIGN
         working-directory: tests/end2end_tests/tests
         run: |
-          cat service-container-sshrvd.yaml >> docker-compose.yaml
+          cat service-container-srvd.yaml >> docker-compose.yaml
           echo "    image: atsigncompany/sshnp-e2e-runtime:latest" >> docker-compose.yaml
           echo "    depends_on:" >> docker-compose.yaml
           echo "      image-runtime-release:" >> docker-compose.yaml

examples/automations/python/sshnoports_automation_python/sshnp_client.py

@@ -252,7 +252,7 @@ def download_package_source(self, source: PackageSource) -> str:
                 f"dart compile exe {target_path}/bin/sshnpd.dart -o {target_path}/sshnpd"
             )
             self.client.run_command(
-                f"dart compile exe {target_path}/bin/sshrv.dart -o {target_path}/sshrv"
+                f"dart compile exe {target_path}/bin/srv.dart -o {target_path}/srv"
             )
             self.client.run_command(
                 f"dart compile exe {target_path}/bin/activate_cli.dart -o {target_path}/at_activate"
@@ -280,7 +280,7 @@ def setup_main_binaries(self, source: str) -> None:
         if not self.is_connected():
             raise Exception("SSHNPClient not connected to device")
 
-        binaries = "{" + ",".join(["sshnpd", "sshrv", "at_activate"]) + "}"
+        binaries = "{" + ",".join(["sshnpd", "srv", "at_activate"]) + "}"
         self.client.exec_command(f"cp -f {source}/{binaries} ~/.local/bin/")
 
     def update_sshnpd(self, source: PackageSource) -> None:

packages/dart/noports_core/lib/src/common/at_ssh_key_util/local_ssh_key_util.dart

@@ -129,7 +129,8 @@ class LocalSshKeyUtil implements AtSshKeyUtil {
   }) async {
     // Check to see if the ssh public key is
     // supported keys by the dartssh2 package
-    if (!sshPublicKey.startsWith(RegExp(r'^(ecdsa-sha2-nistp)|(rsa-sha2-)|(ssh-rsa)|(ssh-ed25519)|(ecdsa-sha2-nistp)'))) {
+    if (!sshPublicKey.startsWith(RegExp(
+        r'^(ecdsa-sha2-nistp)|(rsa-sha2-)|(ssh-rsa)|(ssh-ed25519)|(ecdsa-sha2-nistp)'))) {
       throw ('$sshPublicKey does not look like a public key');
     }
 

packages/dart/noports_core/lib/src/common/default_args.dart

@@ -1,14 +1,14 @@
 import 'package:noports_core/src/common/io_types.dart';
 import 'package:noports_core/src/common/types.dart';
-import 'package:noports_core/sshrv.dart';
+import 'package:noports_core/srv.dart';
 
 class DefaultArgs {
   static const String namespace = 'sshnp';
   static const SupportedSshAlgorithm sshAlgorithm =
       SupportedSshAlgorithm.ed25519;
   static const bool verbose = false;
   static const String rootDomain = 'root.atsign.org';
-  static const SshrvGenerator sshrvGenerator = Sshrv.exec;
+  static const SrvGenerator srvGenerator = Srv.exec;
   static const int localSshdPort = 22;
   static const int remoteSshdPort = 22;
 
@@ -18,6 +18,10 @@ class DefaultArgs {
   static const bool addForwardsToTunnel = false;
   static final bool allowLocalFileSystem =
       Platform.isLinux || Platform.isMacOS || Platform.isWindows;
+  static const bool authenticateClientToRvd = false;
+  static const bool authenticateDeviceToRvd = false;
+  static const bool encryptRvdTraffic = false;
+  static const bool discoverDaemonFeatures = false;
 }
 
 class DefaultSshnpArgs {

packages/dart/noports_core/lib/src/common/features.dart

@@ -0,0 +1,12 @@
+/// Features which can be supported by the NoPorts Daemon
+enum DaemonFeatures {
+  /// daemon will accept public keys sent by clients (i.e. daemon has been
+  /// started with the `--sshpublickey` or `-s` flag)
+  acceptsPublicKeys,
+
+  /// authenticate when connecting to the Socket Rendezvous (sr)
+  srAuth,
+
+  /// End-to-end encrypt traffic sent via the SocketRendezvous (sr)
+  srE2ee,
+}

packages/dart/noports_core/lib/src/common/mixins/at_client_bindings.dart

@@ -3,19 +3,26 @@ import 'package:at_utils/at_utils.dart';
 
 mixin AtClientBindings {
   AtClient get atClient;
+
   AtSignLogger get logger;
 
   Future<void> notify(
     AtKey atKey,
-    String value,
-  ) async {
-    await atClient.notificationService
-        .notify(NotificationParams.forUpdate(atKey, value: value),
-            onSuccess: (NotificationResult notification) {
-      logger.info('SUCCESS:$notification with key: ${atKey.toString()}');
-    }, onError: (notification) {
-      logger.info('ERROR:$notification');
-    });
+    String value, {
+    required bool checkForFinalDeliveryStatus,
+    required bool waitForFinalDeliveryStatus,
+  }) async {
+    await atClient.notificationService.notify(
+      NotificationParams.forUpdate(atKey, value: value),
+      checkForFinalDeliveryStatus: checkForFinalDeliveryStatus,
+      waitForFinalDeliveryStatus: waitForFinalDeliveryStatus,
+      onSuccess: (NotificationResult notification) {
+        logger.info('SUCCESS:$notification with key: ${atKey.toString()}');
+      },
+      onError: (notification) {
+        logger.info('ERROR:$notification');
+      },
+    );
   }
 
   Stream<AtNotification> subscribe(

packages/dart/noports_core/lib/src/common/types.dart

@@ -1,12 +1,21 @@
-import 'package:noports_core/sshrv.dart';
-
-typedef SshrvGenerator<T> = Sshrv<T> Function(String, int, {int localSshdPort});
+import 'package:noports_core/srv.dart';
+
+typedef SrvGenerator<T> = Srv<T> Function(
+  String,
+  int, {
+  required int localPort,
+  required bool bindLocalPort,
+  String? rvdAuthString,
+  String? sessionAESKeyString,
+  String? sessionIVString,
+});
 
 enum SupportedSshClient {
   openssh(cliArg: 'openssh'),
   dart(cliArg: 'dart');
 
   final String _cliArg;
+
   const SupportedSshClient({required String cliArg}) : _cliArg = cliArg;
 
   factory SupportedSshClient.fromString(String cliArg) {
@@ -25,6 +34,7 @@ enum SupportedSshAlgorithm {
   rsa(cliArg: 'ssh-rsa');
 
   final String _cliArg;
+
   const SupportedSshAlgorithm({required String cliArg}) : _cliArg = cliArg;
 
   factory SupportedSshAlgorithm.fromString(String cliArg) {