Added HTTP basic authentication (#22)

ChargePi · Jul 16, 2022 · 08caba9 · 08caba9
1 parent f6cda94
commit 08caba9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/configs/settings.json b/configs/settings.json
@@ -5,6 +5,8 @@
       "protocolVersion": "1.6",
       "serverUri": "example.com",
       "maxChargingTime": 5,
+      "basicAuthUser": "",
+      "basicAuthPass": "",
       "ocpp": {
         "vendor": "UL FE",
         "model": "ChargePi"

diff --git a/docs/client/configuration.md b/docs/client/configuration.md
@@ -66,6 +66,8 @@ Example settings:
       "id": "ChargePi",
       "protocolVersion": "1.6",
       "serverUri": "example.com",
+      "basicAuthUser": "",
+      "basicAuthPass": "",
       "maxChargingTime": 5,
       "ocpp": {
         "vendor": "UL FE",

diff --git a/internal/chargepoint/util/util.go b/internal/chargepoint/util/util.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"fmt"
+	"github.com/agrison/go-commons-lang/stringUtils"
 	ocpp16 "github.com/lorenzodonini/ocpp-go/ocpp1.6"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
 	"github.com/lorenzodonini/ocpp-go/ocpp1.6/firmware"
@@ -35,7 +36,7 @@ func CreateConnectionUrl(point settings.ChargePoint) string {
 }
 
 // CreateClient creates a Websocket client based on the settings.
-func CreateClient(tlsConfig settings.TLS) *ws.Client {
+func CreateClient(basicAuthUser, basicAuthPass string, tlsConfig settings.TLS) *ws.Client {
 	var (
 		client            = ws.NewClient()
 		clientConfig      = ws.NewClientTimeoutConfig()
@@ -54,6 +55,11 @@ func CreateClient(tlsConfig settings.TLS) *ws.Client {
 		client = tls.GetTLSClient(tlsConfig.CACertificatePath, tlsConfig.ClientCertificatePath, tlsConfig.ClientKeyPath)
 	}
 
+	// If HTTP basic auth is provided, set it in the Websocket client
+	if stringUtils.IsNoneEmpty(basicAuthUser, basicAuthPass) {
+		client.SetBasicAuth(basicAuthUser, basicAuthPass)
+	}
+
 	client.SetTimeoutConfig(clientConfig)
 	return client
 }

diff --git a/internal/chargepoint/v16/charge-point.go b/internal/chargepoint/v16/charge-point.go
@@ -84,8 +84,11 @@ func (cp *ChargePoint) Init(settings *settings.Settings) {
 	var (
 		info      = settings.ChargePoint.Info
 		tlsConfig = settings.ChargePoint.TLS
-		wsClient  = chargePointUtil.CreateClient(tlsConfig)
-		logInfo   = log.WithFields(log.Fields{
+		wsClient  = chargePointUtil.CreateClient(
+			settings.ChargePoint.Info.BasicAuthUsername,
+			settings.ChargePoint.Info.BasicAuthPassword,
+			tlsConfig)
+		logInfo = log.WithFields(log.Fields{
 			"chargePointId": info.Id,
 		})
 	)

diff --git a/internal/models/settings/core.go b/internal/models/settings/core.go
@@ -14,11 +14,13 @@ type (
 	}
 
 	Info struct {
-		Id              string   `fig:"Id" validate:"required" json:"id,omitempty" yaml:"id" mapstructure:"id"`
-		ProtocolVersion string   `fig:"ProtocolVersion" default:"1.6" json:"ProtocolVersion,omitempty" yaml:"ProtocolVersion" mapstructure:"ProtocolVersion"`
-		ServerUri       string   `fig:"ServerUri" validate:"required" json:"ServerUri,omitempty" yaml:"ServerUri" mapstructure:"ServerUri"`
-		MaxChargingTime int      `fig:"MaxChargingTime" default:"180" json:"MaxChargingTime,omitempty" yaml:"MaxChargingTime" mapstructure:"MaxChargingTime"`
-		OCPPInfo        OCPPInfo `fig:"ocpp" json:"ocpp" yaml:"ocpp" mapstructure:"ocpp"`
+		Id                string   `fig:"Id" validate:"required" json:"id,omitempty" yaml:"id" mapstructure:"id"`
+		ProtocolVersion   string   `fig:"ProtocolVersion" default:"1.6" json:"ProtocolVersion,omitempty" yaml:"ProtocolVersion" mapstructure:"ProtocolVersion"`
+		ServerUri         string   `fig:"ServerUri" validate:"required" json:"ServerUri,omitempty" yaml:"ServerUri" mapstructure:"ServerUri"`
+		BasicAuthUsername string   `fig:"basicAuthUser" json:"basicAuthUser,omitempty" yaml:"basicAuthUser" mapstructure:"basicAuthUser"`
+		BasicAuthPassword string   `fig:"basicAuthPass" json:"basicAuthPass,omitempty" yaml:"basicAuthPass" mapstructure:"basicAuthPass"`
+		MaxChargingTime   int      `fig:"MaxChargingTime" default:"180" json:"MaxChargingTime,omitempty" yaml:"MaxChargingTime" mapstructure:"MaxChargingTime"`
+		OCPPInfo          OCPPInfo `fig:"ocpp" json:"ocpp" yaml:"ocpp" mapstructure:"ocpp"`
 	}
 
 	TLS struct {