From 9767b908265d83a7832952b0185bb178830c6479 Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Wed, 6 Jan 2016 14:36:07 +0100
Subject: [PATCH] Make sure we ignore hidden files in the SSL cert check

OSX creates hidden files: `./._server.key` and `./._server.crt`. The Dokku cert
plugin is choking on those files. We should probably just ignore them, and go on
with our lives

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
---
 plugins/certs/commands        |   4 ++--
 tests/unit/10_certs.bats      |   7 +++++++
 tests/unit/osx_ssl_tarred.tar | Bin 0 -> 7680 bytes
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/osx_ssl_tarred.tar

diff --git a/plugins/certs/commands b/plugins/certs/commands
index cd5685792..82f62ccb4 100755
--- a/plugins/certs/commands
+++ b/plugins/certs/commands
@@ -39,7 +39,7 @@ certs_set() {
     cd $TEMP_DIR
     tar xvf - <&0
 
-    CRT_FILE_SEARCH=$(find . -type f -name "*.crt")
+    CRT_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name "*.crt")
     CRT_FILE_COUNT=$(printf "%s" "$CRT_FILE_SEARCH" | grep -c '^')
     if [[ $CRT_FILE_COUNT -lt 1 ]]; then
       dokku_log_fail "Tar archive is missing .crt file"
@@ -49,7 +49,7 @@ certs_set() {
       CRT_FILE=$CRT_FILE_SEARCH
     fi
 
-    KEY_FILE_SEARCH=$(find . -type f -name "*.key")
+    KEY_FILE_SEARCH=$(find . -not -path '*/\.*' -type f -name "*.key")
     KEY_FILE_COUNT=$(printf "%s" "$KEY_FILE_SEARCH" | grep -c '^')
     if [[ $KEY_FILE_COUNT -lt 1 ]]; then
       dokku_log_fail "Tar archive is missing .key file"
diff --git a/tests/unit/10_certs.bats b/tests/unit/10_certs.bats
index f127a66f1..a827ad6c9 100644
--- a/tests/unit/10_certs.bats
+++ b/tests/unit/10_certs.bats
@@ -38,6 +38,13 @@ teardown() {
   assert_success
 }
 
+@test "(certs) certs:add < tar should ignore OSX hidden files" {
+  run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/osx_ssl_tarred.tar"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+}
+
 @test "(certs) certs:info" {
   run bash -c "dokku certs:add $TEST_APP < $BATS_TEST_DIRNAME/server_ssl.tar && dokku certs:info $TEST_APP"
   echo "output: "$output
diff --git a/tests/unit/osx_ssl_tarred.tar b/tests/unit/osx_ssl_tarred.tar
new file mode 100644
index 0000000000000000000000000000000000000000..0d72adc26ecf2ebb200e36b987f4d8de0e81fc9e
GIT binary patch
literal 7680
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
D{<fp&

literal 0
HcmV?d00001