cleanup code

Author: jason-jackson

config.go

@@ -8,10 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 )
 
-var (
-	storage   *Storage
-	envConfig EnvConfig
-)
+var envConfig EnvConfig
 
 // EnvConfig holds environment specific configurations and is populated on init
 type EnvConfig struct {

server/main.go

@@ -96,11 +96,7 @@ func newRouter() *mux.Router {
 
 	// Assign the handlers to run when endpoints are called.
 	for _, route := range routes {
-		// Create a handler function.
-		var handler http.Handler
-		handler = route.HandlerFunc
-
-		router.Methods(route.Method).Path(route.Pattern).Name(route.Name).Handler(handler)
+		router.Methods(route.Method).Path(route.Pattern).Name(route.Name).Handler(route.HandlerFunc)
 	}
 
 	router.NotFoundHandler = router.NewRoute().HandlerFunc(notFound).GetHandler()

testutils.go

@@ -55,7 +55,7 @@ func initDb(storage *Storage) error {
 
 	// attempt to delete tables in case already exists
 	tables := map[string]string{"WebAuthn": "uuid", "ApiKey": "value"}
-	for name, _ := range tables {
+	for name := range tables {
 		deleteTable := &dynamodb.DeleteTableInput{
 			TableName: aws.String(name),
 		}
@@ -126,7 +126,9 @@ type ClientData struct {
 }
 
 // GenerateAuthenticationSig appends the clientData to the authData and uses the privateKey's public Key to sign it
-//  via a sha256 hashing algorithm.
+//
+//	via a sha256 hashing algorithm.
+//
 // It returns the base64 encoded version of the marshaled version of the corresponding dsa signature {r:bigInt, s:bigInt}
 // It does not use any kind of randomized data in this process
 func GenerateAuthenticationSig(authData, clientData []byte, privateKey *ecdsa.PrivateKey) string {

u2fserver/main.go

@@ -8,12 +8,9 @@ import (
 
 	"github.com/gorilla/mux"
 
-	mfa "github.com/silinternational/serverless-mfa-api-go"
 	u2fsim "github.com/silinternational/serverless-mfa-api-go/u2fsimulator"
 )
 
-var envConfig mfa.EnvConfig
-
 func main() {
 	log.SetOutput(os.Stdout)
 	log.Println("U2f Simulator Server starting...")
@@ -51,11 +48,7 @@ func newRouter() *mux.Router {
 
 	// Assign the handlers to run when endpoints are called.
 	for _, route := range routes {
-		// Create a handler function.
-		var handler http.Handler
-		handler = route.HandlerFunc
-
-		router.Methods(route.Method).Path(route.Pattern).Name(route.Name).Handler(handler)
+		router.Methods(route.Method).Path(route.Pattern).Name(route.Name).Handler(route.HandlerFunc)
 	}
 
 	router.NotFoundHandler = router.NewRoute().HandlerFunc(notFound).GetHandler()

user.go

@@ -153,7 +153,7 @@ func (u *DynamoUser) DeleteCredential(credIDHash string) (int, error) {
 	}
 
 	if len(u.Credentials) == 0 {
-		err := fmt.Errorf("error in DeleteCredential. No webauthn credentials available.")
+		err := fmt.Errorf("error in DeleteCredential: no webauthn credentials available")
 		return http.StatusNotFound, err
 	}
 

webauthn_test.go

@@ -7,7 +7,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"math/big"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -732,16 +731,6 @@ func Test_GetSignatureForLogin(t *testing.T) {
 		panic("error marshalling client data: " + err.Error())
 	}
 
-	xyStr := "4843956129390645175905258525279791420276294952604174799584408071708240463528636134250956749795798585127919587881956611106672985015071877198253568414405109"
-
-	bigXY, ok := new(big.Int).SetString(xyStr, 16)
-	if !ok {
-		panic("Failed making bigint")
-	}
-
-	xyData := []byte{4}
-	xyData = append(xyData, bigXY.Bytes()...)
-
 	keyHandle := "virtKey11"
 	_, authDataBytes1, privateKey := u2fsim.GetAuthDataAndPrivateKey(localAppID, keyHandle)
 	signature := GenerateAuthenticationSig(authDataBytes1, clientData, privateKey)