From c71d542d909db87fbbc20c0468b9fa0766867f76 Mon Sep 17 00:00:00 2001
From: Matthew Kanwisher <matt@kanwisher.com>
Date: Mon, 15 Apr 2013 17:55:10 -0400
Subject: [PATCH] minor tweaks for ntlmv1

---
 src/ntlm/ntlm.go   | 2 ++
 src/ntlm/ntlmv1.go | 9 ++++++---
 src/ntlm/ntlmv2.go | 4 ++++
 utils/test_auth.go | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/ntlm/ntlm.go b/src/ntlm/ntlm.go
index 87f7340..b20d33c 100644
--- a/src/ntlm/ntlm.go
+++ b/src/ntlm/ntlm.go
@@ -71,6 +71,8 @@ func CreateServerSession(version Version, mode Mode) (n ServerSession, err error
 
 type ServerSession interface {
 	SetUserInfo(username string, password string, domain string)
+	GetUserInfo() (string, string, string)
+
 	SetMode(mode Mode)
 	SetServerChallenge(challege []byte)
 
diff --git a/src/ntlm/ntlmv1.go b/src/ntlm/ntlmv1.go
index 183ba1a..f535c51 100644
--- a/src/ntlm/ntlmv1.go
+++ b/src/ntlm/ntlmv1.go
@@ -3,10 +3,9 @@ package ntlm
 
 import (
 	"bytes"
-	//	l4g "code.google.com/p/log4go"
+	l4g "code.google.com/p/log4go"
 	rc4P "crypto/rc4"
 	"errors"
-	"fmt"
 	"ntlm/messages"
 	"strings"
 )
@@ -25,6 +24,10 @@ func (n *V1Session) SetUserInfo(username string, password string, domain string)
 	n.userDomain = domain
 }
 
+func (n *V1Session) GetUserInfo() (string, string, string) {
+	return n.user, n.password, n.userDomain
+}
+
 func (n *V1Session) SetMode(mode Mode) {
 	n.mode = mode
 }
@@ -166,7 +169,7 @@ func (n *V1ServerSession) ProcessAuthenticateMessage(am *messages.Authenticate)
 	// They should always be correct (I hope)
 	n.user = am.UserName.String()
 	n.userDomain = am.DomainName.String()
-	fmt.Printf("(ProcessAuthenticateMessage)NTLM v1 User %s Domain %s \n", n.user, n.userDomain)
+	l4g.Info("(ProcessAuthenticateMessage)NTLM v1 User %s Domain %s", n.user, n.userDomain)
 
 	err = n.fetchResponseKeys()
 	if err != nil {
diff --git a/src/ntlm/ntlmv2.go b/src/ntlm/ntlmv2.go
index 4343773..4d89fd6 100644
--- a/src/ntlm/ntlmv2.go
+++ b/src/ntlm/ntlmv2.go
@@ -26,6 +26,10 @@ func (n *V2Session) SetUserInfo(username string, password string, domain string)
 	n.userDomain = domain
 }
 
+func (n *V2Session) GetUserInfo() (string, string, string) {
+	return n.user, n.password, n.userDomain
+}
+
 func (n *V2Session) SetMode(mode Mode) {
 	n.mode = mode
 }
diff --git a/utils/test_auth.go b/utils/test_auth.go
index a8fb122..bce580b 100644
--- a/utils/test_auth.go
+++ b/utils/test_auth.go
@@ -47,7 +47,7 @@ func main() {
 
 		// Message parsed correctly as NTLMv1 so assume the session is v1 and reset the server session
 		newContext, err := ntlm.CreateServerSession(ntlm.Version1, ntlm.ConnectionlessMode)
-		newContext.SetUserInfo("050045.rmwatest@reuters.com", "Welcome1", "")
+		newContext.SetUserInfo(server.GetUserInfo())
 		if err != nil {
 			fmt.Println("Could not create NTLMv1 session")
 			return