resolved the merge conflicts and removed the fix for third party loading a plugin error

Author: candysmurf

snaptel/common.go

@@ -23,6 +23,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"strings"
 
 	"golang.org/x/crypto/ssh/terminal"
 
@@ -129,8 +130,6 @@ func getErrorDetail(err error, ctx *cli.Context) error {
 		return newUsageError(fmt.Sprintf("%v", err.(*plugins.GetPluginConfigItemBadRequest).Payload.ErrorMessage), ctx)
 	case *plugins.GetPluginConfigItemUnauthorized:
 		return newUsageError(fmt.Sprintf("%v", err.(*plugins.GetPluginConfigItemUnauthorized).Payload.Message), ctx)
-	case *plugins.LoadPluginDefault:
-		return newUsageError(fmt.Sprintf("%v", err.(*plugins.LoadPluginDefault).Message), ctx)
 	case *tasks.GetTaskNotFound:
 		return newUsageError(fmt.Sprintf("%v", err.(*tasks.GetTaskNotFound).Payload.ErrorMessage), ctx)
 	case *tasks.GetTaskUnauthorized:
@@ -150,6 +149,9 @@ func getErrorDetail(err error, ctx *cli.Context) error {
 	case *tasks.UpdateTaskStateUnauthorized:
 		return newUsageError(fmt.Sprintf("%v", err.(*tasks.UpdateTaskStateUnauthorized).Payload.Message), ctx)
 	default:
+		if strings.Contains(err.Error(), "tls: oversized record") || strings.Contains(err.Error(), "malformed HTTP response") {
+			return newUsageError(extractError(err.Error()), ctx)
+		}
 		return newUsageError(fmt.Sprintf("Error: %v", err), ctx)
 	}
 }
@@ -218,3 +220,19 @@ func BasicAuth(ctx *cli.Context) runtime.ClientAuthInfoWriter {
 	}
 	return nil
 }
+
+// extractError is a hack for SSL/TLS handshake error.
+func extractError(m string) string {
+	ts := strings.Split(m, "\"")
+
+	var tss []string
+	if len(ts) > 0 {
+		tss = strings.Split(ts[0], "malformed")
+	}
+
+	errMsg := "Error connecting to API. Do you have an http/https mismatching API request?"
+	if len(tss) > 0 {
+		errMsg = tss[0] + errMsg
+	}
+	return errMsg
+}

snaptel/plugin.go

@@ -51,13 +51,46 @@ func loadPlugin(ctx *cli.Context) error {
 		}
 
 		params := plugins.NewLoadPluginParamsWithTimeout(FlTimeout.Value)
-		f, err := os.Open(filepath.Join(paths...))
+
+		// Sets the plugin data.
+		f, err := os.Open(filepath.Join(paths[0]))
 		if err != nil {
 			return newUsageError("Cannot open the plugin", ctx)
 		}
 		defer f.Close()
 		params.SetPluginData(f)
 
+		if !hasValidFlags(ctx.IsSet("plugin-cert"), ctx.IsSet("plugin-key")) {
+			return newUsageError("Both plugin certification and key are mandatory.", ctx)
+		}
+
+		// Sets the plugin certificate.
+		if ctx.IsSet("plugin-cert") {
+			pCert := ctx.String("plugin-cert")
+			if _, err := os.Stat(pCert); os.IsNotExist(err) {
+				return newUsageError("Cannot reach the plugin certificate", ctx)
+			}
+			params.SetPluginCert(&pCert)
+		}
+
+		// Sets the plugin key.
+		if ctx.IsSet("plugin-key") {
+			pKey := ctx.String("plugin-key")
+			if _, err := os.Stat(pKey); os.IsNotExist(err) {
+				return newUsageError("Cannot reach the plugin key", ctx)
+			}
+			params.SetPluginKey(&pKey)
+		}
+
+		// Sets the CA ceritificate.
+		if ctx.IsSet("plugin-ca-certs") {
+			caCerts := ctx.String("plugin-ca-certs")
+			if _, err := os.Stat(caCerts); os.IsNotExist(err) {
+				return newUsageError("Cannot reach the CA certificates", ctx)
+			}
+			params.SetCaCerts(&caCerts)
+		}
+
 		resp, err := client.Plugins.LoadPlugin(params, authInfoWriter)
 		if err != nil {
 			return getErrorDetail(err, ctx)
@@ -176,7 +209,7 @@ func hasValidFlags(key, cert bool) bool {
 		return true
 	}
 
-	// Don't block normal flow which has not certs at all.
+	// Don't block normal flow which has no certs at all.
 	if !key && !cert {
 		return true
 	}