Merge pull request #49 from dokku/master

Release 0.9.0

Author: josegonzalez

.circleci/config.yml

@@ -1,8 +1,7 @@
 version: 2
 jobs:
   build:
-    machine:
-      docker_layer_caching: true
+    machine: {}
     steps:
       - checkout
       - run:

CHANGELOG.md

@@ -10,6 +10,11 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.9.0] - 2019-09-20
+
+### Added
+- @josegonzalez Add ability to list a single name's keys
+
 ## [0.8.0] - 2019-08-10
 ### Fixed
 - @fruitl00p delete_user is now portable
@@ -113,7 +118,8 @@ All notable changes to this project will be documented in this file.
 - @michaelshobbs update build image in README
 - @jvanbaarsen Only add SSH key if it doesn't already exists
 
-[unreleased]: https://github.com/dokku/sshcommand/compare/v0.8.0...HEAD
+[unreleased]: https://github.com/dokku/sshcommand/compare/v0.9.0...HEAD
+[0.9.0]: https://github.com/dokku/sshcommand/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/dokku/sshcommand/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/dokku/sshcommand/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/dokku/sshcommand/compare/v0.5.0...v0.6.0

Makefile

@@ -6,7 +6,7 @@ MAINTAINER_NAME = Jose Diaz-Gonzalez
 REPOSITORY = sshcommand
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-BASE_VERSION ?= 0.8.0
+BASE_VERSION ?= 0.9.0
 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY)
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
 

README.md

@@ -20,7 +20,7 @@ ssh ls@server <your-args>
 sshcommand create     <USER> <COMMAND>          # Creates a user forced to run command when SSH connects
 sshcommand acl-add    <USER> <NAME> <KEY_FILE>  # Adds named SSH key to user from STDIN or argument
 sshcommand acl-remove <USER> <NAME>             # Removes SSH key by name
-sshcommand list       <USER>                    # Lists SSH user keys by name
+sshcommand list       <USER> [<NAME>]           # Lists SSH keys by user and an optional name
 sshcommand help       <COMMAND>                 # Shows help information
 sshcommand version                              # Shows version
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sshcommand",
-  "version": "0.0.1",
+  "version": "0.9.0",
   "description": "Turn SSH into a thin client specifically for your app",
   "global": "true",
   "install": "cp sshcommand /usr/local/bin && chmod +x /usr/local/bin/sshcommand",

sshcommand

@@ -174,17 +174,22 @@ sshcommand-acl-remove() {
 }
 
 sshcommand-list() {
-  declare desc="Lists SSH user keys by name"
-  declare userhome USER="$1"
+  declare desc="Lists SSH keys by user and an optional name"
+  declare userhome USER="$1" NAME="$2"
   [[ -z "$USER" ]] && log-fail "Usage: sshcommand list" "$(fn-args "sshcommand-list")"
 
   getent passwd "$USER" > /dev/null || log-fail "\"$USER\" is not a user on this system"
   userhome=$(sh -c "echo ~$USER")
   [[ -e "$userhome/.ssh/authorized_keys" ]] || log-fail "authorized_keys not found for $USER"
   [[ -s "$userhome/.ssh/authorized_keys" ]] || log-fail "authorized_keys is empty for $USER"
-  sed --silent --regexp-extended \
-    's/^command="FINGERPRINT=(\S+) NAME=(\\"|)(.*)\2 `.*",(\S+).*/\1 NAME="\3" SSHCOMMAND_ALLOWED_KEYS="\4"/p' \
-    "$userhome/.ssh/authorized_keys"
+  OUTPUT="$(sed --silent --regexp-extended \
+        's/^command="FINGERPRINT=(\S+) NAME=(\\"|)(.*)\2 `.*",(\S+).*/\1 NAME="\3" SSHCOMMAND_ALLOWED_KEYS="\4"/p' \
+        "$userhome/.ssh/authorized_keys")"
+  if [[ -n "$NAME" ]]; then
+    echo "$OUTPUT" | grep "NAME=\"$NAME\""
+  else
+    echo "$OUTPUT"
+  fi
 }
 
 sshcommand-help() {

tests/unit/core.bats

@@ -175,6 +175,12 @@ check_custom_allowed_keys() {
   echo "output: "$output
   echo "status: "$status
   assert_failure
+
+  cp tests/unit/fixtures/authorized_keys/input_variants /home/${TEST_USER}/.ssh/authorized_keys
+  run sshcommand list ${TEST_USER} md5
+  assert_equal \
+    "$(cat tests/unit/fixtures/authorized_keys/sshcommand_list_expected_output | head -n1)" \
+    "$(sshcommand list ${TEST_USER} md5)"
 }
 
 @test "(core) sshcommand list (authorized_keys format variants)" {