fix: check certificate file exist. (#209)

* fix: check certificate file exist. * fix: certificate key path error
appleboy · Apr 6, 2017 · 04caa04 · 04caa04
1 parent 908c221
commit 04caa04
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/gorush/notification.go b/gorush/notification.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"os"
 	"path/filepath"
 	"time"
 
@@ -142,6 +143,11 @@ func CheckPushConf() error {
 		if PushConf.Ios.KeyPath == "" {
 			return errors.New("Missing iOS certificate path")
 		}
+
+		// check certificate file exist
+		if _, err := os.Stat(PushConf.Ios.KeyPath); os.IsNotExist(err) {
+			return errors.New("certificate file does not exist")
+		}
 	}
 
 	if PushConf.Android.Enabled {

diff --git a/gorush/notification_test.go b/gorush/notification_test.go
@@ -28,11 +28,17 @@ func TestMissingIOSCertificate(t *testing.T) {
 
 	PushConf.Ios.Enabled = true
 	PushConf.Ios.KeyPath = ""
-
 	err := CheckPushConf()
 
 	assert.Error(t, err)
 	assert.Equal(t, "Missing iOS certificate path", err.Error())
+
+	PushConf.Ios.KeyPath = "test.pem"
+	err = CheckPushConf()
+
+	assert.Error(t, err)
+	assert.Equal(t, "certificate file does not exist", err.Error())
+
 }
 
 func TestMissingAndroidAPIKey(t *testing.T) {
@@ -54,7 +60,7 @@ func TestCorrectConf(t *testing.T) {
 	PushConf.Android.APIKey = "xxxxx"
 
 	PushConf.Ios.Enabled = true
-	PushConf.Ios.KeyPath = "xxxxx"
+	PushConf.Ios.KeyPath = "../certificate/certificate-valid.pem"
 
 	err := CheckPushConf()