Enhance error output and codes

Return 400 on user errors when adding certs
Enhance 'port in use' error output

Resolves #34 #36 #37

Author: glinton

api/api.go

@@ -58,7 +58,6 @@ var (
 	BodyReadFail   = errors.New("Body Read Failed")
 	NoServerError  = errors.New("No Server Found")
 	NoServiceError = errors.New("No Service Found")
-	BadListenAddr  = errors.New("Port Already In Use")
 )
 
 type (

api/certificate.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"net/http"
+	"strings"
 
 	"github.com/nanopack/portal/cluster"
 	"github.com/nanopack/portal/core"
@@ -19,6 +20,14 @@ func postCert(rw http.ResponseWriter, req *http.Request) {
 	// save to cluster
 	err = cluster.SetCert(cert)
 	if err != nil {
+		if strings.Contains(err.Error(), "tls: failed to find any PEM data in certificate input") {
+			writeError(rw, req, err, http.StatusBadRequest)
+			return
+		}
+		if strings.Contains(err.Error(), "asn1: syntax error: PrintableString contains invalid character") {
+			writeError(rw, req, err, http.StatusBadRequest)
+			return
+		}
 		writeError(rw, req, err, http.StatusInternalServerError)
 		return
 	}

api/service.go

@@ -70,10 +70,10 @@ func checkPort(svc core.Service) error {
 	// assume tls/http listening same ip. if listen on all interfaces, break on ports
 	if svc.Port == hPort || svc.Port == tPort || svc.Port == aPort {
 		if listenHttp[0] == "" || listenHttp[0] == "0.0.0.0" {
-			return BadListenAddr
+			return fmt.Errorf("Socket in use: '%s:%d'", listenHttp[0], svc.Port)
 		}
 		if svc.Host == listenHttp[0] || svc.Host == listenTls[0] || svc.Host == config.ApiHost {
-			return BadListenAddr
+			return fmt.Errorf("Socket in use: '%s:%d'", svc.Host, svc.Port)
 		}
 	}
 

scripts/build.sh

@@ -21,8 +21,8 @@ getCurrTag() {
 
 # build portal
 echo "Building portal..."
-# export GOROOT="/usr/local/go-1.7.5/"
-# export PATH=/usr/local/go-1.7.5/bin:$PATH
+# export GOROOT="/usr/local/go-1.7.6"
+# export PATH=/usr/local/go-1.7.6/bin:$PATH
 
 # should be built with go1.7.x until tls regression is resolved. also https://github.com/golang/go/issues/21133
 gox -ldflags="-s -X github.com/nanopack/portal/commands.tag=$(getCurrTag)

vendor/vendor.json

@@ -159,10 +159,10 @@
 			"revisionTime": "2017-03-27T21:44:30Z"
 		},
 		{
-			"checksumSHA1": "b1ptZ969lQ2ZxRIZhP12pmY+P8w=",
+			"checksumSHA1": "B0xFOAo+jHUmUX7nmdPCFClwxJ0=",
 			"path": "github.com/nanobox-io/nanobox-router",
-			"revision": "5d5e7a6d0cae8d846c275c49f16398135e9112dd",
-			"revisionTime": "2017-09-08T15:51:10Z"
+			"revision": "8cb764136ffa4b96c430a6f15ebd362ac0cfa26b",
+			"revisionTime": "2017-09-08T21:39:15Z"
 		},
 		{
 			"checksumSHA1": "65+hx0QlLzpWe5pnjAzteKBnC10=",