Fixed spelling errors. Added release date to changelog

cmd/prism/main.go

@@ -53,7 +53,7 @@ var proxy = ""
 var secret []byte
 var verbose = false
 var debug = false
-var JWT string
+var merlinJWT string
 var host string
 
 func main() {
@@ -80,7 +80,7 @@ func main() {
 	secret = k[:]
 
 	// Set initial JWT
-	JWT, err = getJWT(a.ID)
+	merlinJWT, err = getJWT(a.ID)
 	if err != nil {
 		message("warn", err.Error())
 		os.Exit(1)
@@ -211,7 +211,7 @@ func sendPre8Message(a agent.Agent) error {
 			message("note", fmt.Sprintf("Merlin message:\r\n%+v", j))
 		}
 	} else {
-		return fmt.Errorf("recieved JSON message did not contain an message type of AgentControl")
+		return fmt.Errorf("received JSON message did not contain an message type of AgentControl")
 	}
 	return nil
 }
@@ -258,7 +258,7 @@ func sendMessage(method string, m messages.Base, client *http.Client) (messages.
 		if req != nil {
 			req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.85 Safari/537.36 ")
 			req.Header.Set("Content-Type", "application/octet-stream; charset=utf-8")
-			req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", JWT))
+			req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", merlinJWT))
 		}
 
 		// Send the request

docs/CHANGELOG.MD

@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 0.8.0 - 2019-xx-xx
+## 0.8.0 - 2019-08-20
 
 ### Added
 

go.mod

@@ -1,23 +1,29 @@
 module github.com/Ne0nd0g/merlin
 
 require (
+	github.com/boltdb/bolt v1.3.1 // indirect
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
 	github.com/cretz/gopaque v0.0.0-20190206211514-8180617f489f
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/fatih/color v1.7.0
+	github.com/gojp/goreportcard v0.0.0-20190808093409-9f711d57eb7d // indirect
 	github.com/kr/pty v1.1.8 // indirect
 	github.com/lucas-clemente/quic-go v0.10.2
 	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mattn/go-runewidth v0.0.4 // indirect
 	github.com/mattn/go-shellwords v1.0.5
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.1
+	github.com/prometheus/client_golang v1.1.0 // indirect
 	github.com/satori/go.uuid v1.2.0
 	github.com/securego/gosec v0.0.0-20190709033609-4b59c948083c // indirect
 	go.dedis.ch/kyber v0.0.0-20190125094535-ffb719103651
 	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
 	golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect
 	golang.org/x/mod v0.1.0 // indirect
 	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
-	golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e
+	golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3
 	golang.org/x/text v0.3.2 // indirect
 	golang.org/x/tools v0.0.0-20190727173135-db2fa46ec33c // indirect
 	gopkg.in/square/go-jose.v2 v2.3.1

pkg/agent/agent.go

@@ -1155,7 +1155,7 @@ func (a *Agent) opaqueAuthenticate() error {
 	}
 
 	if authInitResp.Type != "AuthInit" {
-		return fmt.Errorf("invalid message type %s in resopnse to OPAQUE user authenticaion initialization", authInitResp.Type)
+		return fmt.Errorf("invalid message type %s in resopnse to OPAQUE user authentication initialization", authInitResp.Type)
 	}
 
 	// 3 - Receive the server's ServerAuthComplete
@@ -1211,7 +1211,7 @@ func (a *Agent) opaqueAuthenticate() error {
 		}
 		return nil
 	default:
-		return fmt.Errorf("recieved unexpected or unrecognized message type during OPAQUE authentication completion:\r\n%s", authCompleteResp.Type)
+		return fmt.Errorf("received unexpected or unrecognized message type during OPAQUE authentication completion:\r\n%s", authCompleteResp.Type)
 	}
 
 }

pkg/agents/agents.go

@@ -106,7 +106,7 @@ func KeyExchange(m messages.Base) (messages.Base, error) {
 	ke := m.Payload.(messages.KeyExchange)
 
 	if core.Debug {
-		message("debug", fmt.Sprintf("Recieved new public key from %s:\r\n%v", m.ID, ke.PublicKey))
+		message("debug", fmt.Sprintf("Received new public key from %s:\r\n%v", m.ID, ke.PublicKey))
 	}
 
 	serverKeyMessage.ID = Agents[m.ID].ID

pkg/modules/srdi/srdi.go

@@ -106,7 +106,7 @@ func Parse(options map[string]string) ([]string, error) {
 // https://gist.githubusercontent.com/leoloobeek/c726719d25d7e7953d4121bd93dd2ed3/raw/05f20bae7aa6cd21e20a52034b9547a19e211c5e/ShellcodeRDI.go
 // The work by Leo Loobeek is based on the sRDI project by Nick Landers (@monoxgas) at https://github.com/monoxgas/sRDI/
 // The work done by Nick Landers is based on the work by Dan Staples which is based on the work by Stephen Fewer
-// The work done by Nick Landers regarding Position Indipendent Code (PIC) is based on the work by Matthew Graeber
+// The work done by Nick Landers regarding Position Independent Code (PIC) is based on the work by Matthew Graeber
 // The work done by Matthew Graeber is based on the work by Alan Turing
 // Lastly, invoking the name of the Lee Christensen is used for good luck and pwnage
 // dllPath is a the file path, as a string, of the source DLL to convert to reflective shellcode

pkg/servers/http2/http2.go

@@ -447,7 +447,7 @@ func (s *Server) agentHandler(w http.ResponseWriter, r *http.Request) {
 				// Encode JWE into gob
 				errJWEBuffer := gob.NewEncoder(w).Encode(jwe)
 				if errJWEBuffer != nil {
-					m := fmt.Errorf("there was an error writting the %s response message to the HTTP stream:\r\n%s", k.Type, errJWEBuffer.Error())
+					m := fmt.Errorf("there was an error writing the %s response message to the HTTP stream:\r\n%s", k.Type, errJWEBuffer.Error())
 					logging.Server(m.Error())
 					message("warn", m.Error())
 					w.WriteHeader(404)
@@ -471,7 +471,7 @@ func (s *Server) agentHandler(w http.ResponseWriter, r *http.Request) {
 				message("debug", fmt.Sprintf("[DEBUG]POST DATA: %v", j))
 			}
 			if core.Verbose {
-				message("info", fmt.Sprintf("Recieved %s message from %s at %s", j.Type, j.ID, time.Now().UTC().Format(time.RFC3339)))
+				message("info", fmt.Sprintf("Received %s message from %s at %s", j.Type, j.ID, time.Now().UTC().Format(time.RFC3339)))
 			}
 
 			// Allowed authenticated message with PSK JWT and JWE encrypted with derived secret
@@ -507,7 +507,7 @@ func (s *Server) agentHandler(w http.ResponseWriter, r *http.Request) {
 			}
 			if core.Verbose {
 				message("note", "Authenticated JWT w/ Authenticated JWE agent session key")
-				message("info", fmt.Sprintf("Recived %s message from %s at %s", j.Type, j.ID, time.Now().UTC().Format(time.RFC3339)))
+				message("info", fmt.Sprintf("Received %s message from %s at %s", j.Type, j.ID, time.Now().UTC().Format(time.RFC3339)))
 			}
 
 			// If both an agentID and error were returned, then the claims were likely bad and the agent needs to re-authenticate

test/testServer/main.go

@@ -132,7 +132,7 @@ func (ts *TestServer) handler(w http.ResponseWriter, r *http.Request) {
 	case "AgentInfo":
 		err = agents.UpdateInfo(j)
 	case "AuthInit":
-		returnMessage, err = agents.OPAQUEAuthenticateInit(j, key[:])
+		returnMessage, err = agents.OPAQUEAuthenticateInit(j)
 	case "AuthComplete":
 		returnMessage, err = agents.OPAQUEAuthenticateComplete(j)
 	case "BadPayload":