Minor change.

sxmpp · Mar 26, 2018 · 0abd860 · 0abd860
1 parent 9000044
commit 0abd860
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/server/server.go b/server/server.go
@@ -6,7 +6,6 @@
 package server
 
 import (
-	"crypto/tls"
 	"fmt"
 	"net"
 	"net/http"
@@ -20,6 +19,7 @@ import (
 	"github.com/ortuman/jackal/log"
 	"github.com/ortuman/jackal/server/transport"
 	"github.com/ortuman/jackal/stream/c2s"
+	"github.com/ortuman/jackal/util"
 )
 
 type server struct {
@@ -125,19 +125,13 @@ func (s *server) listenWebSocketConn(address string) {
 			log.Fatalf("%v", err)
 		}
 	}()
-
-	cer, err := tls.LoadX509KeyPair(s.cfg.TLS.CertFile, s.cfg.TLS.PrivKeyFile)
+	tlsCfg, err := util.LoadCertificate(s.cfg.TLS.PrivKeyFile, s.cfg.TLS.CertFile, c2s.Instance().DefaultLocalDomain())
 	if err != nil {
 		log.Fatalf("%v", err)
-		return
-	}
-	cfg := &tls.Config{
-		ServerName:   c2s.Instance().DefaultLocalDomain(),
-		Certificates: []tls.Certificate{cer},
 	}
 	wsSrv := &http.Server{
 		Addr:      address,
-		TLSConfig: cfg,
+		TLSConfig: tlsCfg,
 	}
 	s.wsUpgrader = &websocket.Upgrader{
 		ReadBufferSize:  s.cfg.Transport.BufferSize,

diff --git a/util/tls.go b/util/tls.go
@@ -22,13 +22,14 @@ const localhostDomain = "localhost"
 
 const (
 	selfSignedCertKeyRSABits = 2048
-
-	selfSignedCertFolder = "./.cert/"
-
+	selfSignedCertFolder     = "./.cert/"
 	selfSignedCertPrivateKey = selfSignedCertFolder + "key.pem"
 	selfSignedCertFile       = selfSignedCertFolder + "cert.pem"
 )
 
+// LoadCertificate loads a certificate given a private key and certificate PEM files.
+// Only in case the associated domain is localhost and the files cannot be processed
+// a self signed certificate will be automatically generated.
 func LoadCertificate(keyFile, certFile, domain string) (*tls.Config, error) {
 	if len(certFile) == 0 || len(keyFile) == 0 {
 		switch domain {