fixes after review

4 files changed, 120 insertions, 119 deletions

diff --git a/pkg/auth/middleware.go b/pkg/auth/middleware.go
index dfd4da3..280ceeb 100644
--- a/pkg/auth/middleware.go
+++ b/pkg/auth/middleware.go
@@ -5,13 +5,15 @@ import (
 	"0xacab.org/leap/vpnweb/pkg/config"
 	"0xacab.org/leap/vpnweb/pkg/web"
 	"github.com/auth0/go-jwt-middleware"
-	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/dgrijalva/jwt-go"
 	"log"
 	"net/http"
 )
 
-const anonAuth string = "anon"
-const sip2Auth string = "sip"
+const (
+	anonAuth = "anon"
+	sip2Auth = "sip"
+)
 
 func bailOnBadAuthModule(module string) {
 	log.Fatal("Unknown auth module: '", module, "'. Should be one of: ", anonAuth, ", ", sip2Auth, ".")
diff --git a/pkg/auth/sip2/auth.go b/pkg/auth/sip2/auth.go
index 58441e4..9c01c28 100644
--- a/pkg/auth/sip2/auth.go
+++ b/pkg/auth/sip2/auth.go
@@ -2,7 +2,7 @@ package sip2
 
 import (
 	"encoding/json"
-	jwt "github.com/dgrijalva/jwt-go"
+	"github.com/dgrijalva/jwt-go"
 	"log"
 	"net/http"
 	"os"
@@ -11,14 +11,13 @@ import (
 	"0xacab.org/leap/vpnweb/pkg/config"
 )
 
-const SipUserVar string = "VPNWEB_SIP_USER"
-const SipPassVar string = "VPNWEB_SIP_PASS"
-const SipPortVar string = "VPNWEB_SIP_PORT"
-const SipHostVar string = "VPNWEB_SIP_HOST"
-const SipLibrLocVar string = "VPNWEB_SIP_LIBR_LOCATION"
-const SipTerminatorVar string = "VPNWEB_SIP_TERMINATOR"
-
-const SipDefaultTerminator string = "\r\n"
+const sipUserVar string = "VPNWEB_SIP_USER"
+const sipPassVar string = "VPNWEB_SIP_PASS"
+const sipPortVar string = "VPNWEB_SIP_PORT"
+const sipHostVar string = "VPNWEB_SIP_HOST"
+const sipLibrLocVar string = "VPNWEB_SIP_LIBR_LOCATION"
+const sipTerminatorVar string = "VPNWEB_SIP_TERMINATOR"
+const sipDefaultTerminator string = "\r\n"
 
 type Credentials struct {
 	User     string
@@ -34,11 +33,11 @@ func getConfigFromEnv(envVar string) string {
 }
 
 func setupTerminatorFromEnv() {
-	config.FallbackToEnv(&TelnetTerminator, SipTerminatorVar, SipDefaultTerminator)
-	if TelnetTerminator == "\\r" {
-		TelnetTerminator = "\r"
-	} else if TelnetTerminator == "\\r\\n" {
-		TelnetTerminator = "\r\n"
+	config.FallbackToEnv(&telnetTerminator, sipTerminatorVar, sipDefaultTerminator)
+	if telnetTerminator == "\\r" {
+		telnetTerminator = "\r"
+	} else if telnetTerminator == "\\r\\n" {
+		telnetTerminator = "\r\n"
 	}
 }
 
@@ -46,11 +45,11 @@ func SipAuthenticator(opts *config.Opts) http.HandlerFunc {
 
 	log.Println("Initializing SIP2 authenticator")
 
-	SipUser := getConfigFromEnv(SipUserVar)
-	SipPass := getConfigFromEnv(SipPassVar)
-	SipHost := getConfigFromEnv(SipHostVar)
-	SipPort := getConfigFromEnv(SipPortVar)
-	SipLibrLoc := getConfigFromEnv(SipLibrLocVar)
+	SipUser := getConfigFromEnv(sipUserVar)
+	SipPass := getConfigFromEnv(sipPassVar)
+	SipHost := getConfigFromEnv(sipHostVar)
+	SipPort := getConfigFromEnv(sipPortVar)
+	SipLibrLoc := getConfigFromEnv(sipLibrLocVar)
 
 	setupTerminatorFromEnv()
 
diff --git a/pkg/auth/sip2/spec.go b/pkg/auth/sip2/spec.go
index ba7c356..af65b33 100644
--- a/pkg/auth/sip2/spec.go
+++ b/pkg/auth/sip2/spec.go
@@ -6,136 +6,136 @@ import (
 	"strings"
 )
 
-type FixedFieldSpec struct {
+const (
+	yes                  string = "Y"
+	trueVal              string = "1"
+	okVal                string = "ok"
+	language             string = "language"
+	patronStatus         string = "patron status"
+	date                 string = "transaction date"
+	patronIdentifier     string = "patron identifier"
+	patronPassword       string = "patron password"
+	personalName         string = "personal name"
+	screenMessage        string = "screen message"
+	institutionID        string = "institution id"
+	validPatron          string = "valid patron"
+	validPatronPassword  string = "valid patron password"
+	loginResponse        string = "Login Response"
+	patronStatusResponse string = "Patron Status Response"
+)
+
+type fixedFieldSpec struct {
 	length int
 	label  string
 }
 
-type FixedField struct {
-	spec  FixedFieldSpec
+type fixedField struct {
+	spec  fixedFieldSpec
 	value string
 }
 
-type VariableFieldSpec struct {
+type variableFieldSpec struct {
 	id    string
 	label string
 }
 
-type VariableField struct {
-	spec  VariableFieldSpec
+type variableField struct {
+	spec  variableFieldSpec
 	value string
 }
 
-type MessageSpec struct {
+type messageSpec struct {
 	id     int
 	label  string
-	fields []FixedFieldSpec
+	fields []fixedFieldSpec
 }
 
-type Message struct {
-	fields       []VariableField
-	fixed_fields []FixedField
-	msg_txt      string
+type message struct {
+	fields      []variableField
+	fixedFields []fixedField
+	msgTxt      string
 }
 
 type Parser struct {
-	getMessageSpecByCode   func(int) MessageSpec
-	getVariableFieldByCode func(string) VariableFieldSpec
-	getFixedFieldValue     func(*Message, string) (string, bool)
-	getFieldValue          func(*Message, string) (string, bool)
-	parseMessage           func(string) *Message
+	msgByCodeMap           map[int]messageSpec
+	variableFieldByCodeMap map[string]variableFieldSpec
 }
 
-const (
-	YES                  string = "Y"
-	TRUE                 string = "1"
-	Ok                   string = "ok"
-	Language             string = "language"
-	PatronStatus         string = "patron status"
-	Date                 string = "transaction date"
-	PatronIdentifier     string = "patron identifier"
-	PatronPassword       string = "patron password"
-	PersonalName         string = "personal name"
-	ScreenMessage        string = "screen message"
-	InstitutionId        string = "institution id"
-	ValidPatron          string = "valid patron"
-	ValidPatronPassword  string = "valid patron password"
-	LoginResponse        string = "Login Response"
-	PatronStatusResponse string = "Patron Status Response"
-)
-
 func getParser() *Parser {
 
-	LanguageSpec := FixedFieldSpec{3, Language}
-	PatronStatusSpec := FixedFieldSpec{14, PatronStatus}
-	DateSpec := FixedFieldSpec{18, Date}
-	OkSpec := FixedFieldSpec{1, Ok}
+	languageSpec := fixedFieldSpec{3, language}
+	patronStatusSpec := fixedFieldSpec{14, patronStatus}
+	dateSpec := fixedFieldSpec{18, date}
+	okSpec := fixedFieldSpec{1, okVal}
 
-	msgByCodeMap := map[int]MessageSpec{
-		94: MessageSpec{94, LoginResponse, []FixedFieldSpec{OkSpec}},
-		24: MessageSpec{24, PatronStatusResponse, []FixedFieldSpec{PatronStatusSpec, LanguageSpec, DateSpec}},
+	msgByCodeMap := map[int]messageSpec{
+		94: messageSpec{94, loginResponse, []fixedFieldSpec{okSpec}},
+		24: messageSpec{24, patronStatusResponse, []fixedFieldSpec{patronStatusSpec, languageSpec, dateSpec}},
 	}
 
-	variableFieldByCodeMap := map[string]VariableFieldSpec{
-		"AA": VariableFieldSpec{"AA", PatronIdentifier},
-		"AD": VariableFieldSpec{"AD", PatronPassword},
-		"AE": VariableFieldSpec{"AE", PersonalName},
-		"AF": VariableFieldSpec{"AF", ScreenMessage},
-		"AO": VariableFieldSpec{"AO", InstitutionId},
-		"BL": VariableFieldSpec{"BL", ValidPatron},
-		"CQ": VariableFieldSpec{"CQ", ValidPatronPassword},
+	variableFieldByCodeMap := map[string]variableFieldSpec{
+		"AA": variableFieldSpec{"AA", patronIdentifier},
+		"AD": variableFieldSpec{"AD", patronPassword},
+		"AE": variableFieldSpec{"AE", personalName},
+		"AF": variableFieldSpec{"AF", screenMessage},
+		"AO": variableFieldSpec{"AO", institutionID},
+		"BL": variableFieldSpec{"BL", validPatron},
+		"CQ": variableFieldSpec{"CQ", validPatronPassword},
 	}
 
-	parser := new(Parser)
-	parser.getMessageSpecByCode = func(code int) MessageSpec {
-		return msgByCodeMap[code]
-	}
-	parser.getVariableFieldByCode = func(code string) VariableFieldSpec {
-		return variableFieldByCodeMap[code]
-	}
-	parser.getFixedFieldValue = func(msg *Message, field string) (string, bool) {
-		for _, v := range msg.fixed_fields {
-			if v.spec.label == field {
-				return v.value, true
-			}
+	return &Parser{msgByCodeMap, variableFieldByCodeMap}
+}
+
+func (p *Parser) getMessageSpecByCode(code int) messageSpec {
+	return p.msgByCodeMap[code]
+}
+
+func (p *Parser) getVariableFieldByCode(code string) variableFieldSpec {
+	return p.variableFieldByCodeMap[code]
+}
+
+func (p *Parser) getFixedFieldValue(msg *message, field string) (string, bool) {
+	for _, v := range msg.fixedFields {
+		if v.spec.label == field {
+			return v.value, true
 		}
-		return "", false
 	}
-	parser.getFieldValue = func(msg *Message, field string) (string, bool) {
-		for _, v := range msg.fields {
-			if v.spec.label == field {
-				return v.value, true
-			}
+	return "", false
+}
+
+func (p *Parser) getFieldValue(msg *message, field string) (string, bool) {
+	for _, v := range msg.fields {
+		if v.spec.label == field {
+			return v.value, true
 		}
-		return "", false
 	}
+	return "", false
+}
 
-	parser.parseMessage = func(msg string) *Message {
-		txt := msg[:len(msg)-len(TelnetTerminator)]
-		code, err := strconv.Atoi(txt[:2])
-		if nil != err {
-			log.Printf("Error parsing integer: %s\n", txt[:2])
-		}
-		spec := parser.getMessageSpecByCode(code)
-		txt = txt[2:]
-
-		message := new(Message)
-		for _, sp := range spec.fields {
-			value := txt[:sp.length]
-			txt = txt[sp.length:]
-			message.fixed_fields = append(message.fixed_fields, FixedField{sp, value})
-		}
-		if len(txt) == 0 {
-			return message
-		}
-		for _, part := range strings.Split(txt, "|") {
-			if len(part) > 0 {
-				part_spec := parser.getVariableFieldByCode(part[:2])
-				value := part[2:]
-				message.fields = append(message.fields, VariableField{part_spec, value})
-			}
-		}
+func (p *Parser) parseMessage(msg string) *message {
+	txt := msg[:len(msg)-len(telnetTerminator)]
+	code, err := strconv.Atoi(txt[:2])
+	if nil != err {
+		log.Printf("Error parsing integer: %s\n", txt[:2])
+	}
+	spec := p.getMessageSpecByCode(code)
+	txt = txt[2:]
+
+	message := new(message)
+	for _, sp := range spec.fields {
+		value := txt[:sp.length]
+		txt = txt[sp.length:]
+		message.fixedFields = append(message.fixedFields, fixedField{sp, value})
+	}
+	if len(txt) == 0 {
 		return message
 	}
-	return parser
+	for _, part := range strings.Split(txt, "|") {
+		if len(part) > 0 {
+			partSpec := p.getVariableFieldByCode(part[:2])
+			value := part[2:]
+			message.fields = append(message.fields, variableField{partSpec, value})
+		}
+	}
+	return message
 }
diff --git a/pkg/auth/sip2/telnet.go b/pkg/auth/sip2/telnet.go
index faa72ff..ae5004e 100644
--- a/pkg/auth/sip2/telnet.go
+++ b/pkg/auth/sip2/telnet.go
@@ -7,7 +7,7 @@ import (
 // The terminator can be configured differently for different SIP endpoints.
 // This gets set in sip2.auth according to an environment variable
 
-var TelnetTerminator string
+var telnetTerminator string
 
 func telnetRead(conn *telnet.Conn) (out string) {
 	var buffer [1]byte
@@ -22,7 +22,7 @@ func telnetRead(conn *telnet.Conn) (out string) {
 		} else {
 			out += string(recvData)
 		}
-		if len(out) > 1 && out[len(out)-len(TelnetTerminator):] == TelnetTerminator {
+		if len(out) > 1 && out[len(out)-len(telnetTerminator):] == telnetTerminator {
 			break
 		}
 	}