From 235d683359a006f998ca1faddcc387522ead7235 Mon Sep 17 00:00:00 2001 From: justdan96 Date: Fri, 13 Apr 2018 09:50:16 +0100 Subject: [PATCH] gofmt --- negotiate_flags.go | 24 ++++++++++----- negotiate_message.go | 70 ++++++++++++++++++++++---------------------- negotiator.go | 26 ++++++++-------- 3 files changed, 64 insertions(+), 56 deletions(-) diff --git a/negotiate_flags.go b/negotiate_flags.go index 6c3ce7b..5905c02 100644 --- a/negotiate_flags.go +++ b/negotiate_flags.go @@ -7,30 +7,38 @@ const ( /*B*/ negotiateFlagNTLMNEGOTIATEOEM = 1 << 1 /*C*/ negotiateFlagNTLMSSPREQUESTTARGET = 1 << 2 - /*D*/ negotiateFlagNTLMSSPNEGOTIATESIGN = 1 << 4 + /*D*/ + negotiateFlagNTLMSSPNEGOTIATESIGN = 1 << 4 /*E*/ negotiateFlagNTLMSSPNEGOTIATESEAL = 1 << 5 /*F*/ negotiateFlagNTLMSSPNEGOTIATEDATAGRAM = 1 << 6 /*G*/ negotiateFlagNTLMSSPNEGOTIATELMKEY = 1 << 7 - /*H*/ negotiateFlagNTLMSSPNEGOTIATENTLM = 1 << 9 + /*H*/ + negotiateFlagNTLMSSPNEGOTIATENTLM = 1 << 9 - /*J*/ negotiateFlagANONYMOUS = 1 << 11 + /*J*/ + negotiateFlagANONYMOUS = 1 << 11 /*K*/ negotiateFlagNTLMSSPNEGOTIATEOEMDOMAINSUPPLIED = 1 << 12 /*L*/ negotiateFlagNTLMSSPNEGOTIATEOEMWORKSTATIONSUPPLIED = 1 << 13 - /*M*/ negotiateFlagNTLMSSPNEGOTIATEALWAYSSIGN = 1 << 15 + /*M*/ + negotiateFlagNTLMSSPNEGOTIATEALWAYSSIGN = 1 << 15 /*N*/ negotiateFlagNTLMSSPTARGETTYPEDOMAIN = 1 << 16 /*O*/ negotiateFlagNTLMSSPTARGETTYPESERVER = 1 << 17 - /*P*/ negotiateFlagNTLMSSPNEGOTIATEEXTENDEDSESSIONSECURITY = 1 << 19 + /*P*/ + negotiateFlagNTLMSSPNEGOTIATEEXTENDEDSESSIONSECURITY = 1 << 19 /*Q*/ negotiateFlagNTLMSSPNEGOTIATEIDENTIFY = 1 << 20 - /*R*/ negotiateFlagNTLMSSPREQUESTNONNTSESSIONKEY = 1 << 22 + /*R*/ + negotiateFlagNTLMSSPREQUESTNONNTSESSIONKEY = 1 << 22 /*S*/ negotiateFlagNTLMSSPNEGOTIATETARGETINFO = 1 << 23 - /*T*/ negotiateFlagNTLMSSPNEGOTIATEVERSION = 1 << 25 + /*T*/ + negotiateFlagNTLMSSPNEGOTIATEVERSION = 1 << 25 - /*U*/ negotiateFlagNTLMSSPNEGOTIATE128 = 1 << 29 + /*U*/ + negotiateFlagNTLMSSPNEGOTIATE128 = 1 << 29 /*V*/ negotiateFlagNTLMSSPNEGOTIATEKEYEXCH = 1 << 30 /*W*/ negotiateFlagNTLMSSPNEGOTIATE56 = 1 << 31 ) diff --git a/negotiate_message.go b/negotiate_message.go index 151a91c..28f0537 100644 --- a/negotiate_message.go +++ b/negotiate_message.go @@ -10,54 +10,54 @@ import ( const expMsgBodyLen = 40 type negotiateMessageFields struct { - messageHeader - NegotiateFlags negotiateFlags + messageHeader + NegotiateFlags negotiateFlags - Domain varField - Workstation varField + Domain varField + Workstation varField - Version + Version } var defaultFlags = negotiateFlagNTLMSSPNEGOTIATETARGETINFO | - negotiateFlagNTLMSSPNEGOTIATE56 | - negotiateFlagNTLMSSPNEGOTIATE128 | - negotiateFlagNTLMSSPNEGOTIATEUNICODE + negotiateFlagNTLMSSPNEGOTIATE56 | + negotiateFlagNTLMSSPNEGOTIATE128 | + negotiateFlagNTLMSSPNEGOTIATEUNICODE //NewNegotiateMessage creates a new NEGOTIATE message with the //flags that this package supports. func NewNegotiateMessage(domainName, workstationName string) ([]byte, error) { - payloadOffset := expMsgBodyLen - flags := defaultFlags + payloadOffset := expMsgBodyLen + flags := defaultFlags - if domainName != "" { - flags |= negotiateFlagNTLMSSPNEGOTIATEOEMDOMAINSUPPLIED - } + if domainName != "" { + flags |= negotiateFlagNTLMSSPNEGOTIATEOEMDOMAINSUPPLIED + } - if workstationName != "" { - flags |= negotiateFlagNTLMSSPNEGOTIATEOEMWORKSTATIONSUPPLIED - } + if workstationName != "" { + flags |= negotiateFlagNTLMSSPNEGOTIATEOEMWORKSTATIONSUPPLIED + } - msg := negotiateMessageFields{ - messageHeader: newMessageHeader(1), - NegotiateFlags: flags, - Domain: newVarField(&payloadOffset, len(domainName)), - Workstation: newVarField(&payloadOffset, len(workstationName)), - Version: DefaultVersion(), - } + msg := negotiateMessageFields{ + messageHeader: newMessageHeader(1), + NegotiateFlags: flags, + Domain: newVarField(&payloadOffset, len(domainName)), + Workstation: newVarField(&payloadOffset, len(workstationName)), + Version: DefaultVersion(), + } - b := bytes.Buffer{} - if err := binary.Write(&b, binary.LittleEndian, &msg); err != nil { - return nil, err - } - if b.Len() != expMsgBodyLen { - return nil, errors.New("incorrect body length") - } + b := bytes.Buffer{} + if err := binary.Write(&b, binary.LittleEndian, &msg); err != nil { + return nil, err + } + if b.Len() != expMsgBodyLen { + return nil, errors.New("incorrect body length") + } - payload := strings.ToUpper(domainName + workstationName) - if _, err := b.WriteString(payload); err != nil { - return nil, err - } + payload := strings.ToUpper(domainName + workstationName) + if _, err := b.WriteString(payload); err != nil { + return nil, err + } - return b.Bytes(), nil + return b.Bytes(), nil } diff --git a/negotiator.go b/negotiator.go index 921f329..f61521e 100644 --- a/negotiator.go +++ b/negotiator.go @@ -77,21 +77,21 @@ func (l Negotiator) RoundTrip(req *http.Request) (res *http.Response, err error) return nil, err } - // parse domain name from username - domain := "" + // parse domain name from username + domain := "" - if strings.Contains(u, "\\") { - ucomponents := strings.Split(u, "\\") - domain = ucomponents[0] - u = ucomponents[1] - } + if strings.Contains(u, "\\") { + ucomponents := strings.Split(u, "\\") + domain = ucomponents[0] + u = ucomponents[1] + } - // send negotiate - negotiateMessage, err := NewNegotiateMessage(domain, "") - if err != nil { - return nil, err - } - if resauth.IsNTLM() { + // send negotiate + negotiateMessage, err := NewNegotiateMessage(domain, "") + if err != nil { + return nil, err + } + if resauth.IsNTLM() { req.Header.Set("Authorization", "NTLM "+base64.StdEncoding.EncodeToString(negotiateMessage)) } else { req.Header.Set("Authorization", "Negotiate "+base64.StdEncoding.EncodeToString(negotiateMessage))