Merge branch 'bezda-master'

Author: ThomDietrich

autossh/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Security addition: Recommend an extended public key setup on the remote server that disallows anything other than port forwarding.
   **Existing users** should consider implementing this in their setup. Thanks to @karlbeecken (https://github.com/ThomDietrich/home-assistant-addons/issues/26, https://github.com/ThomDietrich/home-assistant-addons/pull/31)
+- Add an option to skip remote host checks
 
 ## 1.3.4
 

autossh/DOCS.md

@@ -175,3 +175,7 @@ This is optional and for testing purposes a verbose output enabled by `-v` can b
 
 A key pair is generated when the container is first initialized in your environment.
 Set this to `true` if you even need to urge to regenerate a key.
+
+### Option: `skip_remote_host_checks`
+
+Set this to `true` to disable remote host checks. This option is useful for SSH servers that rate-limit incoming connections.

autossh/config.yaml

@@ -1,5 +1,5 @@
 name: SSH Tunnel & Forwarding
-version: 1.3.4
+version: 1.4.0
 slug: autossh
 description: >-
   Permanent HA forwarding and domain linking through an SSH tunnel
@@ -25,6 +25,7 @@ options:
   remote_port: 8123
   other_ssh_options: '-v -N'
   force_keygen: false
+  skip_remote_host_checks: false
 schema:
   hostname: str
   ssh_port: int
@@ -37,3 +38,4 @@ schema:
     - str
   other_ssh_options: str
   force_keygen: bool
+  skip_remote_host_checks: bool

autossh/run.sh

@@ -31,7 +31,8 @@ fi
 
 OTHER_SSH_OPTIONS=$(jq --raw-output ".other_ssh_options" $CONFIG_PATH)
 FORCE_GENERATION=$(jq --raw-output ".force_keygen" $CONFIG_PATH)
-AUTHORIZED_KEYS_RESTRICTION="command=\"\",restrict,port-forwarding,permitopen=\"$FORWARD_REMOTE_IP_ADDRESS:$FORWARD_REMOTE_PORT\""
+AUTHORIZED_KEYS_RESTRICTION="command=\"\",restrict,port-forwarding,permitopen=\"${FORWARD_REMOTE_IP_ADDRESS}:${FORWARD_REMOTE_PORT}\""
+SKIP_REMOTE_HOST_CHECKS=$(jq --raw-output ".skip_remote_host_checks" $CONFIG_PATH)
 
 #
 
@@ -102,20 +103,25 @@ TEST_COMMAND="/usr/bin/ssh "\
 "${USERNAME}@${HOSTNAME} "\
 "2>&1 || true"
 
-echo ""
-if eval "${TEST_COMMAND}" | grep -q "Permission denied"; then
-  bashio::log.info "Testing SSH service on '${HOSTNAME}:${SSH_PORT}'... SSH service reachable on remote server"
+if [ "$SKIP_REMOTE_HOST_CHECKS" != "true" ]; then
+  echo ""
+  if eval "${TEST_COMMAND}" | grep -q "Permission denied"; then
+    bashio::log.info "Testing SSH service on '${HOSTNAME}:${SSH_PORT}'... SSH service reachable on remote server"
+  else
+    eval "${TEST_COMMAND}"
+    bashio::log.error "Testing SSH service on '${HOSTNAME}:${SSH_PORT}'... Failed to reach the SSH service on the remote server. "\
+      "Please check your config and consult the addon documentation."
+    exit 1
+  fi
+
+  echo ""
+  bashio::log.info "Remote server host keys:"
+  ssh-keyscan -p $SSH_PORT $HOSTNAME || true
 else
-  eval "${TEST_COMMAND}"
-  bashio::log.error "Testing SSH service on '${HOSTNAME}:${SSH_PORT}'... Failed to reach the SSH service on the remote server. "\
-    "Please check your config and consult the addon documentation."
-  exit 1
+  echo ""
+  bashio::log.info "Skipped Remote host checks"
 fi
 
-echo ""
-bashio::log.info "Remote server host keys:"
-ssh-keyscan -p $SSH_PORT $HOSTNAME || true
-
 COMMAND="/usr/bin/autossh "\
 "-M 0 "\
 "-o ServerAliveInterval=30 "\