fix: not worked error checks

anynines · Oct 18, 2023 · 7ebe0bf · 7ebe0bf
1 parent 55c1b33
commit 7ebe0bf
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 16 deletions.
diff --git a/src/jetstream/errorz/errorz.go b/src/jetstream/errorz/errorz.go
@@ -2,7 +2,14 @@ package errorz
 
 import "errors"
 
-var ErrDialTcp = errors.New("dial tcp")
-var ErrNoSuchTable = errors.New("no such table")
-var ErrNoDatabaseVersionsFound = errors.New("no database versions found")
-var Err509Certificate = errors.New("x509: certificate")
+const (
+	ERR_DIAL_TCP                   = "dial"
+	ERR_NO_DATABASE_VERSIONS_FOUND = "no database versions found"
+	ERR_NO_SUCH_TABLE              = "no such table"
+	ERR_X509_CERTIFICATE           = "x509: certificate"
+)
+
+var ErrDialTcp = errors.New(ERR_DIAL_TCP)
+var ErrNoDatabaseVersionsFound = errors.New(ERR_NO_DATABASE_VERSIONS_FOUND)
+var ErrNoSuchTable = errors.New(ERR_NO_SUCH_TABLE)
+var Err509Certificate = errors.New(ERR_X509_CERTIFICATE)
diff --git a/src/jetstream/middleware.go b/src/jetstream/middleware.go
@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"net"
 	"net/http"
 	"os"
 	"strings"
@@ -41,12 +42,15 @@ const APIKeyAuthScheme = "Bearer"
 func handleSessionError(config api.PortalConfig, c echo.Context, err error, doNotLog bool, msg string) error {
 	log.Debug("handleSessionError")
 
-	if errors.Is(err, errorz.ErrDialTcp) {
-		return api.NewHTTPShadowError(
-			http.StatusServiceUnavailable,
-			"Service is currently unavailable",
-			"Service is currently unavailable: %v", err,
-		)
+	var netOpErr *net.OpError
+	if errors.As(err, &netOpErr) {
+		if netOpErr.Op == errorz.ERR_DIAL_TCP {
+			return api.NewHTTPShadowError(
+				http.StatusServiceUnavailable,
+				"Service is currently unavailable",
+				"Service is currently unavailable: %v", err,
+			)
+		}
 	}
 
 	if doNotLog {

diff --git a/src/jetstream/plugins/kubernetes/main.go b/src/jetstream/plugins/kubernetes/main.go
@@ -7,12 +7,12 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 
 	"errors"
 
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
-
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
 	"github.com/labstack/echo/v4"
 	log "github.com/sirupsen/logrus"
 
@@ -289,7 +289,7 @@ func (c *KubernetesSpecification) RequiresCert(ec echo.Context) error {
 		Message  string
 	}
 	if err != nil {
-		if errors.Is(err, errorz.Err509Certificate) {
+		if strings.Contains(err.Error(), errorz.ERR_X509_CERTIFICATE) {
 			response.Status = http.StatusOK
 			response.Required = true
 		} else {

diff --git a/src/jetstream/setup_console.go b/src/jetstream/setup_console.go
@@ -7,8 +7,7 @@ import (
 	"net/url"
 	"regexp"
 	"strconv"
-
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
+	"strings"
 
 	"github.com/govau/cf-common/env"
 	"github.com/labstack/echo/v4"
@@ -18,6 +17,7 @@ import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/api/config"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/errorz"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/console_config"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/localusers"
 )
@@ -94,7 +94,7 @@ func (p *portalProxy) setupGetAvailableScopes(c echo.Context) error {
 		errInfo, ok := err.(api.ErrHTTPRequest)
 		if ok {
 			if errInfo.Status == 0 {
-				if errors.Is(errInfo, errorz.Err509Certificate) {
+				if strings.Contains(errInfo.Error(), errorz.ERR_X509_CERTIFICATE) {
 					return api.NewHTTPShadowError(
 						http.StatusBadRequest,
 						"Could not connect to the UAA - Certificate error - check Skip SSL validation setting",